[gentoo-commits] repo/gentoo:master commit in: profiles/releases/13.0/, profiles/hardened/linux/

[gentoo-commits] repo/gentoo:master commit in: profiles/releases/13.0/, profiles/hardened/linux/

[Andreas Sturmlechner]

commit:     aaa35467a69909e5529f038d8cb0904e4541ecbf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 22:25:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 22:25:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa35467

profiles: Move LO-bin mask from hardened to 13.0 package.mask

Bug: https://bugs.gentoo.org/646410

 profiles/hardened/linux/package.mask | 7 +------
 profiles/releases/13.0/package.mask  | 8 +++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index e4c9930b052..099e6f9e0e3 100644
--- a/profiles/hardened/linux/package.mask
+++ b/profiles/hardened/linux/package.mask
@@ -1,11 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-# Requires >=icu-60, which is not available in 13.0 based profiles.
-# Please migrate to one of the new hardened profiles.
->=app-office/libreoffice-bin-5.4.4
->=app-office/libreoffice-bin-debug-5.4.4
-
 # Hardened versions of gcc-4.0* through gcc-4.2* are not available.
 =sys-devel/gcc-4.0*
 =sys-devel/gcc-4.1*

diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask
index 96c9a09c0b4..2a0fa24c12a 100644
--- a/profiles/releases/13.0/package.mask
+++ b/profiles/releases/13.0/package.mask
@@ -1,6 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (29 Jan 2018)
+# Requires >=icu-60, which is not available in 13.0 based profiles.
+# Please migrate to one of the 17.0 release profiles.
+>=app-office/libreoffice-bin-5.4.4
+>=app-office/libreoffice-bin-debug-5.4.4
+
 # 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