rename aarch64 keyword to arm64 to match historical naming standards, and to match what Debian has picked -- the name makes no difference to us, so lets just be the same

22 files changed, 21 insertions, 20 deletions

diff --git a/profiles/arch.list b/profiles/arch.list
index fa6a7db82b13..e4787c02fa60 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -1,8 +1,8 @@
-aarch64
 alpha
 amd64
 amd64-fbsd
 arm
+arm64
 hppa
 ia64
 m68k
diff --git a/profiles/arch/aarch64/big-endian/make.defaults b/profiles/arch/arm64/big-endian/make.defaults
index 30ce62aac977..52a30cc8599e 100644
--- a/profiles/arch/aarch64/big-endian/make.defaults
+++ b/profiles/arch/arm64/big-endian/make.defaults
@@ -1,3 +1,3 @@
-# Big endian Aarch64 settings.
+# Big endian ARM64 settings.
 
 CHOST="aarch64_be-unknown-linux-gnu"
diff --git a/profiles/arch/aarch64/big-endian/parent b/profiles/arch/arm64/big-endian/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/arch/aarch64/big-endian/parent
+++ b/profiles/arch/arm64/big-endian/parent
diff --git a/profiles/arch/aarch64/little-endian/make.defaults b/profiles/arch/arm64/little-endian/make.defaults
index c61cae8834a2..1d07b7e00729 100644
--- a/profiles/arch/aarch64/little-endian/make.defaults
+++ b/profiles/arch/arm64/little-endian/make.defaults
@@ -1,3 +1,3 @@
-# Little endian Aarch64 settings.
+# Little endian ARM64 settings.
 
 CHOST="aarch64-unknown-linux-gnu"
diff --git a/profiles/arch/aarch64/little-endian/parent b/profiles/arch/arm64/little-endian/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/arch/aarch64/little-endian/parent
+++ b/profiles/arch/arm64/little-endian/parent
diff --git a/profiles/arch/aarch64/make.defaults b/profiles/arch/arm64/make.defaults
index 13354677cd55..837fa20027ab 100644
--- a/profiles/arch/aarch64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -1,7 +1,7 @@
-# Main Aarch64 (ARMv8) profile; endian independent.
+# Main ARM64 (Aarch64/ARMv8) profile; endian independent.
 
-ARCH="aarch64"
-ACCEPT_KEYWORDS="aarch64"
+ARCH="arm64"
+ACCEPT_KEYWORDS="arm64"
 
 CFLAGS="-O2"
 CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/aarch64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f367db9b1ff9..e8e43caeb129 100644
--- a/profiles/arch/aarch64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/aarch64/package.use.mask,v 1.1 2014/01/14 05:30:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm64/package.use.mask,v 1.1 2014/01/14 20:47:46 vapier Exp $
 
 # Rick Farina <zerochaos@gentoo.org> (09 Jan 2014)
 # rjb doesn't work on arm, so no java hacks for metasploit
diff --git a/profiles/arch/aarch64/parent b/profiles/arch/arm64/parent
index eb001c6e8ab8..eb001c6e8ab8 100644
--- a/profiles/arch/aarch64/parent
+++ b/profiles/arch/arm64/parent
diff --git a/profiles/arch/aarch64/use.force b/profiles/arch/arm64/use.force
index f011be683fcf..0418ed743a94 100644
--- a/profiles/arch/aarch64/use.force
+++ b/profiles/arch/arm64/use.force
@@ -1,2 +1,2 @@
 # Force the flag which corresponds to ARCH.
-aarch64
+arm64
diff --git a/profiles/arch/aarch64/use.mask b/profiles/arch/arm64/use.mask
index 8dc80e45e966..c6471affa61c 100644
--- a/profiles/arch/aarch64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -1,5 +1,5 @@
 # Unmask the flag which corresponds to ARCH.
--aarch64
+-arm64
 
 # doomsday ebuild is not available on this architecture
 doomsday
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 40f5d4d56ad3..1720015f02db 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -3,6 +3,7 @@ alpha
 amd64
 amd64-fbsd
 arm
+arm64
 hppa
 ia64
 m68k
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index d97f3840cd24..5a69dc299966 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.107 2013/11/23 04:25:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.108 2014/01/14 20:47:47 vapier Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -9,7 +9,7 @@
 IUSE_IMPLICIT="prefix"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris 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 ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris 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 Cygwin Darwin FreeBSD glibc HPUX Interix mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Cygwin Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
diff --git a/profiles/default/linux/aarch64/parent b/profiles/default/linux/aarch64/parent
deleted file mode 100644
index dd4d18873906..000000000000
--- a/profiles/default/linux/aarch64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/aarch64
diff --git a/profiles/default/linux/aarch64/13.0/desktop/eapi b/profiles/default/linux/arm64/13.0/desktop/eapi
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/profiles/default/linux/aarch64/13.0/desktop/eapi
+++ b/profiles/default/linux/arm64/13.0/desktop/eapi
diff --git a/profiles/default/linux/aarch64/13.0/desktop/parent b/profiles/default/linux/arm64/13.0/desktop/parent
index ad6c5e126fbb..ad6c5e126fbb 100644
--- a/profiles/default/linux/aarch64/13.0/desktop/parent
+++ b/profiles/default/linux/arm64/13.0/desktop/parent
diff --git a/profiles/default/linux/aarch64/13.0/developer/eapi b/profiles/default/linux/arm64/13.0/developer/eapi
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/profiles/default/linux/aarch64/13.0/developer/eapi
+++ b/profiles/default/linux/arm64/13.0/developer/eapi
diff --git a/profiles/default/linux/aarch64/13.0/developer/parent b/profiles/default/linux/arm64/13.0/developer/parent
index 4c893748ce71..4c893748ce71 100644
--- a/profiles/default/linux/aarch64/13.0/developer/parent
+++ b/profiles/default/linux/arm64/13.0/developer/parent
diff --git a/profiles/default/linux/aarch64/13.0/eapi b/profiles/default/linux/arm64/13.0/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/aarch64/13.0/eapi
+++ b/profiles/default/linux/arm64/13.0/eapi
diff --git a/profiles/default/linux/aarch64/13.0/parent b/profiles/default/linux/arm64/13.0/parent
index 7c0377510996..7c0377510996 100644
--- a/profiles/default/linux/aarch64/13.0/parent
+++ b/profiles/default/linux/arm64/13.0/parent
diff --git a/profiles/default/linux/aarch64/13.0/use.stable.mask b/profiles/default/linux/arm64/13.0/use.stable.mask
index b222bb5e7b49..dee1936e1a9b 100644
--- a/profiles/default/linux/aarch64/13.0/use.stable.mask
+++ b/profiles/default/linux/arm64/13.0/use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/aarch64/13.0/use.stable.mask,v 1.1 2014/01/14 14:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/arm64/13.0/use.stable.mask,v 1.1 2014/01/14 20:47:47 vapier Exp $
 
 # Markus Meier <maekke@gentoo.org> (26 Dec 2013)
 # Unmask dev-lang/python-3.3* targets, bug #474128
diff --git a/profiles/default/linux/arm64/parent b/profiles/default/linux/arm64/parent
new file mode 100644
index 000000000000..63b5baf1b03f
--- /dev/null
+++ b/profiles/default/linux/arm64/parent
@@ -0,0 +1,3 @@
+../../../base
+..
+../../../arch/arm64
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 29c048195136..be751a86e7a4 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -6,11 +6,6 @@
 #layout:
 #arch		profile_directory				status
 
-# Aarch64 Profiles
-aarch64         default/linux/aarch64/13.0                      dev
-aarch64         default/linux/aarch64/13.0/desktop              dev
-aarch64         default/linux/aarch64/13.0/developer            dev
-
 # Alpha Profiles
 alpha           default/linux/alpha/13.0                        stable
 alpha           default/linux/alpha/13.0/desktop                stable
@@ -66,6 +61,11 @@ arm             default/linux/arm/13.0/armv7a/desktop/gnome     dev
 arm             default/linux/arm/13.0/armv7a/desktop/kde       dev
 arm             default/linux/arm/13.0/armv7a/developer         dev
 
+# ARM64 Profiles
+arm64           default/linux/arm64/13.0                        exp
+arm64           default/linux/arm64/13.0/desktop                exp
+arm64           default/linux/arm64/13.0/developer              exp
+
 # HPPA Profiles
 hppa            default/linux/hppa/13.0                         stable
 hppa            default/linux/hppa/13.0/desktop                 dev