[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/bsd/openbsd/, profiles/, profiles/prefix/bsd/openbsd/4.2/ppc/, ...

[Fabian Groffen]

commit:     f9f5c3aab3e64633ba8ba221e037607df591ac91
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 19:24:40 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:34:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f5c3aa

remove OpenBSD keywords ppc-openbsd, x86-openbsd and x64-openbsd

 eclass/qt4-build-multilib.eclass                  |  2 +-
 profiles/arch.list                                |  3 ---
 profiles/base/make.defaults                       |  2 +-
 profiles/embedded/make.defaults                   |  2 +-
 profiles/prefix/bsd/openbsd/4.2/eapi              |  1 -
 profiles/prefix/bsd/openbsd/4.2/package.mask      |  4 ----
 profiles/prefix/bsd/openbsd/4.2/parent            |  1 -
 profiles/prefix/bsd/openbsd/4.2/ppc/eapi          |  1 -
 profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults |  8 --------
 profiles/prefix/bsd/openbsd/4.2/ppc/parent        |  1 -
 profiles/prefix/bsd/openbsd/4.2/x64/eapi          |  1 -
 profiles/prefix/bsd/openbsd/4.2/x64/make.defaults |  8 --------
 profiles/prefix/bsd/openbsd/4.2/x64/parent        |  1 -
 profiles/prefix/bsd/openbsd/4.2/x86/eapi          |  1 -
 profiles/prefix/bsd/openbsd/4.2/x86/make.defaults |  8 --------
 profiles/prefix/bsd/openbsd/4.2/x86/parent        |  1 -
 profiles/prefix/bsd/openbsd/eapi                  |  1 -
 profiles/prefix/bsd/openbsd/make.defaults         | 10 ----------
 profiles/prefix/bsd/openbsd/parent                |  1 -
 profiles/prefix/bsd/openbsd/use.force             |  7 -------
 profiles/prefix/bsd/openbsd/use.mask              |  8 --------
 profiles/profiles.desc                            |  6 ------
 22 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 37aef6c..468d3f1 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -842,7 +842,7 @@ qt4_get_mkspec() {
 	# Add -64 for 64-bit prefix profiles
 	if use amd64-linux || use ppc64-linux ||
 		use x64-macos ||
-		use sparc64-freebsd || use x64-freebsd || use x64-openbsd ||
+		use sparc64-freebsd || use x64-freebsd ||
 		use sparc64-solaris || use x64-solaris
 	then
 		[[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64

diff --git a/profiles/arch.list b/profiles/arch.list
index 8e3cfc8..f532673 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -34,9 +34,6 @@ x86-macos
 x64-macos
 m68k-mint
 x86-netbsd
-ppc-openbsd
-x86-openbsd
-x64-openbsd
 sparc-solaris
 sparc64-solaris
 x64-solaris

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 53fadc8..2090b73 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -9,7 +9,7 @@
 IUSE_IMPLICIT="prefix prefix-guest"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index c3f5c28..4c75bd0 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -20,7 +20,7 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-guest"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"

diff --git a/profiles/prefix/bsd/openbsd/4.2/eapi b/profiles/prefix/bsd/openbsd/4.2/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/bsd/openbsd/4.2/package.mask b/profiles/prefix/bsd/openbsd/4.2/package.mask
deleted file mode 100644
index 4413ca2..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-

diff --git a/profiles/prefix/bsd/openbsd/4.2/parent b/profiles/prefix/bsd/openbsd/4.2/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/bsd/openbsd/4.2/ppc/eapi b/profiles/prefix/bsd/openbsd/4.2/ppc/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults b/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults
deleted file mode 100644
index df49bc0..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="ppc-openbsd"
-CHOST="powerpc-unknown-openbsd4.2"
-ACCEPT_KEYWORDS="~ppc-openbsd"
-

diff --git a/profiles/prefix/bsd/openbsd/4.2/ppc/parent b/profiles/prefix/bsd/openbsd/4.2/ppc/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/bsd/openbsd/4.2/x64/eapi b/profiles/prefix/bsd/openbsd/4.2/x64/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/x64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults b/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults
deleted file mode 100644
index bcd2e2e..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="x64-openbsd"
-CHOST="x86_64-pc-openbsd4.2"
-ACCEPT_KEYWORDS="~x64-openbsd"
-

diff --git a/profiles/prefix/bsd/openbsd/4.2/x64/parent b/profiles/prefix/bsd/openbsd/4.2/x64/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/x64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/bsd/openbsd/4.2/x86/eapi b/profiles/prefix/bsd/openbsd/4.2/x86/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults b/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults
deleted file mode 100644
index e710eb1..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-ARCH="x86-openbsd"
-CHOST="i686-pc-openbsd4.2"
-ACCEPT_KEYWORDS="~x86-openbsd"
-

diff --git a/profiles/prefix/bsd/openbsd/4.2/x86/parent b/profiles/prefix/bsd/openbsd/4.2/x86/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/prefix/bsd/openbsd/4.2/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/bsd/openbsd/eapi b/profiles/prefix/bsd/openbsd/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/bsd/openbsd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/bsd/openbsd/make.defaults b/profiles/prefix/bsd/openbsd/make.defaults
deleted file mode 100644
index 76f4785..00000000
--- a/profiles/prefix/bsd/openbsd/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# System-wide defaults for all OpenBSD profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="OpenBSD"
-KERNEL="OpenBSD"

diff --git a/profiles/prefix/bsd/openbsd/parent b/profiles/prefix/bsd/openbsd/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/prefix/bsd/openbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/prefix/bsd/openbsd/use.force b/profiles/prefix/bsd/openbsd/use.force
deleted file mode 100644
index 6e5d042..00000000
--- a/profiles/prefix/bsd/openbsd/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re-add OpenBSD OS
-kernel_OpenBSD
-elibc_OpenBSD

diff --git a/profiles/prefix/bsd/openbsd/use.mask b/profiles/prefix/bsd/openbsd/use.mask
deleted file mode 100644
index dd9e42a..00000000
--- a/profiles/prefix/bsd/openbsd/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re-add OpenBSD libc
--elibc_OpenBSD
--kernel_OpenBSD
-

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 6cc43fc..39c6a78 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -336,12 +336,6 @@ x64-freebsd		prefix/bsd/freebsd/9.0/x64			exp
 x86-freebsd		prefix/bsd/freebsd/9.1/x86			exp
 x64-freebsd		prefix/bsd/freebsd/9.1/x64			exp
 
-
-# OpenBSD Profiles
-ppc-openbsd		prefix/bsd/openbsd/4.2/ppc			exp
-x86-openbsd		prefix/bsd/openbsd/4.2/x86			exp
-x64-openbsd		prefix/bsd/openbsd/4.2/x64			exp
-
 # NetBSD Profiles
 x86-netbsd		prefix/bsd/netbsd/4.0/x86			exp