mgorny      14/07/01 08:28:31

  Modified:             ChangeLog make.defaults use.mask
  Log:
  Adjust use.mask properly and hide the flags since the both profiles are 
non-multilib by default. Add IUSE_IMPLICIT.

Revision  Changes    Path
1.78                 profiles/arch/s390/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/ChangeLog?rev=1.78&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/ChangeLog?rev=1.78&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/ChangeLog?r1=1.77&r2=1.78

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog   5 Apr 2014 15:38:48 -0000       1.77
+++ ChangeLog   1 Jul 2014 08:28:31 -0000       1.78
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo/s390 profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.77 
2014/04/05 15:38:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.78 
2014/07/01 08:28:31 mgorny Exp $
+
+  01 Jul 2014; Michał Górny <[email protected]> make.defaults,
+  s390x/make.defaults, +s390x/use.mask, use.mask:
+  Adjust use.mask properly and hide the flags since the both profiles are
+  non-multilib by default. Add IUSE_IMPLICIT.
 
   05 Apr 2014; Mike Frysinger <[email protected]> make.defaults,
   s390x/make.defaults, s390x/use.force, use.force:



1.11                 profiles/arch/s390/make.defaults

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/make.defaults?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/make.defaults?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/make.defaults?r1=1.10&r2=1.11

Index: make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- make.defaults       5 Apr 2014 15:38:48 -0000       1.10
+++ make.defaults       1 Jul 2014 08:28:31 -0000       1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10 
2014/04/05 15:38:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.11 
2014/07/01 08:28:31 mgorny Exp $
 
 ARCH="s390"
 ACCEPT_KEYWORDS="s390 ~s390"
@@ -18,12 +18,14 @@
 INPUT_DEVICES="void"
 VIDEO_CARDS="dummy"
 
+# Michał Górny <[email protected]> (01 Jul 2014)
+# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
+# by non-multilib ebuilds when non-native ABIs are disabled.
+IUSE_IMPLICIT="abi_s390_32"
+
 # Enable abi_s390_32 for packages that don't have it forced.
 ABI_S390="32"
 
-# Unhide the ABI_S390 USE_EXPAND.
-USE_EXPAND_HIDDEN="-ABI_S390"
-
 # While multilib is available, we don't default it to on.
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
 USE="-multilib"



1.57                 profiles/arch/s390/use.mask

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/use.mask?rev=1.57&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/use.mask?rev=1.57&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/arch/s390/use.mask?r1=1.56&r2=1.57

Index: use.mask
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/s390/use.mask,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- use.mask    25 Jun 2014 14:22:29 -0000      1.56
+++ use.mask    1 Jul 2014 08:28:31 -0000       1.57
@@ -3,7 +3,6 @@
 
 # Unmask ABI flags for this arch.
 -abi_s390_32
--abi_s390_64
 
 # Stuff we don't want/not tested
 pbins




Reply via email to