[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/, profiles/prefix/linux-standalone/x86/legacy/, ...

2019-02-20 Thread Fabian Groffen
commit: 7dd8436b77c2b9f4a5a41768f472477b12880a00
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Feb 20 08:04:17 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Feb 20 08:04:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd8436b

profiles: remove prefix/linux-standalone deprecated profiles

Closes: https://bugs.gentoo.org/673278
Signed-off-by: Fabian Groffen  gentoo.org>

 profiles/prefix/linux-standalone/amd64/deprecated |  1 -
 profiles/prefix/linux-standalone/amd64/eapi   |  1 -
 profiles/prefix/linux-standalone/amd64/legacy/deprecated  |  1 -
 profiles/prefix/linux-standalone/amd64/legacy/eapi|  1 -
 profiles/prefix/linux-standalone/amd64/legacy/parent  |  2 --
 profiles/prefix/linux-standalone/amd64/make.defaults  |  4 
 profiles/prefix/linux-standalone/amd64/parent |  2 --
 profiles/prefix/linux-standalone/arm/armv7a/deprecated|  1 -
 profiles/prefix/linux-standalone/arm/armv7a/eapi  |  1 -
 profiles/prefix/linux-standalone/arm/armv7a/make.defaults |  4 
 profiles/prefix/linux-standalone/arm/armv7a/parent|  2 --
 profiles/prefix/linux-standalone/arm64/deprecated |  1 -
 profiles/prefix/linux-standalone/arm64/eapi   |  1 -
 profiles/prefix/linux-standalone/arm64/make.defaults  |  4 
 profiles/prefix/linux-standalone/arm64/parent |  3 ---
 profiles/prefix/linux-standalone/make.defaults| 13 -
 profiles/prefix/linux-standalone/parent   |  1 -
 profiles/prefix/linux-standalone/ppc64/eapi   |  1 -
 profiles/prefix/linux-standalone/ppc64/make.defaults  |  4 
 profiles/prefix/linux-standalone/ppc64/parent |  2 --
 profiles/prefix/linux-standalone/x86/deprecated   |  1 -
 profiles/prefix/linux-standalone/x86/eapi |  1 -
 profiles/prefix/linux-standalone/x86/legacy/deprecated|  1 -
 profiles/prefix/linux-standalone/x86/legacy/eapi  |  1 -
 profiles/prefix/linux-standalone/x86/legacy/parent|  2 --
 profiles/prefix/linux-standalone/x86/make.defaults|  4 
 profiles/prefix/linux-standalone/x86/parent   |  2 --
 profiles/profiles.desc|  7 ---
 28 files changed, 69 deletions(-)

diff --git a/profiles/prefix/linux-standalone/amd64/deprecated 
b/profiles/prefix/linux-standalone/amd64/deprecated
deleted file mode 100644
index 983bdfa119d..000
--- a/profiles/prefix/linux-standalone/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+

diff --git a/profiles/prefix/linux-standalone/amd64/eapi 
b/profiles/prefix/linux-standalone/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/linux-standalone/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/linux-standalone/amd64/legacy/deprecated 
b/profiles/prefix/linux-standalone/amd64/legacy/deprecated
deleted file mode 100644
index d0a45b2f790..000
--- a/profiles/prefix/linux-standalone/amd64/legacy/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+

diff --git a/profiles/prefix/linux-standalone/amd64/legacy/eapi 
b/profiles/prefix/linux-standalone/amd64/legacy/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/linux-standalone/amd64/legacy/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent 
b/profiles/prefix/linux-standalone/amd64/legacy/parent
deleted file mode 100644
index f8002c688eb..000
--- a/profiles/prefix/linux-standalone/amd64/legacy/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/prefix/standalone/kernel-2.6.16+

diff --git a/profiles/prefix/linux-standalone/amd64/make.defaults 
b/profiles/prefix/linux-standalone/amd64/make.defaults
deleted file mode 100644
index d0228073bb3..000
--- a/profiles/prefix/linux-standalone/amd64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"

diff --git a/profiles/prefix/linux-standalone/amd64/parent 
b/profiles/prefix/linux-standalone/amd64/parent
deleted file mode 100644
index 16c974fd71e..000
--- a/profiles/prefix/linux-standalone/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/amd64/13.0/no-multilib
-..

diff --git a/profiles/prefix/linux-standalone/arm/armv7a/deprecated 
b/profiles/prefix/linux-standalone/arm/armv7a/deprecated
deleted file mode 100644
index 365d8cf2cd6..000
--- a/profiles/prefix/linux-standalone/arm/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a/prefix/kernel-3.2+

diff --git a/profiles/prefix/linux-standalone/arm/armv7a/eapi 
b/profiles/prefix/linux-standalone/arm/armv7

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/arm64/, ...

2018-02-25 Thread Benda XU
commit: ab9d51883fb6868868b5d44c4c08c5c3cc5c7a59
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Feb 25 22:28:29 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Feb 25 22:29:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9d5188

Deprecate prefix/linux-standalone profiles by 17.0 counterparts.

 profiles/prefix/linux-standalone/arm/armv7a/deprecated | 1 +
 profiles/prefix/linux-standalone/arm64/deprecated  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/profiles/prefix/linux-standalone/arm/armv7a/deprecated 
b/profiles/prefix/linux-standalone/arm/armv7a/deprecated
new file mode 100644
index 000..365d8cf2cd6
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a/prefix/kernel-3.2+

diff --git a/profiles/prefix/linux-standalone/arm64/deprecated 
b/profiles/prefix/linux-standalone/arm64/deprecated
new file mode 100644
index 000..bdc15f2b885
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm64/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/prefix/kernel-3.2+



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/amd64/legacy/, ...

2018-01-17 Thread Benda XU
commit: e9ed6e4075c87f883b2d7509b4ddb5470e53e8dd
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Jan 17 09:24:32 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Jan 17 12:33:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ed6e40

profiles/prefix/linux-standalone: direct users to migrate to 17.0.

 profiles/prefix/linux-standalone/amd64/deprecated| 1 +
 profiles/prefix/linux-standalone/amd64/legacy/deprecated | 1 +
 profiles/prefix/linux-standalone/x86/deprecated  | 1 +
 profiles/prefix/linux-standalone/x86/legacy/deprecated   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/profiles/prefix/linux-standalone/amd64/deprecated 
b/profiles/prefix/linux-standalone/amd64/deprecated
new file mode 100644
index 000..983bdfa119d
--- /dev/null
+++ b/profiles/prefix/linux-standalone/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+

diff --git a/profiles/prefix/linux-standalone/amd64/legacy/deprecated 
b/profiles/prefix/linux-standalone/amd64/legacy/deprecated
new file mode 100644
index 000..d0a45b2f790
--- /dev/null
+++ b/profiles/prefix/linux-standalone/amd64/legacy/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+

diff --git a/profiles/prefix/linux-standalone/x86/deprecated 
b/profiles/prefix/linux-standalone/x86/deprecated
new file mode 100644
index 000..46d6870c265
--- /dev/null
+++ b/profiles/prefix/linux-standalone/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/prefix/kernel-3.2+

diff --git a/profiles/prefix/linux-standalone/x86/legacy/deprecated 
b/profiles/prefix/linux-standalone/x86/legacy/deprecated
new file mode 100644
index 000..eac26c23f3e
--- /dev/null
+++ b/profiles/prefix/linux-standalone/x86/legacy/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/prefix/kernel-2.6.16+



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

2018-01-07 Thread Benda XU
commit: 432cbaf78b08c242af523efc80d360c148fa95e7
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Jan  8 06:30:20 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Jan  8 07:04:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432cbaf7

profiles: prefix refactorization.

  legacy profiles explicitly refer to the kernel supported.

 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/make.defaults   | 0
 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/package.mask| 3 ++-
 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/package.unmask  | 1 +
 profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent| 1 +
 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/profile.bashrc  | 0
 profiles/features/prefix/standalone/make.defaults  | 2 ++
 .../{prefix/linux-standalone => features/prefix/standalone}/packages   | 0
 .../linux-standalone => features/prefix/standalone}/profile.bashrc | 0
 profiles/prefix/linux-standalone/amd64/legacy/parent   | 2 +-
 profiles/prefix/linux-standalone/eapi  | 1 -
 profiles/prefix/linux-standalone/x86/legacy/parent | 2 +-
 11 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/profiles/features/prefix/standalone/legacy/make.defaults 
b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
similarity index 100%
rename from profiles/features/prefix/standalone/legacy/make.defaults
rename to profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults

diff --git a/profiles/features/prefix/standalone/legacy/package.mask 
b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
similarity index 78%
rename from profiles/features/prefix/standalone/legacy/package.mask
rename to profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
index 5125269d289..0aa01a72efb 100644
--- a/profiles/features/prefix/standalone/legacy/package.mask
+++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
@@ -1,7 +1,8 @@
 # >=glibc-2.20 requires >=linux-2.6.32.
+# https://lwn.net/Articles/611162
 >=sys-libs/glibc-2.20
 
 # >=python-3.4 assumes F_DUPFD_CLOEXEC of fcntl,
 # which requires >=linux-2.6.24.
 # python-3.3 seems to be unconditionally using utimensat.
->=dev-lang/python-3
\ No newline at end of file
+>=dev-lang/python-3

diff --git a/profiles/features/prefix/standalone/legacy/package.unmask 
b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
similarity index 64%
rename from profiles/features/prefix/standalone/legacy/package.unmask
rename to 
profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
index 0d7380b4273..9b37b138638 100644
--- a/profiles/features/prefix/standalone/legacy/package.unmask
+++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
@@ -1,2 +1,3 @@
 # >=glibc-2.20 requires >=linux-2.6.32.
+# https://lwn.net/Articles/611162
 https://docs.python.org/devguide/#status-of-python-branches
 ac_cv_func_getentropy=no
+# Reconsider the stability of Prefix in 2019.
+ACCEPT_KEYWORDS="~${ARCH}"

diff --git a/profiles/prefix/linux-standalone/packages 
b/profiles/features/prefix/standalone/packages
similarity index 100%
rename from profiles/prefix/linux-standalone/packages
rename to profiles/features/prefix/standalone/packages

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/features/prefix/standalone/profile.bashrc
similarity index 100%
rename from profiles/prefix/linux-standalone/profile.bashrc
rename to profiles/features/prefix/standalone/profile.bashrc

diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent 
b/profiles/prefix/linux-standalone/amd64/legacy/parent
index 0ca4be1beb9..a0af8587772 100644
--- a/profiles/prefix/linux-standalone/amd64/legacy/parent
+++ b/profiles/prefix/linux-standalone/amd64/legacy/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/prefix/standalone/legacy
+../../../../features/prefix/standalone/beyond-kernel-2.6.16

diff --git a/profiles/prefix/linux-standalone/eapi 
b/profiles/prefix/linux-standalone/eapi
deleted file mode 100644
index 7ed6ff82de6..000
--- a/profiles/prefix/linux-standalone/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent 
b/profiles/prefix/linux-standalone/x86/legacy/parent
index 0ca4be1beb9..a0af8587772 100644
--- a/profiles/prefix/linux-standalone/x86/legacy/parent
+++ b/profiles/prefix/linux-standalone/x86/legacy/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/prefix/standalone/legacy
+../../../../features/prefix/standalone/beyond-kernel-2.6.16



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2017-11-28 Thread Benda XU
commit: ab2e3a4026e093e0cf17b46b5bcc308a861f93c8
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Nov 29 02:43:31 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Nov 29 03:56:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2e3a40

p/p/l-s/profile.bashrc: prefixify files-XXX.c in sys-libs/glibc.

 profiles/prefix/linux-standalone/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 4b39a3e25d5..60a2af632d1 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -36,7 +36,7 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && 
${EBUILD_PHASE} == compile ]]; th
 for f in libio/iopopen.c \
 shadow/lckpwdf.c resolv/{netdb,resolv}.h elf/rtld.c \
 nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \
-nss/{bug-erange,nss_files/files-init{,groups}}.c \
+nss/{bug-erange,nss_files/files-{XXX,init{,groups}}}.c \
 sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c}
 do
ebegin "  Updating $f"



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/ppc64/, profiles/

2017-02-08 Thread Benda XU
commit: 8097746069f3cd00a3c53c249fa885db2d0239f6
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Jan 29 12:07:10 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Feb  9 04:47:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80977460

profiles/prefix/linux-standalone: add ppc64 big endian.

Credit: François Bissey
Reference: 
https://archives.gentoo.org/gentoo-alt/message/fe49595527e3c7918844096bf2ae289c

 profiles/prefix/linux-standalone/ppc64/eapi  | 1 +
 profiles/prefix/linux-standalone/ppc64/make.defaults | 5 +
 profiles/prefix/linux-standalone/ppc64/parent| 2 ++
 profiles/profiles.desc   | 1 +
 4 files changed, 9 insertions(+)

diff --git a/profiles/prefix/linux-standalone/ppc64/eapi 
b/profiles/prefix/linux-standalone/ppc64/eapi
new file mode 100644
index 00..7ed6ff82de
--- /dev/null
+++ b/profiles/prefix/linux-standalone/ppc64/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/linux-standalone/ppc64/make.defaults 
b/profiles/prefix/linux-standalone/ppc64/make.defaults
new file mode 100644
index 00..04e73caaa1
--- /dev/null
+++ b/profiles/prefix/linux-standalone/ppc64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+ACCEPT_KEYWORDS="~${ARCH}"

diff --git a/profiles/prefix/linux-standalone/ppc64/parent 
b/profiles/prefix/linux-standalone/ppc64/parent
new file mode 100644
index 00..51fedc0bc3
--- /dev/null
+++ b/profiles/prefix/linux-standalone/ppc64/parent
@@ -0,0 +1,2 @@
+../../../default/linux/powerpc/ppc64/13.0/64bit-userland
+..

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 288c9c3fc8..7a67bde8c0 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -264,6 +264,7 @@ x86-linux   prefix/linux-standalone/x86 
exp
 x86-linux  prefix/linux-standalone/x86/legacy  exp
 arm-linux  prefix/linux-standalone/arm/armv7a  exp
 arm64-linuxprefix/linux-standalone/arm64   exp
+ppc64-linuxprefix/linux-standalone/ppc64   exp
 
 # Mac OS X Profiles
 ppc-macos  prefix/darwin/macos/10.4/ppcexp



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2017-02-08 Thread Benda XU
commit: adbd84a0f19254fc60e799d4d744c3aca5b74618
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Jan 29 12:31:38 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Feb  9 04:47:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbd84a0

profiles/p/l-s/profile.bashrc: update sed for ppc64.

Credit: François Bissey
Reference: 
https://archives.gentoo.org/gentoo-alt/message/d890ad55f3ac96f4db5d7f8291351834

 profiles/prefix/linux-standalone/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index b46c49efdc..4b39a3e25d 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -11,7 +11,7 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} 
== configure ]]; the
 einfo "Prefixifying dynamic linkers..."
 for h in gcc/config/*/*linux*.h; do
ebegin "  Updating $h"
-   sed -i -r "s,(_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h
+   sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h
eend $?
 done
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/, profiles/prefix/linux-standalone/arm64/, ...

2017-01-10 Thread Benda XU
commit: 78309bea001dec4cfc55fd5ff94ec8fb3c4c3957
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jan 10 17:03:53 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jan 10 17:05:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78309bea

profiles/prefix/linux-standalone: add arm64.

Credit: kholk

 profiles/prefix/linux-standalone/arm64/eapi  | 1 +
 profiles/prefix/linux-standalone/arm64/make.defaults | 5 +
 profiles/prefix/linux-standalone/arm64/parent| 3 +++
 profiles/prefix/linux-standalone/profile.bashrc  | 2 +-
 profiles/profiles.desc   | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/arm64/eapi 
b/profiles/prefix/linux-standalone/arm64/eapi
new file mode 100644
index ..7ed6ff8
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm64/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/linux-standalone/arm64/make.defaults 
b/profiles/prefix/linux-standalone/arm64/make.defaults
new file mode 100644
index ..1e50879
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+ACCEPT_KEYWORDS="~${ARCH}"

diff --git a/profiles/prefix/linux-standalone/arm64/parent 
b/profiles/prefix/linux-standalone/arm64/parent
new file mode 100644
index ..522a9bf
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm64/parent
@@ -0,0 +1,3 @@
+../../../default/linux/arm64/13.0/
+..
+../../../arch/arm64/little-endian/

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 589f49b..b46c49e 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -9,7 +9,7 @@
 if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; 
then
 cd "${S}"
 einfo "Prefixifying dynamic linkers..."
-for h in gcc/config/*/linux*.h; do
+for h in gcc/config/*/*linux*.h; do
ebegin "  Updating $h"
sed -i -r "s,(_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h
eend $?

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 613d460..4958e11 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -256,6 +256,7 @@ amd64-linux prefix/linux-standalone/amd64/legacy
exp
 x86-linux  prefix/linux-standalone/x86 exp
 x86-linux  prefix/linux-standalone/x86/legacy  exp
 arm-linux  prefix/linux-standalone/arm/armv7a  exp
+arm64-linuxprefix/linux-standalone/arm64   exp
 
 # Mac OS X Profiles
 ppc-macos  prefix/darwin/macos/10.4/ppcexp



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-12-11 Thread Benda XU
commit: d95234edd2efbd785e41dcbb29f0a323f085b1d9
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec 11 11:29:11 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec 11 11:29:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95234ed

profiles/prefix/linux-standalone/profile.bashrc: fix grammar.

 profiles/prefix/linux-standalone/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 73033de..589f49b 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -1,5 +1,5 @@
 # -*- mode: shell-script; -*-
-# RAP specific patches that is pending upstream.
+# RAP specific patches pending upstream:
 # binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
 # gcc: https://gcc.gnu.org/ml/gcc-patches/2014-12/msg00331.html
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-07-21 Thread Benda XU
commit: 6ef6412864b3a3401710c0a4fe99c19dc48f41be
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Jul 21 12:34:51 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Jul 21 13:23:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef64128

profile/p/l-s/profile.bashrc: prefixify all the dynamic linkers.

  To be compatible with the macros in gcc-4.1.2.

 profiles/prefix/linux-standalone/profile.bashrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index ed35237..73033de 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -8,10 +8,10 @@
 
 if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; 
then
 cd "${S}"
-einfo "Prefixifying glibc dynamic linker..."
+einfo "Prefixifying dynamic linkers..."
 for h in gcc/config/*/linux*.h; do
ebegin "  Updating $h"
-   sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h
+   sed -i -r "s,(_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h
eend $?
 done
 



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-06-15 Thread Benda XU
commit: 371a03cadf5cb9ef858265dd9295c7645e1c3850
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Jun 15 08:05:11 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Jun 15 08:06:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371a03ca

p/p/l-s/profile.bashrc: don't build zlib test binaries during bootstrap.

 profiles/prefix/linux-standalone/profile.bashrc | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 77092b9..ed35237 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -73,6 +73,11 @@ elif [[ ${CATEGORY}/${PN} == sys-devel/make && 
${EBUILD_PHASE} == prepare ]]; th
 ebegin "Prefixifying default shell"
 sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c
 eend $?
+elif [[ ${CATEGORY}/${PN} == sys-libs/zlib && ${EBUILD_PHASE} == prepare ]]; 
then
+[[ -n "${BOOTSTRAP_RAP}" ]] || return 0
+ebegin "Remove executable builds for bootstrap"
+sed -i 's/ALL=.*/ALL="\\$(LIBS)"/' "${S}"/configure
+eend $?
 elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; 
then
 # introduced in bug 419525, subtle glibc location difference.
 ebegin "Prefixifying ext/iconv/config.m4 paths"



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-06-13 Thread Benda XU
commit: f66f3a933539d7a73ede984c7b554687dcfc8a62
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun 14 04:45:06 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun 14 04:46:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66f3a93

p/p/l-s/profile.bashrc: on RAP iconv is provided by glibc.
Bug: 419525

 profiles/prefix/linux-standalone/profile.bashrc | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index e2902e1..77092b9 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -73,4 +73,9 @@ elif [[ ${CATEGORY}/${PN} == sys-devel/make && 
${EBUILD_PHASE} == prepare ]]; th
 ebegin "Prefixifying default shell"
 sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c
 eend $?
+elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; 
then
+# introduced in bug 419525, subtle glibc location difference.
+ebegin "Prefixifying ext/iconv/config.m4 paths"
+sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" 
"${S}"/ext/iconv/config.m4
+eend $?
 fi



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-06-13 Thread Benda XU
commit: e5cf36e3a4a2a75cb773febde1653a1a01887513
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun 14 01:17:15 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun 14 04:46:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cf36e3

p/p/linux-standalone/profile.bashrc: add gcc PATCH link.

 profiles/prefix/linux-standalone/profile.bashrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 2b0e3b1..e2902e1 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -1,6 +1,7 @@
 # -*- mode: shell-script; -*-
 # RAP specific patches that is pending upstream.
 # binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
+# gcc: https://gcc.gnu.org/ml/gcc-patches/2014-12/msg00331.html
 
 # Disable RAP trick during bootstrap stage2
 [[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-06-06 Thread Benda XU
commit: d06378978a7f3769901b7fa33bb92c81f76956a1
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun  7 02:35:34 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun  7 02:36:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0637897

profiles/prefix/linux-standalone: remove perl android logics.

 profiles/prefix/linux-standalone/profile.bashrc | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 8399ce6..2b0e3b1 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -60,8 +60,13 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/python && 
${EBUILD_PHASE} == configure ]];
 eend $?
 elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; 
then
 ebegin "Prefixifying pwd path"
-sed -i -r \
-   -e "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," "${S}"/dist/PathTools/Cwd.pm
+sed -r "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," -i 
"${S}"/dist/PathTools/Cwd.pm
+eend $?
+
+# Configure checks for /system/lib/libandroid.so to override linux into 
linux-android,
+# which is not desired for Gentoo
+ebegin "Removing Android detection"
+sed "/libandroid.so/d" -i "${S}"/Configure
 eend $?
 elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; 
then
 ebegin "Prefixifying default shell"



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/x86/, ...

2016-06-05 Thread Benda XU
commit: 89c1a04e87b1162539a0925eff8824b149753178
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Jun  5 14:36:37 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Jun  5 14:38:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c1a04e

p/p/l-s/arm: add arm profile for prefix-standalone.

 profiles/prefix/linux-standalone/amd64/make.defaults   | 4 +---
 profiles/prefix/linux-standalone/arm/armv7a/eapi   | 1 +
 profiles/prefix/linux-standalone/{x86 => arm/armv7a}/make.defaults | 4 +---
 profiles/prefix/linux-standalone/arm/armv7a/parent | 2 ++
 profiles/prefix/linux-standalone/x86/make.defaults | 4 +---
 profiles/profiles.desc | 1 +
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/profiles/prefix/linux-standalone/amd64/make.defaults 
b/profiles/prefix/linux-standalone/amd64/make.defaults
index 00115a2..fda0023 100644
--- a/profiles/prefix/linux-standalone/amd64/make.defaults
+++ b/profiles/prefix/linux-standalone/amd64/make.defaults
@@ -2,6 +2,4 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
-ACCEPT_KEYWORDS="~amd64 ~amd64-linux"
+ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"

diff --git a/profiles/prefix/linux-standalone/arm/armv7a/eapi 
b/profiles/prefix/linux-standalone/arm/armv7a/eapi
new file mode 100644
index 000..7ed6ff8
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm/armv7a/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/prefix/linux-standalone/x86/make.defaults 
b/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
similarity index 61%
copy from profiles/prefix/linux-standalone/x86/make.defaults
copy to profiles/prefix/linux-standalone/arm/armv7a/make.defaults
index dddce96..1e50879 100644
--- a/profiles/prefix/linux-standalone/x86/make.defaults
+++ b/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
@@ -2,6 +2,4 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86"
-CHOST="i686-pc-linux-gnu"
-ACCEPT_KEYWORDS="~x86 ~x86-linux"
+ACCEPT_KEYWORDS="~${ARCH}"

diff --git a/profiles/prefix/linux-standalone/arm/armv7a/parent 
b/profiles/prefix/linux-standalone/arm/armv7a/parent
new file mode 100644
index 000..4365b5e
--- /dev/null
+++ b/profiles/prefix/linux-standalone/arm/armv7a/parent
@@ -0,0 +1,2 @@
+../../../../default/linux/arm/13.0/armv7a
+../..

diff --git a/profiles/prefix/linux-standalone/x86/make.defaults 
b/profiles/prefix/linux-standalone/x86/make.defaults
index dddce96..fda0023 100644
--- a/profiles/prefix/linux-standalone/x86/make.defaults
+++ b/profiles/prefix/linux-standalone/x86/make.defaults
@@ -2,6 +2,4 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-ARCH="x86"
-CHOST="i686-pc-linux-gnu"
-ACCEPT_KEYWORDS="~x86 ~x86-linux"
+ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index e44910d..fe19555 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -254,6 +254,7 @@ amd64-linux prefix/linux-standalone/amd64   
exp
 amd64-linuxprefix/linux-standalone/amd64/legacyexp
 x86-linux  prefix/linux-standalone/x86 exp
 x86-linux  prefix/linux-standalone/x86/legacy  exp
+arm-linux  prefix/linux-standalone/arm/armv7a  exp
 
 # Mac OS X Profiles
 ppc-macos  prefix/darwin/macos/10.4/ppcexp



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-06-03 Thread Benda XU
commit: 515c7d78d2c1bb3c09903ca23d7de8d957ba4cb9
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Jun  2 23:55:43 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Jun  4 02:25:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515c7d78

p/p/l-s/profile.bashrc: prefixify perl pwd call.

  prefixify python distutils paths.

  change glibc prefixify phase to "compile".
  glibc-2.19 is EAPI=0, which does not have a "configure" phase.

  prefixify path to /etc/ld.so.conf.

 profiles/prefix/linux-standalone/profile.bashrc | 26 -
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 90bfc60..8399ce6 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -21,12 +21,14 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} 
== configure ]]; the
 sed -i 's/--sysroot=%R//' gcc/gcc.c
 eend $?
 elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare 
]]; then
-cd "${S}"
 ebegin "Prefixifying native library path"
 sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
-   ld/configure.tgt
+   "${S}"/ld/configure.tgt
+eend $?
+ebegin "Prefixifying path to /etc/ld.so.conf"
+sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${S}"/ld/emultempl/elf32.em
 eend $?
-elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure 
]]; then
+elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; 
then
 cd "${S}"
 einfo "Prefixifying hardcoded path"
 
@@ -37,8 +39,7 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && 
${EBUILD_PHASE} == configure ]];
 sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c}
 do
ebegin "  Updating $f"
-   sed -i -r \
-   -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f
+   sed -i -r "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f
eend $?
 done
 ebegin "  Updating nss/db-Makefile"
@@ -48,15 +49,22 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && 
${EBUILD_PHASE} == configure ]];
 eend $?
 elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure 
]]; then
 # Guide h2py to look into glibc of Prefix
-ebegin "Guide h2py to look into Prefix"
+ebegin "Guiding h2py to look into Prefix"
 export include="${EPREFIX}"/usr/include
 sed -i -r \
-e "s,/usr/include,\"${EPREFIX}\"/usr/include,g" 
"${S}"/Lib/plat-linux*/regen
 eend $?
+ebegin "Prefixifying distutils paths"
+sed -re 
"s,([^[:alnum:]])(/usr[/[:alnum:]]*/(lib[[:alnum:]]*|include)|/lib[[:alnum:]]*),\1${EPREFIX}\2,g"
 \
+   -i "${S}"/setup.py
+eend $?
+elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; 
then
+ebegin "Prefixifying pwd path"
+sed -i -r \
+   -e "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," "${S}"/dist/PathTools/Cwd.pm
+eend $?
 elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; 
then
-cd "${S}"
 ebegin "Prefixifying default shell"
-sed -i -r \
-   -e "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," job.c
+sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c
 eend $?
 fi



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-06-02 Thread Benda XU
commit: 45de8960d86a56bc8417017e925e529088d04ce4
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Jun  2 13:21:17 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Jun  2 13:26:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45de8960

p/p/l-s/profile.bashrc: prefixify shell of make.

 profiles/prefix/linux-standalone/profile.bashrc | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index fad9d0b..90bfc60 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -10,8 +10,7 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} 
== configure ]]; the
 einfo "Prefixifying glibc dynamic linker..."
 for h in gcc/config/*/linux*.h; do
ebegin "  Updating $h"
-   sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," \
-   $h || eerror "Please file a bug about this"
+   sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h
eend $?
 done
 
@@ -19,14 +18,13 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} 
== configure ]]; the
 EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}"
 
 ebegin "remove --sysroot call on ld for native toolchain"
-sed -i 's/--sysroot=%R//' \
-   gcc/gcc.c || eerror "Please file a bug about this"
+sed -i 's/--sysroot=%R//' gcc/gcc.c
 eend $?
 elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare 
]]; then
 cd "${S}"
 ebegin "Prefixifying native library path"
 sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
-   ld/configure.tgt || eerror "Please file a bug about this"
+   ld/configure.tgt
 eend $?
 elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure 
]]; then
 cd "${S}"
@@ -40,14 +38,13 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && 
${EBUILD_PHASE} == configure ]];
 do
ebegin "  Updating $f"
sed -i -r \
-   -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" \
-   $f || eerror "Please file a bug about this"
+   -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f
eend $?
 done
 ebegin "  Updating nss/db-Makefile"
 sed -i -r \
-e "s,/(etc|var),${EPREFIX}/\1,g" \
-   nss/db-Makefile || eerror "Please file a bug about this"
+   nss/db-Makefile
 eend $?
 elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure 
]]; then
 # Guide h2py to look into glibc of Prefix
@@ -56,4 +53,10 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/python && 
${EBUILD_PHASE} == configure ]];
 sed -i -r \
-e "s,/usr/include,\"${EPREFIX}\"/usr/include,g" 
"${S}"/Lib/plat-linux*/regen
 eend $?
+elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; 
then
+cd "${S}"
+ebegin "Prefixifying default shell"
+sed -i -r \
+   -e "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," job.c
+eend $?
 fi



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-27 Thread Benda XU
commit: b35e449c9dfa213087991a5490293b55aa74cb27
Author: Benda Xu  gentoo  org>
AuthorDate: Sat May 28 04:16:02 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat May 28 04:17:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35e449c

profiles/prefix/linux-standalone/profile.bashrc: typo.

 profiles/prefix/linux-standalone/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 37635ea..fad9d0b 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -2,7 +2,7 @@
 # RAP specific patches that is pending upstream.
 # binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
 
-# Disable RAP trick using bootstrap stage2
+# Disable RAP trick during bootstrap stage2
 [[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0
 
 if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; 
then



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-26 Thread Benda XU
commit: 1fd34e461dec9610a2bbfc0c638f5fad83703990
Author: Benda Xu  gentoo  org>
AuthorDate: Fri May 27 04:25:37 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri May 27 04:39:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd34e46

profiles/prefix/linux-standalone/package.mask: remove
  baselayout-prefix is used during bootstrap.

 profiles/prefix/linux-standalone/package.mask | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/profiles/prefix/linux-standalone/package.mask 
b/profiles/prefix/linux-standalone/package.mask
deleted file mode 100644
index ff2a8f7..000
--- a/profiles/prefix/linux-standalone/package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Benda Xu  (26 May 2016)
-# baselayout-prefix breaks openrc and directory layout.
-sys-apps/baselayout-prefix



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-26 Thread Benda XU
commit: 8f4bb320daf1ac0dfa3d00fcfc8d871fa402d2bc
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 26 13:44:08 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 26 13:46:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4bb320

p/prefix/linux-standalone: mask baselayout-prefix

  remove virtual/service-manager from system set.

 profiles/prefix/linux-standalone/package.mask | 3 +++
 profiles/prefix/linux-standalone/packages | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/profiles/prefix/linux-standalone/package.mask 
b/profiles/prefix/linux-standalone/package.mask
new file mode 100644
index 000..ff2a8f7
--- /dev/null
+++ b/profiles/prefix/linux-standalone/package.mask
@@ -0,0 +1,3 @@
+# Benda Xu  (26 May 2016)
+# baselayout-prefix breaks openrc and directory layout.
+sys-apps/baselayout-prefix

diff --git a/profiles/prefix/linux-standalone/packages 
b/profiles/prefix/linux-standalone/packages
index 6e1a722..8d5b9ae 100644
--- a/profiles/prefix/linux-standalone/packages
+++ b/profiles/prefix/linux-standalone/packages
@@ -7,3 +7,6 @@
 # Man pages are not essential.
 -*sys-apps/man-pages
 -*virtual/man
+
+# A service manager is not essential.
+-*virtual/service-manager



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-26 Thread Benda XU
commit: fa9a0ed449140fb75b3567f735c1853fd312f7b1
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 26 10:06:58 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 26 10:08:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9a0ed4

p/p/l-s/profile.bashrc: refactorize with elif.

 profiles/prefix/linux-standalone/profile.bashrc | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 121ac7b..37635ea 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -22,17 +22,13 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} 
== configure ]]; the
 sed -i 's/--sysroot=%R//' \
gcc/gcc.c || eerror "Please file a bug about this"
 eend $?
-fi
-
-if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare 
]]; then
+elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare 
]]; then
 cd "${S}"
 ebegin "Prefixifying native library path"
 sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
ld/configure.tgt || eerror "Please file a bug about this"
 eend $?
-fi
-
-if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; 
then
+elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure 
]]; then
 cd "${S}"
 einfo "Prefixifying hardcoded path"
 
@@ -53,9 +49,7 @@ if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} 
== configure ]]; th
-e "s,/(etc|var),${EPREFIX}/\1,g" \
nss/db-Makefile || eerror "Please file a bug about this"
 eend $?
-fi
-
-if [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; 
then
+elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure 
]]; then
 # Guide h2py to look into glibc of Prefix
 ebegin "Guide h2py to look into Prefix"
 export include="${EPREFIX}"/usr/include



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-25 Thread Benda XU
commit: ed0dac93c4ed0c04c27ddaec9be39c4644534780
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 26 04:01:48 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 26 04:02:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0dac93

p/p/l-s/packages: remove non-essential packages of RAP from @system.

 profiles/prefix/linux-standalone/packages | 9 +
 1 file changed, 9 insertions(+)

diff --git a/profiles/prefix/linux-standalone/packages 
b/profiles/prefix/linux-standalone/packages
new file mode 100644
index 000..6e1a722
--- /dev/null
+++ b/profiles/prefix/linux-standalone/packages
@@ -0,0 +1,9 @@
+# RAP does not need busybox for emergency recovery, the host have all those 
tools.
+-*sys-apps/busybox
+
+# Most of the iproute2 suit require root privilege to function.
+-*sys-apps/iproute2
+
+# Man pages are not essential.
+-*sys-apps/man-pages
+-*virtual/man



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-25 Thread Benda XU
commit: 9c5dbdcedd1095c857274875ae171be66ce0fe50
Author: Benda Xu  gentoo  org>
AuthorDate: Thu May 26 02:49:32 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 26 04:02:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5dbdce

p/p/l-s/profile.bashrc: prefixify glibc hardcoded /etc/ld.so.preload

  prefixify python's h2py calls.

 profiles/prefix/linux-standalone/profile.bashrc | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index c4a885c..121ac7b 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -1,3 +1,4 @@
+# -*- mode: shell-script; -*-
 # RAP specific patches that is pending upstream.
 # binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
 
@@ -36,7 +37,7 @@ if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} 
== configure ]]; th
 einfo "Prefixifying hardcoded path"
 
 for f in libio/iopopen.c \
-shadow/lckpwdf.c resolv/{netdb,resolv}.h \
+shadow/lckpwdf.c resolv/{netdb,resolv}.h elf/rtld.c \
 nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \
 nss/{bug-erange,nss_files/files-init{,groups}}.c \
 sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c}
@@ -53,3 +54,12 @@ if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} 
== configure ]]; th
nss/db-Makefile || eerror "Please file a bug about this"
 eend $?
 fi
+
+if [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; 
then
+# Guide h2py to look into glibc of Prefix
+ebegin "Guide h2py to look into Prefix"
+export include="${EPREFIX}"/usr/include
+sed -i -r \
+   -e "s,/usr/include,\"${EPREFIX}\"/usr/include,g" 
"${S}"/Lib/plat-linux*/regen
+eend $?
+fi



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-25 Thread Benda XU
commit: 44d9e6da463dacec3ee3a7ccf556dac6e6b7347a
Author: Benda Xu  gentoo  org>
AuthorDate: Wed May 25 23:59:35 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu May 26 00:01:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d9e6da

p/p/l-s/make.defaults: EXTRA_PATH is not needed by mainline portage.

 profiles/prefix/linux-standalone/make.defaults | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/profiles/prefix/linux-standalone/make.defaults 
b/profiles/prefix/linux-standalone/make.defaults
index 0341850..dd9cc12 100644
--- a/profiles/prefix/linux-standalone/make.defaults
+++ b/profiles/prefix/linux-standalone/make.defaults
@@ -12,6 +12,3 @@ USE="iconv"
 
 # build gcc with parallelization support
 USE="${USE} openmp"
-
-# Avoid host binaries called by ebuild. (#576658)
-EXTRA_PATH=""



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-24 Thread Benda XU
commit: 2e9198c98b2c60e4a0f49ad5768de08d459288aa
Author: Benda Xu  gentoo  org>
AuthorDate: Wed May 25 02:15:04 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed May 25 02:28:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9198c9

p/p/linux-standalone/profile.bashrc: move glibc RAP tricks to profiles

Upstream-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=20138

 profiles/prefix/linux-standalone/profile.bashrc | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 369b595..c4a885c 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -30,3 +30,26 @@ if [[ ${CATEGORY}/${PN} == sys-devel/binutils && 
${EBUILD_PHASE} == prepare ]];
ld/configure.tgt || eerror "Please file a bug about this"
 eend $?
 fi
+
+if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; 
then
+cd "${S}"
+einfo "Prefixifying hardcoded path"
+
+for f in libio/iopopen.c \
+shadow/lckpwdf.c resolv/{netdb,resolv}.h \
+nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \
+nss/{bug-erange,nss_files/files-init{,groups}}.c \
+sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c}
+do
+   ebegin "  Updating $f"
+   sed -i -r \
+   -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" \
+   $f || eerror "Please file a bug about this"
+   eend $?
+done
+ebegin "  Updating nss/db-Makefile"
+sed -i -r \
+   -e "s,/(etc|var),${EPREFIX}/\1,g" \
+   nss/db-Makefile || eerror "Please file a bug about this"
+eend $?
+fi



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-24 Thread Benda XU
commit: b1dd9f36dc9e9c39cdd846c6635dd58d4f1f5736
Author: Benda Xu  gentoo  org>
AuthorDate: Tue May 24 15:10:35 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed May 25 02:28:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1dd9f36

p/p/linux-standalone/profile.bashrc: add BOOTSTRAP_RAP_STAGE2.

 profiles/prefix/linux-standalone/profile.bashrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 166ab70..369b595 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -1,6 +1,9 @@
 # RAP specific patches that is pending upstream.
 # binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
 
+# Disable RAP trick using bootstrap stage2
+[[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0
+
 if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; 
then
 cd "${S}"
 einfo "Prefixifying glibc dynamic linker..."



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-23 Thread Benda XU
commit: bbe04bc5a9a9d2a4c7fd2b24ae402ef317571b5e
Author: Benda Xu  gentoo  org>
AuthorDate: Mon May 23 10:51:29 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon May 23 10:52:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe04bc5

p/p/linux-standalone/profile.bashrc: sed gcc at configure
  to avoid patch conflict.

 profiles/prefix/linux-standalone/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 1e4cfcb..166ab70 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -1,7 +1,7 @@
 # RAP specific patches that is pending upstream.
 # binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
 
-if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == prepare ]]; then
+if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; 
then
 cd "${S}"
 einfo "Prefixifying glibc dynamic linker..."
 for h in gcc/config/*/linux*.h; do



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-05-22 Thread Benda XU
commit: 485d1720a3c24e2c25da188d6266c4b618e3104e
Author: Benda Xu  gentoo  org>
AuthorDate: Sun May 22 07:17:02 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun May 22 07:18:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485d1720

p/p/linux-standalone/profile.bashrc: track RAP toolchain tricks.

 profiles/prefix/linux-standalone/profile.bashrc | 29 +
 1 file changed, 29 insertions(+)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
new file mode 100644
index 000..1e4cfcb
--- /dev/null
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -0,0 +1,29 @@
+# RAP specific patches that is pending upstream.
+# binutils: http://article.gmane.org/gmane.comp.gnu.binutils/67593
+
+if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == prepare ]]; then
+cd "${S}"
+einfo "Prefixifying glibc dynamic linker..."
+for h in gcc/config/*/linux*.h; do
+   ebegin "  Updating $h"
+   sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," \
+   $h || eerror "Please file a bug about this"
+   eend $?
+done
+
+# use sysroot of toolchain to get currect include and library at compile 
time
+EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}"
+
+ebegin "remove --sysroot call on ld for native toolchain"
+sed -i 's/--sysroot=%R//' \
+   gcc/gcc.c || eerror "Please file a bug about this"
+eend $?
+fi
+
+if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare 
]]; then
+cd "${S}"
+ebegin "Prefixifying native library path"
+sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
+   ld/configure.tgt || eerror "Please file a bug about this"
+eend $?
+fi



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

2016-03-08 Thread Benda XU
commit: 9216351ebd8bec0ba56cc3a83d82da70e562feb3
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Mar  8 09:14:47 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Mar  8 09:24:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9216351e

profiles/p/l-s/make.defaults: Avoid host binaries called by ebuild.

X-Gentoo-Bugs: 576658

 profiles/prefix/linux-standalone/make.defaults | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/linux-standalone/make.defaults 
b/profiles/prefix/linux-standalone/make.defaults
index 76146a6..0341850 100644
--- a/profiles/prefix/linux-standalone/make.defaults
+++ b/profiles/prefix/linux-standalone/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,3 +13,5 @@ USE="iconv"
 # build gcc with parallelization support
 USE="${USE} openmp"
 
+# Avoid host binaries called by ebuild. (#576658)
+EXTRA_PATH=""



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/amd64/, profiles/prefix/linux-standalone/x86/

2016-03-02 Thread Benda XU
commit: bf00ad8bf8be60fc60cf70562f4cbe088f485642
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Mar  2 13:36:51 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Mar  2 13:38:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf00ad8b

prefix/linux-standalone/*/make.defaults: accept unstable keywords.

 profiles/prefix/linux-standalone/amd64/make.defaults | 2 +-
 profiles/prefix/linux-standalone/x86/make.defaults   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/linux-standalone/amd64/make.defaults 
b/profiles/prefix/linux-standalone/amd64/make.defaults
index a46fa2e..00115a2 100644
--- a/profiles/prefix/linux-standalone/amd64/make.defaults
+++ b/profiles/prefix/linux-standalone/amd64/make.defaults
@@ -4,4 +4,4 @@
 
 ARCH="amd64"
 CHOST="x86_64-pc-linux-gnu"
-ACCEPT_KEYWORDS="~amd64-linux"
+ACCEPT_KEYWORDS="~amd64 ~amd64-linux"

diff --git a/profiles/prefix/linux-standalone/x86/make.defaults 
b/profiles/prefix/linux-standalone/x86/make.defaults
index 2915579..dddce96 100644
--- a/profiles/prefix/linux-standalone/x86/make.defaults
+++ b/profiles/prefix/linux-standalone/x86/make.defaults
@@ -4,4 +4,4 @@
 
 ARCH="x86"
 CHOST="i686-pc-linux-gnu"
-ACCEPT_KEYWORDS="~x86-linux"
+ACCEPT_KEYWORDS="~x86 ~x86-linux"



[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/amd64/, profiles/prefix/linux-standalone/x86/

2016-03-01 Thread Benda XU
commit: d293a5998a742153dc6b0c31facbd48e027171fb
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Mar  1 08:42:20 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Mar  1 08:44:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d293a599

profile/prefix/linux-standalone: use the implicit keyword scheme.

https://archives.gentoo.org/gentoo-alt/message/28aede1511aecfea32ba55af02b94dd2

 profiles/prefix/linux-standalone/amd64/make.defaults | 3 +--
 profiles/prefix/linux-standalone/x86/make.defaults   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/profiles/prefix/linux-standalone/amd64/make.defaults 
b/profiles/prefix/linux-standalone/amd64/make.defaults
index 88ac25b..a46fa2e 100644
--- a/profiles/prefix/linux-standalone/amd64/make.defaults
+++ b/profiles/prefix/linux-standalone/amd64/make.defaults
@@ -4,5 +4,4 @@
 
 ARCH="amd64"
 CHOST="x86_64-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-amd64 ~amd64-linux"
+ACCEPT_KEYWORDS="~amd64-linux"

diff --git a/profiles/prefix/linux-standalone/x86/make.defaults 
b/profiles/prefix/linux-standalone/x86/make.defaults
index ffde5d2..2915579 100644
--- a/profiles/prefix/linux-standalone/x86/make.defaults
+++ b/profiles/prefix/linux-standalone/x86/make.defaults
@@ -4,5 +4,4 @@
 
 ARCH="x86"
 CHOST="i686-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-x86 ~x86-linux"
+ACCEPT_KEYWORDS="~x86-linux"