Mask oracle USe flag globally at base level and unmask for amd64/x86. This is required for me to commit freeradius without dropping ppc keyword.

9 files changed, 17 insertions, 26 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c7826ede00eb..fe44cb75b40b 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6998 2012/09/29 15:40:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6999 2012/09/30 06:59:26 flameeyes Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  30 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> arch/amd64/use.mask,
+  arch/arm/use.mask, arch/hppa/use.mask, arch/ia64/use.mask,
+  arch/powerpc/package.use.mask, arch/sparc/use.mask, arch/x86/use.mask,
+  base/use.mask:
+  Mask oracle USe flag globally at base level and unmask for amd64/x86. This is
+  required for me to commit freeradius without dropping ppc keyword.
+
   29 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> package.mask:
   Drop mask on sys-cluster/glusterfs-3.3.0
 
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index f278e55c89e7..24ba2402f5e5 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.34 2012/08/21 15:16:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.35 2012/09/30 06:59:27 flameeyes Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
@@ -64,6 +64,7 @@
 # 2007/08/19 - Christoph Mende <angelos@gentoo.org>
 # Unmask support for dev-db/oracle-instantclient-basic
 -oci8-instant-client
+-oracle
 
 # 2007/03/10 - Mike Frysinger <vapier@gentoo.org>
 # NVRAM works on x86/amd64 hosts
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index f4cfc4d76e02..01033e1c7fba 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -78,7 +78,6 @@ schroedinger
 hardened
 frei0r
 google-gadgets
-oracle
 libvirt
 pdfannotextractor
 prelude
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 64b44b7ed762..edff7f9d71f8 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -1,5 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.57 2012/07/25 02:44:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.58 2012/09/30 06:59:27 flameeyes Exp $
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
 # Jeroen Roovers <jer@gentoo.org> (23 May 2012)
@@ -146,10 +146,6 @@ ivtv
 # See http://bugs.gentoo.org/show_bug.cgi?id=157881#c3
 battery
 
-# 2006/12/30 Tobias Scherbaum <dertobi123@gentoo.org>
-# Somehow that's been missed until now ...
-oracle
-
 # 2006/12/01 Gustavo Zacarias <gustavoz@gentoo.org>
 # glitz basically unusable since we lack hardware GL see #155544
 glitz
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 4909a692d86a..dbc544be1145 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -59,7 +59,6 @@ lasi
 mpi
 networkmanager
 octave
-oracle
 timidity
 semantic-desktop
 tunepimp
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index e58e4dcf0ca3..db7687962e6a 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.140 2012/09/29 15:28:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.141 2012/09/30 06:59:27 flameeyes Exp $
 
 # Anthony G. Basile <blueness@gentoo.org> (29 Sep 2012)
 # dev-cpp/tbb does not build on ppc ppc64 so mask any
@@ -95,10 +95,6 @@ net-im/empathy map
 # Dependencies not keyworded yet, bug #372245
 media-video/miro xvid
 
-# Jeroen Roovers <jer@gentoo.org> (14 Sep 2011)
-# No Oracle support for PPC
-net-analyzer/hydra oracle
-
 # Patrick McLean <chutzpah@gentoo.org> (07 Sep 2011)
 # missing keywords on dependencies
 media-video/x264-encoder ffmpegsource
@@ -161,10 +157,6 @@ app-text/asciidoc test
 sci-biology/fasta icc
 sci-chemistry/ccp4 arpwarp
 
-# Brent Baude <ranger@gentoo.org> (13 Jan 2011)
-# no oracle stuff for powerpc
-net-im/ekg2 oracle
-
 # Nirbheek Chauhan <nirbheek@gentoo.org> (10 Dec 2010)
 # net-misc/connman is not keyworded, bug 348308
 mail-client/evolution connman
@@ -216,10 +208,6 @@ dev-ruby/activerecord sqlite3
 # Masking off video cards and input devices for xorg-1.5.3 stablization
 x11-base/xorg-server input_devices_spaceorb input_devices_mutouch input_devices_hyperpen input_devices_fpit input_devices_dynapro input_devices_calcomp input_devices_summa input_devices_elographics input_devices_citron input_devices_microtouch input_devices_jamstudio input_devices_elo2300 input_devices_penmount input_devices_tek4957 input_devices_dmc input_devices_digitaledge input_devices_palmax input_devices_magellan video_cards_v4l video_cards_cirrus video_cards_voodoo video_cards_sisusb video_cards_s3 video_cards_s3virge
 
-# Joseph Jezak <josejx@gentoo.org> (Mar 20 2009)
-# Mask Ruby -> Oracle bindings
-dev-ruby/ruby-dbi oracle
-
 # Brent Baude <ranger@gentoo.org>
 # masking zephyr USE on pidgin
 net-im/pidgin zephyr
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 897b0e0d2493..1db89103e4a0 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.94 2012/09/11 13:59:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.95 2012/09/30 06:59:28 flameeyes Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -sparc
@@ -177,7 +177,6 @@ mythtv
 netbeans
 networkmanager
 nvtv
-oracle
 pbs
 pcmcia
 rar
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index bd5a65d79eac..c683e8c76712 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.33 2012/08/21 15:16:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.34 2012/09/30 06:59:28 flameeyes Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -x86
@@ -86,6 +86,7 @@ ipmi
 
 # Unmask dev-db/oracle-instantclient-basic support
 -oci8-instant-client
+-oracle
 
 # Unmask osp, used by asterisk; bug 115798
 -osp
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 93864c2b0b0a..18fa6f003b3d 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.145 2012/08/27 15:19:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.146 2012/09/30 06:59:28 flameeyes Exp $
 
 # not ready for primetime
 packagekit
@@ -91,6 +91,7 @@ nvidia
 
 # dev-db/oracle-instantclient-basic is only available on x86
 oci8-instant-client
+oracle
 
 # net-libs/osptoolkit is only available on x86 (used by asterisk, bug 115798)
 osp