1 |
commit: 1d29be7d2c0750e15168cbea289d227976120c11 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 19:16:11 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 19:21:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d29be7d |
7 |
|
8 |
drop ia64-linux keyword |
9 |
|
10 |
eclass/qt4-build-multilib.eclass | 2 +- |
11 |
profiles/arch.list | 1 - |
12 |
profiles/base/make.defaults | 2 +- |
13 |
profiles/embedded/make.defaults | 2 +- |
14 |
profiles/prefix/linux/ia64/eapi | 1 - |
15 |
profiles/prefix/linux/ia64/make.defaults | 6 ------ |
16 |
profiles/prefix/linux/ia64/parent | 2 -- |
17 |
profiles/profiles.desc | 1 - |
18 |
8 files changed, 3 insertions(+), 14 deletions(-) |
19 |
|
20 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
21 |
index d0b11af..68badd6 100644 |
22 |
--- a/eclass/qt4-build-multilib.eclass |
23 |
+++ b/eclass/qt4-build-multilib.eclass |
24 |
@@ -840,7 +840,7 @@ qt4_get_mkspec() { |
25 |
esac |
26 |
|
27 |
# Add -64 for 64-bit prefix profiles |
28 |
- if use amd64-linux || use ia64-linux || use ppc64-linux || |
29 |
+ if use amd64-linux || use ppc64-linux || |
30 |
use x64-macos || |
31 |
use sparc64-freebsd || use x64-freebsd || use x64-openbsd || |
32 |
use ia64-hpux || |
33 |
|
34 |
diff --git a/profiles/arch.list b/profiles/arch.list |
35 |
index 4465aa0..6f5aa9f 100644 |
36 |
--- a/profiles/arch.list |
37 |
+++ b/profiles/arch.list |
38 |
@@ -29,7 +29,6 @@ x86-interix |
39 |
amd64-linux |
40 |
arm-linux |
41 |
arm64-linux |
42 |
-ia64-linux |
43 |
ppc64-linux |
44 |
x86-linux |
45 |
ppc-macos |
46 |
|
47 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
48 |
index b6e3b13..a9e9157 100644 |
49 |
--- a/profiles/base/make.defaults |
50 |
+++ b/profiles/base/make.defaults |
51 |
@@ -9,7 +9,7 @@ |
52 |
IUSE_IMPLICIT="prefix prefix-guest" |
53 |
USE_EXPAND_UNPREFIXED="ARCH" |
54 |
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" |
55 |
-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" |
56 |
+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" |
57 |
USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt" |
58 |
USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt" |
59 |
USE_EXPAND_VALUES_USERLAND="BSD GNU" |
60 |
|
61 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
62 |
index f9688a5..c1b582a 100644 |
63 |
--- a/profiles/embedded/make.defaults |
64 |
+++ b/profiles/embedded/make.defaults |
65 |
@@ -20,7 +20,7 @@ LINGUAS="en" |
66 |
IUSE_IMPLICIT="prefix prefix-guest" |
67 |
USE_EXPAND_UNPREFIXED="ARCH" |
68 |
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" |
69 |
-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" |
70 |
+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" |
71 |
USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt" |
72 |
USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt" |
73 |
USE_EXPAND_VALUES_USERLAND="BSD GNU" |
74 |
|
75 |
diff --git a/profiles/prefix/linux/ia64/eapi b/profiles/prefix/linux/ia64/eapi |
76 |
deleted file mode 100644 |
77 |
index 7ed6ff8..00000000 |
78 |
--- a/profiles/prefix/linux/ia64/eapi |
79 |
+++ /dev/null |
80 |
@@ -1 +0,0 @@ |
81 |
-5 |
82 |
|
83 |
diff --git a/profiles/prefix/linux/ia64/make.defaults b/profiles/prefix/linux/ia64/make.defaults |
84 |
deleted file mode 100644 |
85 |
index 625f04a..00000000 |
86 |
--- a/profiles/prefix/linux/ia64/make.defaults |
87 |
+++ /dev/null |
88 |
@@ -1,6 +0,0 @@ |
89 |
-# Copyright 1999-2009 Gentoo Foundation |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
-# $Id$ |
92 |
- |
93 |
-# The base profile sets ACCEPT_KEYWORDS=ia64 and we don't have that in prefix. |
94 |
-ACCEPT_KEYWORDS="-ia64 ~ia64-linux" |
95 |
|
96 |
diff --git a/profiles/prefix/linux/ia64/parent b/profiles/prefix/linux/ia64/parent |
97 |
deleted file mode 100644 |
98 |
index ead1e33..00000000 |
99 |
--- a/profiles/prefix/linux/ia64/parent |
100 |
+++ /dev/null |
101 |
@@ -1,2 +0,0 @@ |
102 |
-../../../default/linux/ia64/13.0 |
103 |
-.. |
104 |
|
105 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
106 |
index 22567a0..fc1aefb 100644 |
107 |
--- a/profiles/profiles.desc |
108 |
+++ b/profiles/profiles.desc |
109 |
@@ -254,7 +254,6 @@ x86 hardened/linux/uclibc/x86 dev |
110 |
# Linux Profiles |
111 |
amd64-linux prefix/linux/amd64 exp |
112 |
arm-linux prefix/linux/arm exp |
113 |
-ia64-linux prefix/linux/ia64 exp |
114 |
ppc64-linux prefix/linux/ppc64 exp |
115 |
x86-linux prefix/linux/x86 exp |