From: Michael Orlitzky <mjo@gentoo.org>
Date: Sun, 7 Jan 2018 22:08:36 +0000 (-0500)
Subject: profiles: consolidate Oracle unmask entries in arch/amd64/use.mask.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a9cebc414bae9ae0ba0ff4963fb1fdf5c4f1d2e;p=gentoo.git

profiles: consolidate Oracle unmask entries in arch/amd64/use.mask.

There were two separate blocks in arch/amd64/use.mask unmasking flags
pertaining to the Oracle database stuff. One of them had an erroneous
(outdated) comment. This commit combines them both into one block at
the top of the file, and drops the obsolete comment about PHP.

Closes: https://bugs.gentoo.org/604990
---

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index caf8d15af3f0..c875bee78cda 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -6,6 +6,12 @@
 
 # SECTION: Unmask
 
+# Michael Orlitzky <mjo@gentoo.org> (07 Jan 2018)
+# Oracle database stuff should work on amd64.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -96,11 +102,6 @@
 # Lilo works on amd64, so ...
 -lilo
 
-# 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
 -nvram
@@ -125,10 +126,6 @@
 -video_cards_vmware
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86/amd64
--oci8
-
 # Feb 16th 2007; Simon Stelling <blubb@gentoo.org>
 # Since this profile forces >=portage-2.1.2, we can unmask all
 # SIMD assembler flags