summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/amd64/ChangeLog5
-rw-r--r--profiles/arch/amd64/package.use.mask6
-rw-r--r--profiles/arch/x86/ChangeLog5
-rw-r--r--profiles/arch/x86/package.use.mask6
4 files changed, 18 insertions, 4 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 90644b2abc44..96ebf3afd6a3 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo/AMD64 profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.320 2015/05/20 22:48:16 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.321 2015/05/27 17:00:04 grknight Exp $
+
+ 27 May 2015; <grknight@gentoo.org> package.use.mask:
+ Unmask s6 USE on dev-db/mysql-init-scripts since amd64 has it keyworded
20 May 2015; James Le Cuirot <chewi@gentoo.org> package.use.mask:
Unmask icedtea[infinality] as I'm about to mask it in base.
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 8ec7c884605e..88ec579dfb1a 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.199 2015/05/20 22:48:16 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.200 2015/05/27 17:00:04 grknight Exp $
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -18,6 +18,10 @@
#--- END OF EXAMPLES ---
+# Brian Evans <grknight@gentoo.org> (27 May 2015)
+# Unmask s6 USE since amd64 has it keyworded
+dev-db/mysql-init-scripts -s6
+
# Michael Sterrett <mr_bones_@gentoo.org> (21 Apr 2015)
# None of the fusionsound deps support multilib currently, maybe later.
# Hiding the use flag fixes bug #545662 for now.
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 6eac17239096..13d971454146 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo/x86 profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.194 2015/05/20 22:48:51 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.195 2015/05/27 17:00:04 grknight Exp $
+
+ 27 May 2015; <grknight@gentoo.org> package.use.mask:
+ Unmask s6 USE on dev-db/mysql-init-scripts since x86 has it keyworded
20 May 2015; James Le Cuirot <chewi@gentoo.org> package.use.mask:
Unmask icedtea[infinality] as I'm about to mask it in base.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 547323e3e82e..b899aebf6730 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.152 2015/05/20 22:48:51 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.153 2015/05/27 17:00:04 grknight Exp $
# This file requires >=portage-2.1.1
+# Brian Evans <grknight@gentoo.org> (27 May 2015)
+# Unmask s6 USE since x86 has it keyworded
+dev-db/mysql-init-scripts -s6
+
# Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
# media-libs/libbdplus is keyworded on x86, so unmask the useflag
media-libs/libbluray -bdplus