summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-09-29 14:33:58 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-09-29 14:33:58 +0000
commita71c74ab483f403d9ddcc166f8f81712e9f0196f (patch)
treeede818b16b46b4ea9f867f58c0c7956e8f021f9b
parentm68k goes unstable/testing as per concil decision (diff)
downloadgentoo-2-a71c74ab483f403d9ddcc166f8f81712e9f0196f.tar.gz
gentoo-2-a71c74ab483f403d9ddcc166f8f81712e9f0196f.tar.bz2
gentoo-2-a71c74ab483f403d9ddcc166f8f81712e9f0196f.zip
s390 goes unstable/testing as per concil decision
-rw-r--r--profiles/arch/s390/ChangeLog5
-rw-r--r--profiles/arch/s390/make.defaults4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/arch/s390/ChangeLog b/profiles/arch/s390/ChangeLog
index f7d44c6f3c89..bd027f496995 100644
--- a/profiles/arch/s390/ChangeLog
+++ b/profiles/arch/s390/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo/s390 profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.72 2013/08/22 16:07:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.73 2013/09/29 14:33:58 dilfridge Exp $
+
+ 29 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> make.defaults:
+ s390 goes unstable/testing as per concil decision
22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
Mask opencl flag due to lack of virtual/opencl keywording.
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 677752bf7dff..60824b0b991f 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.4 2013/01/21 01:57:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.5 2013/09/29 14:33:58 dilfridge Exp $
ARCH="s390"
-ACCEPT_KEYWORDS="s390"
+ACCEPT_KEYWORDS="s390 ~s390"
MULTILIB_ABIS="s390"
DEFAULT_ABI="s390"