From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-997514-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 5B919138330
	for <garchives@archives.gentoo.org>; Sun, 14 Jan 2018 02:44:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5D383E0843;
	Sun, 14 Jan 2018 02:44:38 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3C2D8E0843
	for <gentoo-commits@lists.gentoo.org>; Sun, 14 Jan 2018 02:44:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 37C70335C54
	for <gentoo-commits@lists.gentoo.org>; Sun, 14 Jan 2018 02:44:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C5B861A9
	for <gentoo-commits@lists.gentoo.org>; Sun, 14 Jan 2018 02:44:34 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1515897790.d232fdd0a3e616e2e212d79dfd160c6ddc5aa29e.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/
X-VCS-Repository: repo/gentoo
X-VCS-Files: profiles/arch/x86/use.mask
X-VCS-Directories: profiles/arch/x86/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: d232fdd0a3e616e2e212d79dfd160c6ddc5aa29e
X-VCS-Branch: master
Date: Sun, 14 Jan 2018 02:44:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cd1e8f8f-715d-4159-91aa-251c274b4da3
X-Archives-Hash: 3d10782c99a2d10f5349f59ad4763bb3

commit:     d232fdd0a3e616e2e212d79dfd160c6ddc5aa29e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 18:54:25 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 02:43:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d232fdd0

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

There were two separate blocks in arch/x86/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/604988

 profiles/arch/x86/use.mask | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 58f2fc383b6..61982cc07f4 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -4,6 +4,12 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Michael Orlitzky <mjo@gentoo.org> (13 Jan 2018)
+# Oracle database stuff should work on x86.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -120,10 +126,6 @@
 # Unmask nvidia XvMC support
 -nvidia
 
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
--oracle
-
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics
 -input_devices_vmmouse
@@ -140,12 +142,6 @@
 -video_cards_virtualbox
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86
-#
-# Shared with amd64
--oci8
-
 # Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
 # Unmask as it works on x86
 -lcd_devices_svga