[gentoo-commits] repo/gentoo:master commit in: profiles/embedded/, profiles/prefix/linux/ia64/, eclass/, profiles/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/embedded/, profiles/prefix/linux/ia64/, eclass/, profiles/, ...

[Fabian Groffen]

commit:     1d29be7d2c0750e15168cbea289d227976120c11
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 19:16:11 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:21:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d29be7d

drop ia64-linux keyword

 eclass/qt4-build-multilib.eclass         | 2 +-
 profiles/arch.list                       | 1 -
 profiles/base/make.defaults              | 2 +-
 profiles/embedded/make.defaults          | 2 +-
 profiles/prefix/linux/ia64/eapi          | 1 -
 profiles/prefix/linux/ia64/make.defaults | 6 ------
 profiles/prefix/linux/ia64/parent        | 2 --
 profiles/profiles.desc                   | 1 -
 8 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index d0b11af..68badd6 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -840,7 +840,7 @@ qt4_get_mkspec() {
 	esac
 
 	# Add -64 for 64-bit prefix profiles
-	if use amd64-linux || use ia64-linux || use ppc64-linux ||
+	if use amd64-linux || use ppc64-linux ||
 		use x64-macos ||
 		use sparc64-freebsd || use x64-freebsd || use x64-openbsd ||
 		use ia64-hpux ||

diff --git a/profiles/arch.list b/profiles/arch.list
index 4465aa0..6f5aa9f 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -29,7 +29,6 @@ x86-interix
 amd64-linux
 arm-linux
 arm64-linux
-ia64-linux
 ppc64-linux
 x86-linux
 ppc-macos

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b6e3b13..a9e9157 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 hppa-hpux ia64 ia64-hpux ia64-linux 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 hppa-hpux ia64 ia64-hpux 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_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 f9688a5..c1b582a 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 hppa-hpux ia64 ia64-hpux ia64-linux 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 hppa-hpux ia64 ia64-hpux 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_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/linux/ia64/eapi b/profiles/prefix/linux/ia64/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/prefix/linux/ia64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/linux/ia64/make.defaults b/profiles/prefix/linux/ia64/make.defaults
deleted file mode 100644
index 625f04a..00000000
--- a/profiles/prefix/linux/ia64/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# The base profile sets ACCEPT_KEYWORDS=ia64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-ia64 ~ia64-linux"

diff --git a/profiles/prefix/linux/ia64/parent b/profiles/prefix/linux/ia64/parent
deleted file mode 100644
index ead1e33..00000000
--- a/profiles/prefix/linux/ia64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/ia64/13.0
-..

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 22567a0..fc1aefb 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -254,7 +254,6 @@ x86		hardened/linux/uclibc/x86				dev
 # Linux Profiles
 amd64-linux		prefix/linux/amd64				exp
 arm-linux		prefix/linux/arm				exp
-ia64-linux		prefix/linux/ia64				exp
 ppc64-linux		prefix/linux/ppc64				exp
 x86-linux		prefix/linux/x86				exp