From 19519a2a06843b322d5074858242816ac6b1963a Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 30 Jan 2017 20:33:59 +0100 Subject: [PATCH] remove NetBSD keyword x86-netbsd Note this is the Prefix keyword, not the Gentoo/BSD one. --- profiles/arch.list | 1 - profiles/base/make.defaults | 2 +- profiles/embedded/make.defaults | 2 +- profiles/prefix/bsd/eapi | 1 - profiles/prefix/bsd/netbsd/4.0/eapi | 1 - profiles/prefix/bsd/netbsd/4.0/parent | 1 - profiles/prefix/bsd/netbsd/4.0/x86/eapi | 1 - .../prefix/bsd/netbsd/4.0/x86/make.defaults | 8 ------ profiles/prefix/bsd/netbsd/4.0/x86/parent | 1 - profiles/prefix/bsd/netbsd/eapi | 1 - profiles/prefix/bsd/netbsd/make.defaults | 10 -------- profiles/prefix/bsd/netbsd/parent | 1 - profiles/prefix/bsd/netbsd/use.force | 7 ------ profiles/prefix/bsd/netbsd/use.mask | 8 ------ profiles/prefix/bsd/package.use.mask | 7 ------ profiles/prefix/bsd/packages | 6 ----- profiles/prefix/bsd/parent | 2 -- profiles/prefix/bsd/use.mask | 25 ------------------- profiles/profiles.desc | 3 --- 19 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 profiles/prefix/bsd/eapi delete mode 100644 profiles/prefix/bsd/netbsd/4.0/eapi delete mode 100644 profiles/prefix/bsd/netbsd/4.0/parent delete mode 100644 profiles/prefix/bsd/netbsd/4.0/x86/eapi delete mode 100644 profiles/prefix/bsd/netbsd/4.0/x86/make.defaults delete mode 100644 profiles/prefix/bsd/netbsd/4.0/x86/parent delete mode 100644 profiles/prefix/bsd/netbsd/eapi delete mode 100644 profiles/prefix/bsd/netbsd/make.defaults delete mode 100644 profiles/prefix/bsd/netbsd/parent delete mode 100644 profiles/prefix/bsd/netbsd/use.force delete mode 100644 profiles/prefix/bsd/netbsd/use.mask delete mode 100644 profiles/prefix/bsd/package.use.mask delete mode 100644 profiles/prefix/bsd/packages delete mode 100644 profiles/prefix/bsd/parent delete mode 100644 profiles/prefix/bsd/use.mask diff --git a/profiles/arch.list b/profiles/arch.list index f82b3be4768d..6b702f1cd2d3 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -29,7 +29,6 @@ ppc-macos x86-macos x64-macos m68k-mint -x86-netbsd sparc-solaris sparc64-solaris x64-solaris diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 9bc52b988161..3d634df97d10 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 riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-netbsd 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-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos 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 62e63fbda112..f10a9bc330e4 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 riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-netbsd 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-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos 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/eapi b/profiles/prefix/bsd/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/bsd/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/bsd/netbsd/4.0/eapi b/profiles/prefix/bsd/netbsd/4.0/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/bsd/netbsd/4.0/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/bsd/netbsd/4.0/parent b/profiles/prefix/bsd/netbsd/4.0/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/bsd/netbsd/4.0/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/bsd/netbsd/4.0/x86/eapi b/profiles/prefix/bsd/netbsd/4.0/x86/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/bsd/netbsd/4.0/x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/bsd/netbsd/4.0/x86/make.defaults b/profiles/prefix/bsd/netbsd/4.0/x86/make.defaults deleted file mode 100644 index defaf2de924d..000000000000 --- a/profiles/prefix/bsd/netbsd/4.0/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-netbsd" -# we use *-netbsdelf* to avoid the need to patch binutils, gcc and co -CHOST="i686-pc-netbsdelf4.0" -ACCEPT_KEYWORDS="~x86-netbsd" diff --git a/profiles/prefix/bsd/netbsd/4.0/x86/parent b/profiles/prefix/bsd/netbsd/4.0/x86/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/bsd/netbsd/4.0/x86/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/bsd/netbsd/eapi b/profiles/prefix/bsd/netbsd/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/bsd/netbsd/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/bsd/netbsd/make.defaults b/profiles/prefix/bsd/netbsd/make.defaults deleted file mode 100644 index 626938eaf52d..000000000000 --- a/profiles/prefix/bsd/netbsd/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 NetBSD profiles -# This file should rarely need to be changed - -# 'Sane' defaults -ELIBC="NetBSD" -KERNEL="NetBSD" diff --git a/profiles/prefix/bsd/netbsd/parent b/profiles/prefix/bsd/netbsd/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/bsd/netbsd/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/bsd/netbsd/use.force b/profiles/prefix/bsd/netbsd/use.force deleted file mode 100644 index 587cf1222ff4..000000000000 --- a/profiles/prefix/bsd/netbsd/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 NetBSD OS -kernel_NetBSD -elibc_NetBSD diff --git a/profiles/prefix/bsd/netbsd/use.mask b/profiles/prefix/bsd/netbsd/use.mask deleted file mode 100644 index 956bc5d1e8a4..000000000000 --- a/profiles/prefix/bsd/netbsd/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 NetBSD libc --elibc_NetBSD --kernel_NetBSD - diff --git a/profiles/prefix/bsd/package.use.mask b/profiles/prefix/bsd/package.use.mask deleted file mode 100644 index 3fa7d51f03bb..000000000000 --- a/profiles/prefix/bsd/package.use.mask +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Michael Haubenwallner (30 Sep 2009) -# *bsd do have a uuid implementation in libc (#230981). -x11-libs/libSM -uuid diff --git a/profiles/prefix/bsd/packages b/profiles/prefix/bsd/packages deleted file mode 100644 index 3b40ae877bf0..000000000000 --- a/profiles/prefix/bsd/packages +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -*sys-devel/binutils -*sys-process/pidof-bsd diff --git a/profiles/prefix/bsd/parent b/profiles/prefix/bsd/parent deleted file mode 100644 index cd1149221a41..000000000000 --- a/profiles/prefix/bsd/parent +++ /dev/null @@ -1,2 +0,0 @@ -../../base -.. diff --git a/profiles/prefix/bsd/use.mask b/profiles/prefix/bsd/use.mask deleted file mode 100644 index 90307ef611e5..000000000000 --- a/profiles/prefix/bsd/use.mask +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# these will more than likely never work on bsd -3dfx -acpi -alsa -apm -caps -cman -clvm -directfb -djbfft -fbcon -fmod -ggi -gpm -hardened -svga -sybase -sybase-ct -rtc -uclibc -v4l diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 5cfd5228771a..288c9c3fc8a1 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -313,9 +313,6 @@ x86-winnt prefix/windows/winnt/6.1/x86 exp x86-cygwin prefix/windows/cygwin/x86 exp x64-cygwin prefix/windows/cygwin/x64 exp -# NetBSD Profiles -x86-netbsd prefix/bsd/netbsd/4.0/x86 exp - # FreeMiNT m68k-mint prefix/mint/m68k exp -- 2.26.2