5 files changed, 2 insertions, 101 deletions
diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent b/profiles/prefix/linux-standalone/amd64/legacy/parent
index 0ca4be1beb9c..a0af85877726 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 7ed6ff82de6b..000000000000
--- a/profiles/prefix/linux-standalone/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/linux-standalone/packages b/profiles/prefix/linux-standalone/packages
deleted file mode 100644
index 8d5b9aeeb330..000000000000
--- a/profiles/prefix/linux-standalone/packages
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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
-
-# A service manager is not essential.
--*virtual/service-manager
diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/prefix/linux-standalone/profile.bashrc
deleted file mode 100644
index 60a2af632d18..000000000000
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: shell-script; -*-
-# 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
-
-# Disable RAP trick during bootstrap stage2
-[[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0
-
-if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; then
-    cd "${S}"
-    einfo "Prefixifying dynamic linkers..."
-    for h in gcc/config/*/*linux*.h; do
-	ebegin "  Updating $h"
-	sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h
-	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
-    eend $?
-elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
-    ebegin "Prefixifying native library path"
-    sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
-	"${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} == compile ]]; then
-    cd "${S}"
-    einfo "Prefixifying hardcoded path"
-    
-    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-{XXX,init{,groups}}}.c \
-		 sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c}
-    do
-	ebegin "  Updating $f"
-	sed -i -r "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
-    eend $?
-elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; then
-    # Guide h2py to look into glibc of 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 -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"
-    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"
-    sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4
-    eend $?
-fi
diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent b/profiles/prefix/linux-standalone/x86/legacy/parent
index 0ca4be1beb9c..a0af85877726 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