remove sys-apps/baselayout-prefix sys-apps/etckeeper and adjust sys-apps/openrc

33 files changed, 2 insertions, 2483 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
deleted file mode 100644
index c343446..0000000
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ /dev/null
@@ -1,191 +0,0 @@
-# ChangeLog for sys-apps/baselayout-prefix
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.15 2012/02/19 19:32:40 grobian Exp $
-
-  19 Feb 2012; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.14.ebuild:
-  Use append-cflags instead of too generic append-flags to avoid F77 and FC
-  rejected warnings
-
-  04 Dec 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.14.ebuild:
-  Avoid automake call that breaks in the early bootstrapping stage
-
-  14 Jun 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.14.ebuild:
-  include cflags for ld since we use CC, to make sure the linker is invoked
-  correctly, bug #370695
-
-  05 Jun 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.14.ebuild, -files/baselayout-1.12.14-interix.patch:
-  Bump sources to include compile fixes for Interix and OpenBSD
-
-  01 May 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.14.ebuild:
-  Bump sources to include compile fixes for FreeBSD and OpenBSD, bug
-  #365613
-
-*baselayout-prefix-1.12.14 (29 Apr 2011)
-
-  29 Apr 2011; Fabian Groffen <grobian@gentoo.org>
-  +baselayout-prefix-1.12.14.ebuild:
-  Version bump to match latest 1.12 release of baselayout
-
-*baselayout-prefix-1.12.5-r11 (31 Mar 2011)
-
-  31 Mar 2011; Fabian Groffen <grobian@gentoo.org>
-  +baselayout-prefix-1.12.5-r11.ebuild:
-  Revbump, switch to using forked repository with our patches applied
-
-  31 Mar 2011; Michael Haubenwallner <haubi@gentoo.org>
-  baselayout-prefix-1.12.5-r10.ebuild, +files/baselayout-1.12.5-gnulib.patch,
-  -files/baselayout-1.12.5-libsvar.patch:
-  Take strndup from gnulib too, breaks on Linux (#361417).
-  Rename libsvar.patch to more generic gnulib.patch.
-
-*baselayout-prefix-1.12.5-r10 (30 Mar 2011)
-
-  30 Mar 2011; Salomon tbox <tbox@gentoo.org>
-  baselayout-prefix-1.12.5-r9.ebuild, +baselayout-prefix-1.12.5-r10.ebuild,
-  +files/baselayout-1.12.5-libsvar.patch,
-  files/baselayout-1.12.5-solaris.patch, +files/baselayout-1.12.5-strsep.patch:
-  Split strsep out of solaris patch and use it in r9 only.
-  In r10, use private gnulib instance, as it might be missing during bootstrap.
-  Also need to include config.h to redefine 'restrict'.
-
-  29 Mar 2011; Michael Haubenwallner <haubi@gentoo.org>
-  files/baselayout-1.12.5-aix.patch:
-  recreate to work with older GNU patch (#361109)
-
-  28 Mar 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.5-r9.ebuild, +files/baselayout-1.12.5-solaris.patch:
-  Add patch to fix compilation on Solaris, bug #360917
-
-  28 Mar 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.5-r9.ebuild,
-  +files/baselayout-1.12.5-darwin-kvm.patch:
-  Add patch for Mac OS X >= 10.5, thanks JTRiley in bug #360855
-
-  28 Mar 2011; Michael Haubenwallner <haubi@gentoo.org>
-  baselayout-prefix-1.12.5-r9.ebuild, +files/baselayout-1.12.5-aix.patch,
-  +files/baselayout-1.12.5-termios_h.patch:
-  AIX port of source: use sys-devel/gnulib for getopt.
-  AIX lacks <sys/termios.h>. As <termios.h> is standard, use <termios.h> on any
-  platform.
-
-  24 Mar 2011; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.5-r9.ebuild:
-  Don't use userland_{Darwin,FreeBSD}, we're always on userland_GNU in Prefix
-
-*baselayout-prefix-1.12.5-r9 (23 Mar 2011)
-
-  23 Mar 2011; Fabian Groffen <grobian@gentoo.org>
-  +baselayout-prefix-1.12.5-r9.ebuild, +files/baselayout-1.12.5-prefix.patch,
-  +files/baselayout-1.12.5-prefix-chaining.patch,
-  +files/baselayout-1.12.5-prefix-chaining-bash.patch,
-  +files/baselayout-1.12.5-prefix-chaining-eprefix.patch,
-  +files/baselayout-1.12.5-prefix-chaining-pkgconfig.patch,
-  +files/baselayout-1.12.5-prefix-chaining-prompt.patch,
-  +files/baselayout-1.12.5-prefix-chaining-recursion.patch,
-  +files/baselayout-1.12.5-prefix-no-consoletype.patch,
-  +files/baselayout-1.12.5-prefix-pidof.patch,
-  +files/baselayout-1.12.5-prefix-sh.patch,
-  +files/baselayout-1.12.5-prefix-src.patch, +metadata.xml:
-  Move to gx86, bump for EAPI=3 and other small fixes, including bug #358823
-
-*baselayout-prefix-1.12.5-r8 (29 Oct 2010)
-
-  29 Oct 2010; Markus Duft <mduft@gentoo.org>
-  -baselayout-prefix-1.12.5-r7.ebuild, +baselayout-prefix-1.12.5-r8.ebuild,
-  +files/baselayout-1.12.5-prefix-chaining-bash.patch:
-  enable chained prefixes to find and use parent bash, revbump
-
-  11 Jun 2010; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.5-r7.ebuild:
-  Create portage group and user for root installs, bug #321623
-
-*baselayout-prefix-1.12.5-r7 (14 May 2010)
-
-  14 May 2010; Fabian Groffen <grobian@gentoo.org>
-  +baselayout-prefix-1.12.5-r7.ebuild,
-  +files/baselayout-1.12.5-prefix-no-consoletype.patch,
-  +files/baselayout-1.12.5-prefix-pidof.patch,
-  +files/baselayout-1.12.5-prefix-sh.patch,
-  +files/baselayout-1.12.5-prefix-src.patch:
-  Revision bump including patches from bug #196294. Probably needs some
-  finishing touches. Masked for the time being not to raise false
-  expectations.
-
-  20 Jul 2009; Markus Duft <mduft@gentoo.org>
-  baselayout-prefix-1.12.5-r6.ebuild,
-  +files/baselayout-1.12.5-prefix-chaining-recursion.patch:
-  added patch for profile recursion, which was destroying some internal
-  information before...
-
-  14 Jul 2009; Markus Duft <mduft@gentoo.org>
-  files/baselayout-1.12.5-prefix-chaining-pkgconfig.patch:
-  fixed mistake in previous patch
-
-  14 Jul 2009; Markus Duft <mduft@gentoo.org>
-  baselayout-prefix-1.12.5-r6.ebuild,
-  +files/baselayout-1.12.5-prefix-chaining-pkgconfig.patch:
-  fixed pkg-config issues with prefix-chaining
-
-*baselayout-prefix-1.12.5-r6 (26 Mar 2009)
-
-  26 Mar 2009; <mduft@gentoo.org>
-  +files/baselayout-1.12.5-prefix-chaining.patch,
-  -baselayout-prefix-1.12.5-r5.ebuild, +baselayout-prefix-1.12.5-r6.ebuild:
-  added prefix-chaining support. usefull together with a recent/patched
-  portage, and app-portage/prefix-chain-setup.
-
-  18 Mar 2009; Fabian Groffen <grobian@gentoo.org>
-  baselayout-prefix-1.12.5-r5.ebuild, baselayout-prefix-1.12.5-r5.ebuild:
-  inherit prefix
-
-*baselayout-prefix-1.12.5-r5 (09 Nov 2007)
-
-  09 Nov 2007; Fabian Groffen <grobian@gentoo.org>
-  +baselayout-prefix-1.12.5-r5.ebuild:
-  Fix for bug #183874, create libdir symlinks when using a multilib profile
-
-*baselayout-prefix-1.12.5-r4 (14 May 2007)
-
-  14 May 2007; Fabian Groffen <grobian@gentoo.org>
-  files/baselayout-1.12.5-prefix.patch, -baselayout-prefix-1.12.5-r3.ebuild,
-  +baselayout-prefix-1.12.5-r4.ebuild:
-  Change path in profile to have host-specific paths to come after prefix
-  path, such that they don't overrule e.g. opt/bin from prefix. Added sbin
-  variants to normal user PATH for prefix usage.
-
-*baselayout-prefix-1.12.5-r3 (13 Apr 2007)
-
-  13 Apr 2007; Fabian Groffen <grobian@gentoo.org>
-  files/baselayout-1.12.5-prefix.patch, -baselayout-prefix-1.12.5-r2.ebuild,
-  +baselayout-prefix-1.12.5-r3.ebuild:
-  Add host manpath in 99basic file, such that it ends up as last in the
-  MANPATH, which is what we want
-
-*baselayout-prefix-1.12.5-r2 (03 Dec 2006)
-
-  03 Dec 2006; Fabian Groffen <grobian@gentoo.org>
-  files/baselayout-1.12.5-prefix.patch, -baselayout-prefix-1.12.5-r1.ebuild,
-  +baselayout-prefix-1.12.5-r2.ebuild:
-  Fix manpath to include the system manpath and to not to include usr/local in
-  the prefix, as the prefix is the replacement of that.
-
-*baselayout-darwin-1.11.11-r1 (07 Aug 2005)
-
-  07 Aug 2005; Joseph Jezak <josejx@gentoo.org>
-  +files/dont-destroy-path.patch, +baselayout-darwin-1.11.11-r1.ebuild:
-  Fixed less than stellar profile handling of PATH.
-
-  13 May 2005; <gongloo@gentoo.org> baselayout-darwin-1.11.11.ebuild:
-  Fixed xargs command-line argument (--null to -0).
-
-*baselayout-darwin-1.11.11 (12 May 2005)
-
-  12 May 2005; Joseph Jezak <josejx@gentoo.org> +metadata.xml,
-  +baselayout-darwin-1.11.11.ebuild:
-  Initial commit.
-
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
deleted file mode 100644
index 0afd036..0000000
--- a/sys-apps/baselayout-prefix/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-AUX baselayout-1.12.5-aix.patch 2462 RMD160 63ef5b25f51ac773ae77fb4afc01b53221c144ae SHA1 01c299e2761247675192fe04619b11ebe02ddff3 SHA256 78e193dd8d68e2fc7ca32bca1059a20943231197bff3db07b8ef3ea3659d5f6b
-AUX baselayout-1.12.5-darwin-kvm.patch 431 RMD160 66200390deb12673cb11370b3d8bbf20551eba5e SHA1 679c7d152c3858800bf0e319134bce615d47e6be SHA256 2a6513beeffdb62af9cca8eafd3fa4ca3b2ab892fbe771a79ce0593be64f849f
-AUX baselayout-1.12.5-gnulib.patch 2110 RMD160 87007dc493c8a0489c08c96de9497d36da31fd31 SHA1 7d77ea55d3bb8da7d05a1d7970c38def4b9dfc4e SHA256 377ca60f1439e88de65972b6bed89f65441063c26afecae06d83eaf5de74645b
-AUX baselayout-1.12.5-prefix-chaining-bash.patch 862 RMD160 f514ef370a4858f63c23cfbef9bdbb59c074e50d SHA1 70b02ea0148dd43df2012de2413aef505051b87c SHA256 0fe5200752a3c6437e17f833b307e8dbebaa6c3786adf9814f060445f702550b
-AUX baselayout-1.12.5-prefix-chaining-eprefix.patch 991 RMD160 74c0326b2800a9b6c9670550fab3ddfbf42bb9d0 SHA1 0593cc4963b9611159e0a791f8743702ab875883 SHA256 1d6b1f66f2bbf5417d36808ab8bce951a9ecdbcf4992ffb3fcd32af8a6e7b048
-AUX baselayout-1.12.5-prefix-chaining-pkgconfig.patch 568 RMD160 ec1dc56f66f3cceb7afe1695f2e887299f430d97 SHA1 51fa2775a998a1519253213cb62d5db980d18cc4 SHA256 6c7cdea50afc178693b954bf295dfe1de7fa06108f662f5aa0d539c69ba1f28f
-AUX baselayout-1.12.5-prefix-chaining-prompt.patch 2300 RMD160 1a43e398fa5273c01dff4494ec7b71dd25c22fe7 SHA1 967fc7f71dc2668ae85bb53e354d48e839e3e733 SHA256 4b1725e97e6686c0bfdf35bb79afaff879daf253752c1f8e371ecf472745a51b
-AUX baselayout-1.12.5-prefix-chaining-recursion.patch 1094 RMD160 e024149f922200659ba26a155ff0cae64d938ad4 SHA1 c5756f2af1acc977ed97d5c08de801d75d58006a SHA256 662f2d8d1187e7b51d1dc85963968c7a4643bff5ff152a232263affcf1b7e45a
-AUX baselayout-1.12.5-prefix-chaining.patch 3110 RMD160 f05af529f05eeb1436d9f293d0d2ff610b66230d SHA1 719adaa77c1c64dc0bbc877b97d3d17158eb1cb5 SHA256 6c0a78fbea15ed92fcc3088f13670ab42e95c452b31263d8f1d71a9707452c91
-AUX baselayout-1.12.5-prefix-no-consoletype.patch 343 RMD160 68fe971987855a9c091f3be661074c54f81200fa SHA1 47637bd741615d1d52489d4094e81908f29e8b86 SHA256 0e80a3e038df327c376ce4105bbb4cc1f93cacdbbd364d4f9d0a2ead9952928c
-AUX baselayout-1.12.5-prefix-pidof.patch 329 RMD160 eca62253ec62c3c88b8e95a9fef7c5e5115fec6b SHA1 6698cf2b4df982bef2b11047a04dcad03c09bdf1 SHA256 696838d0866d19db7503fd39f4ab7388dfc6bcd46c3273aa5f420f76c60f99b7
-AUX baselayout-1.12.5-prefix-sh.patch 8171 RMD160 c85d0c98d5cf7539571f13a40fa27cbe547d3439 SHA1 121d9ec49256f2bbeae18ccaa3cea22a9168db50 SHA256 aed4b37186ec24ea5189e5be20f1a05cf76f277054a6a5761195ef803b88acad
-AUX baselayout-1.12.5-prefix-src.patch 3629 RMD160 cda870fae2abf559770d0ac7e5d00a4657906ba5 SHA1 27bec4c8f878b1d5c8a2c5cf8c646a818d01a175 SHA256 3f7565deda1f82e5906b350c178b8b414a2b37f8155439e0c6f2689c76ca2ba3
-AUX baselayout-1.12.5-prefix.patch 14807 RMD160 5be4ca65ee754d1c95bb00c488ddd5a77240e9fe SHA1 24d4677f7ade70a712ef73fde33db5b82da39f45 SHA256 a79a3d2f35e03e75c858ef81ccada82b3de4b5bb96168386a1f652bac198ad6c
-AUX baselayout-1.12.5-solaris.patch 1860 RMD160 92f3ab1b092c0a81b924dfe90312311d3502a2b0 SHA1 4170e03100a24bfb821cf61c0e2fcdaeb77dda0d SHA256 2d2f304af9e975507793dbe6ff1a360317bef1758ac0b601dffbfad69ec2d93b
-AUX baselayout-1.12.5-strsep.patch 778 RMD160 8447c3a7908bfbd3c3385e2b521f6c042d78a8aa SHA1 122611f8badb4432f41dad47b4a5e75e39c7de9b SHA256 81b1dbaeef76e8c394f2c2c61407dd5ede20dc0ab682be206163eda30b743fe9
-AUX baselayout-1.12.5-termios_h.patch 893 RMD160 398140de16da1b2fb874ef00f1caaa6c828372f4 SHA1 b3debc214fe8edbf734611990901018e32ea289b SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99
-DIST baselayout-1.12.5-gnulib-2.tar.bz2 118355 RMD160 b8ffd7fb21f709e82e268358cff229cdde81df97 SHA1 23b06d800c0381e9dc124b270b53ace665730288 SHA256 ca279cbca8a0b39aa247e5ce56eadc3e2dba557cf5765be7a1971ffe12953900
-DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
-DIST baselayout-prefix-1.12.14.1709.tar.bz2 461562 RMD160 d11ff408a30941a33809537e7dc43810362b77fa SHA1 9a492e3e31efe47799b58a0f78139bb5b07ce82d SHA256 ca1eec028b7ec72f1e3196f71eafd564062d9b677569698fe41ac5f817c9379e
-DIST baselayout-prefix-1.12.5.1701.tar.bz2 412843 RMD160 ccad4b88bfc00f84fe0837c82e5e21d121f1f106 SHA1 99261aeae6a286be1584bec912052d79860aaf98 SHA256 452ee800e37c65d9c44e77130f0ea9f082e05df2f9a673523fe2e03170fa3099
-EBUILD baselayout-prefix-1.12.14-r1.ebuild 4414 RMD160 ea44f544b916101e09ab03e3f45c1be5a3631eff SHA1 8c7c1cdc9f796c4611dccc385551d583b1a7f867 SHA256 19505d67e56f4412aa4d62a0ed1c87db79859b3a903d459a92d654e3965b08e6
-EBUILD baselayout-prefix-1.12.5-r10.ebuild 6789 RMD160 a27f52b56de5989e7539bdd59bb7739625b91e33 SHA1 85ef33d7aa018ca6811bff9269ea45cdc78a7b54 SHA256 e2f61467f809fbfb6394399d052c82d9196c5a7b515381cc2aaa2a7c6869eb35
-EBUILD baselayout-prefix-1.12.5-r11.ebuild 5267 RMD160 f44b2cf0f0d78be8c3f158d1b55313891212a43b SHA1 3a315e42751270a6fccd8be98751482dc5393e3b SHA256 faf1805a5d50a715ec070ea386c334b3ec2018a27ee24783612d85a225dca1b0
-EBUILD baselayout-prefix-1.12.5-r9.ebuild 6090 RMD160 5d2efafb4b0c98ce481ec337b22fbcd904dbefb4 SHA1 3e33dd1b8b431993218fb47fa2d3435c2113db06 SHA256 a4a125e509269b58323b275a6eb29056a9a95ac6502f02a2104529f4e4fbc4e1
-MISC ChangeLog 7847 RMD160 9880f7f885c9b4aa76b79e15ca15792729c46718 SHA1 31a25ae4a42f302e1c55ba296c50b7ad49077187 SHA256 8fb022241cc91d432369f323ec99ac18dbcb60f1983d05b58bb6aadbcfa7ec1b
-MISC metadata.xml 296 RMD160 ddaf5bd02a55ac77bbaa810f7a02c000b3f69339 SHA1 c7bc61d05afd2ca9b23c42adb6a3fda56d81f79b SHA256 99687144efc36586c7f5aa897107c38c9efff985ac77e6e555d9f5f9ff0490ff
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild
deleted file mode 100644
index 6739600..0000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild,v 1.7 2012/02/19 19:32:40 grobian Exp $
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic autotools
-
-# last part in e.g. 1.12.14.1704
-PVER=1709
-
-DESCRIPTION="Baselayout for Gentoo Prefix installs"
-HOMEPAGE="http://prefix.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~grobian/distfiles/${P}.${PVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="prefix-chaining"
-DEPEND=">=sys-apps/portage-2.2.01"
-RDEPEND=">=sys-libs/readline-5.0-r1
-	>=app-shells/bash-3.1_p7
-	>=sys-apps/coreutils-5.2.1
-	kernel_Darwin? ( sys-process/pidof-bsd )
-	kernel_FreeBSD? ( sys-process/pidof-bsd )"
-
-S=${WORKDIR}/${P}.${PVER}
-
-src_prepare() {
-	if use prefix-chaining; then
-		epatch "${S}"/baselayout-${PV}-prefix-chaining.patch
-
-		# need to set the PKG_CONFIG_PATH globally for this prefix, when
-		# chaining is enabled, since pkg-config may not be installed locally,
-		# but still .pc files should be found for all RDEPENDable prefixes in
-		# the chain.
-		echo "PKG_CONFIG_PATH=\"${EPREFIX}/usr/lib/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" >> "${S}"/etc/env.d/00basic
-	fi
-
-	cd "${S}"
-	eprefixify \
-		etc/env.d/00basic \
-		etc/profile \
-
-	# add the host OS MANPATH
-	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
-
-	# avoid a re-automake run
-	touch -r gnulib/configure.ac gnulib/Makefile.in gnulib/aclocal.m4 || die
-}
-
-src_configure() {
-	cd gnulib || die
-	default
-}
-
-src_compile() {
-	# build gnulib first
-	pushd gnulib > /dev/null || die
-	emake || die "Cannot build gnulib"
-	popd > /dev/null
-
-	# use gnulib (buildsystem doesn't respect cppflags)
-	append-cflags -I../gnulib -I../gnulib/gllib
-	append-ldflags -L../gnulib/gllib
-	append-libs gnu
-
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-}
-
-src_install() {
-	local dir libdirs libdirs_env rcscripts_dir
-
-	dodir /etc
-	dodir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	rcscripts_dir="/lib/rcscripts"
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		dodir /"${dir}"
-		dodir /usr/"${dir}"
-		dodir /usr/local/"${dir}"
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${ED}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release
-
-	# get the basic stuff in there
-	doenvd "${S}"/etc/env.d/* || die "doenvd"
-
-	# copy the profile
-	cp "${S}"/etc/profile "${ED}"/etc/profile
-
-	# Setup files in /sbin
-	#
-	cd "${S}"/sbin
-	into /
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-
-	#
-	# Install baselayout utilities
-	#
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-}
-
-pkg_postinst() {
-	if [[ ${EUID} == 0 ]] ; then
-		# setup portage user, such that things that require root privs
-		# don't fail, bug #321623
-		enewgroup portage 250
-		enewuser portage 250 -1 "${EPREFIX}"/var/tmp/portage portage
-	fi
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-	echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-}
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild
deleted file mode 100644
index 3f66465..0000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild,v 1.2 2011/03/31 16:21:27 haubi Exp $
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic autotools
-
-# Needed gnulib modules:
-#   getopt strndup strsep
-# Avoid depending on dev-libs/gnulib, might be missing during bootstrap.
-# The gnulib tarball has been created using these commands (basically),
-# from dev-libs/gnulib-2009.03.03.14.07.45-r1:
-# $ gnulib-tool --create-testdir --dir=gnulib getopt strndup strsep
-# $ ./configure
-# $ make maintainer-clean
-GNULIBV=2
-
-DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="
-	http://dev.gentoo.org/~grobian/distfiles/${P/-prefix/}.tar.bz2
-	http://dev.gentoo.org/~haubi/distfiles/${P/-prefix/}-gnulib-${GNULIBV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="prefix-chaining"
-DEPEND=">=sys-apps/portage-2.2.01"
-RDEPEND=">=sys-libs/readline-5.0-r1
-	>=app-shells/bash-3.1_p7
-	>=sys-apps/coreutils-5.2.1
-	kernel_Darwin? ( sys-process/pidof-bsd )
-	kernel_FreeBSD? ( sys-process/pidof-bsd )"
-
-S=${WORKDIR}/${P/-prefix}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix.patch
-
-	if use prefix-chaining; then
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-pkgconfig.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-recursion.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-eprefix.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-prompt.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-bash.patch
-
-		# need to set the PKG_CONFIG_PATH globally for this prefix, when
-		# chaining is enabled, since pkg-config may not be installed locally,
-		# but still .pc files should be found for all RDEPENDable prefixes in
-		# the chain.
-		echo "PKG_CONFIG_PATH=\"${EPREFIX}/usr/lib/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" >> "${S}"/etc/env.d/00basic
-	fi
-
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix-src.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix-sh.patch
-	# Next patch is to be applied on systems that don't have a pidof.
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix-pidof.patch
-
-	epatch "${FILESDIR}"/${P/-prefix/}-termios_h.patch # required by aix.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-aix.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-darwin-kvm.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-solaris.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-gnulib.patch
-
-	# The consoletype application in this form will only work on Linux
-	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-prefix-no-consoletype.patch
-
-	cd "${S}"
-	eprefixify \
-		etc/env.d/00basic \
-		etc/profile \
-		sbin/env-update.sh \
-		sbin/functions.sh \
-		sbin/runscript.sh \
-		src/runscript.c \
-		sbin/depscan.sh \
-		sbin/rc-daemon.sh \
-		sbin/rc-services.sh
-	# add the host OS MANPATH
-	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
-
-	# need to include gnulib's <config.h> first
-	sed -i -e '1i#include <config.h>' $(find . -name '*.c') || die "Cannot utilize gnulib"
-
-	# prepare gnulib
-	cd "${WORKDIR}"/gnulib || die
-	eautoreconf
-}
-
-src_configure() {
-	cd "${WORKDIR}"/gnulib || die
-	default
-}
-
-src_compile() {
-	# build gnulib first
-	cd "${WORKDIR}"/gnulib || die
-	emake || die "Cannot build gnulib"
-	cd "${S}"
-
-	# use gnulib
-	append-flags -I"${WORKDIR}"/gnulib -I"${WORKDIR}"/gnulib/gllib
-	append-ldflags -L"${WORKDIR}"/gnulib/gllib
-	append-libs gnu
-
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-src_install() {
-	local dir libdirs libdirs_env rcscripts_dir
-
-	dodir /etc
-	dodir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	rcscripts_dir="/lib/rcscripts"
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		dodir /"${dir}"
-		dodir /usr/"${dir}"
-		dodir /usr/local/"${dir}"
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${ED}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release
-
-	# get the basic stuff in there
-	doenvd "${S}"/etc/env.d/* || die "doenvd"
-
-	# copy the profile
-	cp "${S}"/etc/profile "${ED}"/etc/profile
-
-	# Setup files in /sbin
-	#
-	cd "${S}"/sbin
-	into /
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd "${S}"/sbin
-	into /
-	dosbin depscan.sh
-	dosbin env-update.sh
-	insinto ${rcscripts_dir}/awk
-	doins "${S}"/src/awk/functions.awk
-
-	#
-	# Install baselayout utilities
-	#
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	cd "${S}"/src
-	make DESTDIR="${ED}" LIBDIR="${libdir}" install || die
-
-	insinto ${rcscripts_dir}/sh
-	doins "${S}"/sbin/rc-*
-}
-
-pkg_postinst() {
-	if [[ ${EUID} == 0 ]] ; then
-		# setup portage user, such that things that require root privs
-		# don't fail, bug #321623
-		enewgroup portage 250
-		enewuser portage 250 -1 "${EPREFIX}"/var/tmp/portage portage
-	fi
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-	echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-}
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild
deleted file mode 100644
index e7bd409..0000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild,v 1.1 2011/03/31 18:49:56 grobian Exp $
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic autotools
-
-# baselayout-prefix-1.12.5.1694.tar.bz2
-PVER=1701
-
-DESCRIPTION="Baselayout for Gentoo Prefix installs"
-HOMEPAGE="http://prefix.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~grobian/distfiles/${P}.${PVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="prefix-chaining"
-DEPEND=">=sys-apps/portage-2.2.01"
-RDEPEND=">=sys-libs/readline-5.0-r1
-	>=app-shells/bash-3.1_p7
-	>=sys-apps/coreutils-5.2.1
-	kernel_Darwin? ( sys-process/pidof-bsd )
-	kernel_FreeBSD? ( sys-process/pidof-bsd )"
-
-S=${WORKDIR}/${P}.${PVER}
-
-src_prepare() {
-	if use prefix-chaining; then
-		epatch "${S}"/baselayout-1.12.5-prefix-chaining.patch
-
-		# need to set the PKG_CONFIG_PATH globally for this prefix, when
-		# chaining is enabled, since pkg-config may not be installed locally,
-		# but still .pc files should be found for all RDEPENDable prefixes in
-		# the chain.
-		echo "PKG_CONFIG_PATH=\"${EPREFIX}/usr/lib/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" >> "${S}"/etc/env.d/00basic
-	fi
-
-	# The consoletype application in this form will only work on Linux
-	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-prefix-no-consoletype.patch
-
-	cd "${S}"
-	eprefixify \
-		etc/env.d/00basic \
-		etc/profile \
-		sbin/env-update.sh \
-		sbin/functions.sh \
-		sbin/runscript.sh \
-		src/runscript.c \
-		sbin/depscan.sh \
-		sbin/rc-daemon.sh \
-		sbin/rc-services.sh
-	# add the host OS MANPATH
-	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
-}
-
-src_configure() {
-	cd gnulib || die
-	default
-}
-
-src_compile() {
-	# build gnulib first
-	pushd gnulib > /dev/null || die
-	emake || die "Cannot build gnulib"
-	popd > /dev/null
-
-	# use gnulib
-	append-flags -I../gnulib -I../gnulib/gllib
-	append-ldflags -L../gnulib/gllib
-	append-libs gnu
-
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-src_install() {
-	local dir libdirs libdirs_env rcscripts_dir
-
-	dodir /etc
-	dodir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	rcscripts_dir="/lib/rcscripts"
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		dodir /"${dir}"
-		dodir /usr/"${dir}"
-		dodir /usr/local/"${dir}"
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${ED}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release
-
-	# get the basic stuff in there
-	doenvd "${S}"/etc/env.d/* || die "doenvd"
-
-	# copy the profile
-	cp "${S}"/etc/profile "${ED}"/etc/profile
-
-	# Setup files in /sbin
-	#
-	cd "${S}"/sbin
-	into /
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd "${S}"/sbin
-	into /
-	dosbin depscan.sh
-	dosbin env-update.sh
-	insinto ${rcscripts_dir}/awk
-	doins "${S}"/src/awk/functions.awk
-
-	#
-	# Install baselayout utilities
-	#
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	cd "${S}"/src
-	make DESTDIR="${ED}" LIBDIR="${libdir}" install || die
-
-	insinto ${rcscripts_dir}/sh
-	doins "${S}"/sbin/rc-*
-}
-
-pkg_postinst() {
-	if [[ ${EUID} == 0 ]] ; then
-		# setup portage user, such that things that require root privs
-		# don't fail, bug #321623
-		enewgroup portage 250
-		enewuser portage 250 -1 "${EPREFIX}"/var/tmp/portage portage
-	fi
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-	echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-}
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
deleted file mode 100644
index 3c7ab0c..0000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild,v 1.7 2011/03/30 11:34:45 haubi Exp $
-
-EAPI=3
-
-inherit eutils toolchain-funcs multilib prefix flag-o-matic
-
-DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~grobian/distfiles/${P/-prefix/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="prefix-chaining"
-DEPEND=">=sys-apps/portage-2.2.01"
-RDEPEND=">=sys-libs/readline-5.0-r1
-	>=app-shells/bash-3.1_p7
-	>=sys-apps/coreutils-5.2.1
-	ppc-aix? ( dev-libs/gnulib )
-	kernel_Darwin? ( sys-process/pidof-bsd )
-	kernel_FreeBSD? ( sys-process/pidof-bsd )"
-
-S=${WORKDIR}/${P/-prefix}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix.patch
-
-	if use prefix-chaining; then
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-pkgconfig.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-recursion.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-eprefix.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-prompt.patch
-		epatch "${FILESDIR}"/${P/-prefix/}-prefix-chaining-bash.patch
-
-		# need to set the PKG_CONFIG_PATH globally for this prefix, when
-		# chaining is enabled, since pkg-config may not be installed locally,
-		# but still .pc files should be found for all RDEPENDable prefixes in
-		# the chain.
-		echo "PKG_CONFIG_PATH=\"${EPREFIX}/usr/lib/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" >> "${S}"/etc/env.d/00basic
-	fi
-
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix-src.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix-sh.patch
-	# Next patch is to be applied on systems that don't have a pidof.
-	epatch "${FILESDIR}"/${P/-prefix/}-prefix-pidof.patch
-
-	epatch "${FILESDIR}"/${P/-prefix/}-termios_h.patch # required by aix.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-aix.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-darwin-kvm.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-solaris.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-strsep.patch # for solaris
-
-	# The consoletype application in this form will only work on Linux
-	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-prefix-no-consoletype.patch
-
-	cd "${S}"
-	eprefixify \
-		etc/env.d/00basic \
-		etc/profile \
-		sbin/env-update.sh \
-		sbin/functions.sh \
-		sbin/runscript.sh \
-		src/runscript.c \
-		sbin/depscan.sh \
-		sbin/rc-daemon.sh \
-		sbin/rc-services.sh
-	# add the host OS MANPATH
-	echo 'MANPATH="/usr/share/man"' > etc/env.d/99basic || die "can't make file"
-}
-
-src_compile() {
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	if [[ ${CHOST} == *-aix* ]]; then
-		append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/lib
-		append-ldflags -lgnu # no LIBS makefile variable
-	fi
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-src_install() {
-	local dir libdirs libdirs_env rcscripts_dir
-
-	dodir /etc
-	dodir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	rcscripts_dir="/lib/rcscripts"
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		dodir /"${dir}"
-		dodir /usr/"${dir}"
-		dodir /usr/local/"${dir}"
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${ED}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release
-
-	# get the basic stuff in there
-	doenvd "${S}"/etc/env.d/* || die "doenvd"
-
-	# copy the profile
-	cp "${S}"/etc/profile "${ED}"/etc/profile
-
-	# Setup files in /sbin
-	#
-	cd "${S}"/sbin
-	into /
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd "${S}"/sbin
-	into /
-	dosbin depscan.sh
-	dosbin env-update.sh
-	insinto ${rcscripts_dir}/awk
-	doins "${S}"/src/awk/functions.awk
-
-	#
-	# Install baselayout utilities
-	#
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	cd "${S}"/src
-	make DESTDIR="${ED}" LIBDIR="${libdir}" install || die
-
-	insinto ${rcscripts_dir}/sh
-	doins "${S}"/sbin/rc-*
-}
-
-pkg_postinst() {
-	if [[ ${EUID} == 0 ]] ; then
-		# setup portage user, such that things that require root privs
-		# don't fail, bug #321623
-		enewgroup portage 250
-		enewuser portage 250 -1 "${EPREFIX}"/var/tmp/portage portage
-	fi
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-	echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-}
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch
deleted file mode 100644
index ebc1623..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-W00T, AIX does have /proc filesystem - even with slightly different layout.
-
---- src/start-stop-daemon.c
-+++ src/start-stop-daemon.c
-@@ -56,6 +56,8 @@
- #  define OSNetBSD
- #elif defined(__APPLE__)
- #  define OSDarwin
-+#elif defined(_AIX)
-+#  define OSaix
- #else
- #  error Unknown architecture - cannot build start-stop-daemon
- #endif
-@@ -85,6 +87,10 @@
- #include <sys/pstat.h>
- #endif
- 
-+#if defined(OSaix)
-+#include <sys/procfs.h>
-+#endif
-+
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -178,7 +184,7 @@
- static void do_pidfile(const char *name);
- static void do_stop(int signal_nr, int quietmode,
- 		    int *n_killed, int *n_notkilled, int retry_nr);
--#if defined(OSLinux) || defined(OShpux)
-+#if defined(OSLinux) || defined(OShpux) || defined(OSaix)
- static int pid_is_exec(pid_t pid, const struct stat *esb);
- #endif
- 
-@@ -755,7 +761,7 @@
- static void
- check(pid_t pid)
- {
--#if defined(OSLinux) || defined(OShpux)
-+#if defined(OSLinux) || defined(OShpux) || defined(OSaix)
- 	if (execname && !pid_is_exec(pid, &exec_stat))
- 		return;
- #elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -791,7 +797,7 @@
- /* WTA: this  needs to be an autoconf check for /proc/pid existance.
-  */
- 
--#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd)
-+#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix)
- static void
- do_procinit(void)
- {
-@@ -1059,6 +1065,58 @@
- }
- #endif /* OShpux */
- 
-+#if defined(OSaix)
-+/* max possible pid (signed long) in theory:
-+ * 32bit: 2147483647 (10 digits)
-+ * 64bit: 9223372036854775807 (19 digits)
-+ */
-+static int
-+pid_is_exec(pid_t pid, const struct stat *esb)
-+{
-+	struct stat sb;
-+	char buf[40];
-+
-+	sprintf(buf, "/proc/%ld/object/a.out", pid);
-+	if (stat(buf, &sb) != 0)
-+		return 0;
-+	return (sb.st_dev == esb->st_dev && sb.st_ino == esb->st_ino);
-+}
-+
-+
-+static int
-+pid_is_user(pid_t pid, uid_t uid)
-+{
-+	struct stat sb;
-+	char buf[32];
-+
-+	sprintf(buf, "/proc/%ld", pid);
-+	if (stat(buf, &sb) != 0)
-+		return 0;
-+	return (sb.st_uid == uid);
-+}
-+
-+
-+static int
-+pid_is_cmd(pid_t pid, const char *name)
-+{
-+	char buf[40];
-+	FILE *f;
-+	struct psinfo psi;
-+	int r;
-+
-+	sprintf(buf, "/proc/%ld/psinfo", pid);
-+	f = fopen(buf, "r");
-+	if (!f)
-+		return 0;
-+	r = fread(&psi, sizeof(psi), 1, f);
-+	fclose(f);
-+	if (r != 1) {
-+		return 0;
-+	}
-+	return strcmp(name, psi.pr_fname) == 0;
-+}
-+#endif /* OSaix */
-+
- 
- static void
- do_findprocs(void)
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-darwin-kvm.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-darwin-kvm.patch
deleted file mode 100644
index 08668ed..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-darwin-kvm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=360855
-
-by JTRiley 
-
---- baselayout-1.12.5/src/start-stop-daemon.c
-+++ baselayout-1.12.5/src/start-stop-daemon.c
-@@ -73,10 +73,14 @@
- #include <sys/types.h>
- 
- #include <err.h>
--#include <kvm.h>
- #include <limits.h>
- #endif
- 
-+#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
-+#include <kvm.h>
-+#endif
-+
-+
- #if defined(OShpux)
- #include <sys/param.h>
- #include <sys/pstat.h>
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-gnulib.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-gnulib.patch
deleted file mode 100644
index dfb64c6..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-gnulib.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Need to add libraries after object files, or solaris
-linker might not see library's symbols to be needed
-when added to LDFLAGS.
-
-Take strndup from gnulib too, this decl breaks on Linux (#361417).
-
-VERSION is defined in gnulib's config.h.
-
---- src/Makefile.orig	2011-03-30 13:15:56 +0200
-+++ src/Makefile	2011-03-30 13:16:52 +0200
-@@ -30,10 +30,10 @@
- 	$(CC) $(CFLAGS) -c -o $@ $^
- 
- runscript: runscript.o rs-misc.o
--	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_RS)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_RS)
- 
- start-stop-daemon: start-stop-daemon.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_SSD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_SSD)
- 
- install: $(TARGET)
- 	install -m 0755 -d $(DESTDIR)/bin
---- src/core/misc.c.orig	2011-03-31 17:46:46 +0200
-+++ src/core/misc.c	2011-03-31 17:47:03 +0200
-@@ -86,31 +86,6 @@
- 	return new_path;
- }
- 
--char *strndup(const char *str, size_t size) {
--	char *new_str = NULL;
--	size_t len;
--
--	if (NULL == str) {
--		DBG_MSG("Invalid argument passed!\n");
--		errno = EINVAL;
--		return NULL;
--	}
--
--	/* Check lenght of str without breaching the size limit */
--	for (len = 0;(len < size) && ('\0' != str[len]);len++);
--
--	new_str = malloc(len + 1);
--	if (NULL == new_str) {
--		DBG_MSG("Failed to allocate buffer!\n");
--		return NULL;
--	}
--
--	/* Make sure our string is NULL terminated */
--	new_str[len] = '\0';
--	
--	return (char *)memcpy(new_str, str, len);
--}
--
- char *gbasename(const char *path) {
- 	char *new_path = NULL;
- 	
---- src/core/misc.h.orig	2011-03-31 17:46:43 +0200
-+++ src/core/misc.h	2011-03-31 18:06:58 +0200
-@@ -246,8 +246,6 @@
-  * with the malloc() call. */
- char *strcatpaths(const char *pathname1, const char *pathname2);
- 
--/* Compat functions for GNU extensions */
--char *strndup(const char *str, size_t size);
- /* Same as basename(3), but do not modify path */
- char *gbasename(const char *path);
- 
---- src/start-stop-daemon.c.orig	2011-03-31 18:11:02 +0200
-+++ src/start-stop-daemon.c	2011-03-31 18:11:03 +0200
-@@ -31,6 +31,7 @@
-  * 
-  */
- 
-+#undef VERSION
- #define VERSION "1.13.11+gentoo"
- 
- #define NONRETURNPRINTFFORMAT(x, y) \
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-bash.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-bash.patch
deleted file mode 100644
index 095ce45..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-bash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru baselayout-1.12.5.orig/sbin/env-update.sh baselayout-1.12.5/sbin/env-update.sh
---- baselayout-1.12.5.orig/sbin/env-update.sh	2010-08-17 12:56:00.968746729 +0200
-+++ baselayout-1.12.5/sbin/env-update.sh	2010-08-17 12:56:47.185326760 +0200
-@@ -1,4 +1,4 @@
--#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-+#! /usr/bin/env bash
- # Copyright 1999-2004 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
-diff -ru baselayout-1.12.5.orig/sbin/runscript.sh baselayout-1.12.5/sbin/runscript.sh
---- baselayout-1.12.5.orig/sbin/runscript.sh	2010-08-17 12:56:00.968746729 +0200
-+++ baselayout-1.12.5/sbin/runscript.sh	2010-08-17 12:56:58.362098849 +0200
-@@ -1,4 +1,4 @@
--#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-+#! /usr/bin/env bash
- # Copyright 1999-2006 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-eprefix.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-eprefix.patch
deleted file mode 100644
index 28d8039..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-eprefix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru baselayout-1.12.5.orig/etc/profile baselayout-1.12.5/etc/profile
---- baselayout-1.12.5.orig/etc/profile	2009-11-27 15:27:58 +0100
-+++ baselayout-1.12.5/etc/profile	2009-11-27 15:34:14 +0100
-@@ -137,6 +137,21 @@
- 	done
- fi
- 
-+#
-+# final finally set EPREFIX to our prefix if we don't have a local portage. this
-+# was previously done by the startprefix script, but we want to be able to start
-+# this environment by simply sourcing etc/profile with the correct shell.
-+#
-+if [[ -z "${EPREFIX}" ]]; then
-+	if [[ ! -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/emerge ]]; then
-+		export EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-+	fi
-+elif [[ "${EPREFIX}" != "@GENTOO_PORTAGE_EPREFIX@" ]]; then
-+	echo "WARNING: EPREFIX is set from environment to \"${EPREFIX}\"."
-+	echo "         You are entering the prefix \"@GENTOO_PORTAGE_EPREFIX@\"."
-+	echo "         Having EPREFIX set this way will probably render this environment unusable."
-+fi
-+
- unset _ro_root
- unset _ro_deps
- unset _ro_chained_path_vars
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-pkgconfig.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-pkgconfig.patch
deleted file mode 100644
index b0d7e79..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru baselayout-1.12.5.orig/etc/profile baselayout-1.12.5/etc/profile
---- baselayout-1.12.5.orig/etc/profile	2009-07-14 09:48:59 +0200
-+++ baselayout-1.12.5/etc/profile	2009-07-14 09:50:48 +0200
-@@ -30,8 +30,11 @@
- if [[ -n "${_ro_root}" ]]; then
- 	_ro_chained_path_vars="PATH MANPATH"
- 
--	[[ ${_ro_deps} == *RDEPEND* ]] && 
-+	if [[ ${_ro_deps} == *RDEPEND* ]]; then
- 		_ro_chained_path_vars="${_ro_chained_path_vars} PKG_CONFIG_PATH"
-+	else
-+		unset PKG_CONFIG_PATH
-+	fi
- 
- 	for var in ${_ro_chained_path_vars}; do
- 		eval "_ro_backupenv_paths_${var}=\${${var}}"
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-prompt.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-prompt.patch
deleted file mode 100644
index eb7a4ab..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-prompt.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ru baselayout-1.12.5.orig/etc/profile baselayout-1.12.5/etc/profile
---- baselayout-1.12.5.orig/etc/profile	2009-12-09 13:48:07 +0100
-+++ baselayout-1.12.5/etc/profile	2009-12-09 13:54:52 +0100
-@@ -110,9 +110,34 @@
- 		# it in the user's dot-files), but it shouldn't make any 
- 		# difference.
- 		. "@GENTOO_PORTAGE_EPREFIX@"/etc/bash/bashrc
-+	elif [ -n "${_ro_root}" ]; then
-+		# We're in a prefix chain, but have no local bash. we rely on bash
-+		# beeing there _somewhere_ in the chain, so we do not need to set
-+		# PS1 explicitly.
-+		if [ -z "${PS1}" ]; then
-+			# try harder to find something in the parent prefix of the chain.
-+			# dont bother to search multiple chain members up to the top.
-+			if [ -f "${_ro_root}/etc/bash/bashrc" ]; then
-+				. "${_ro_root}/etc/bash/bashrc"
-+			fi
-+		fi
- 	else
- 		PS1='\u@\h \w \$ '
- 	fi
-+
-+	# Set the last dirpart of the current prefix somewhere
-+	# in the prompt, so one immediately knows where he/she is.
-+	if [ ${_ro_recursion_level} == 0 ]; then
-+		# we're in the last prefix of the chain here.
-+		_ro_name="@GENTOO_PORTAGE_EPREFIX@"
-+		_ro_name="${_ro_name##*/}"
-+
-+		# use color only if the prompt already contains color escapes
-+		case "${PS1}" in
-+		*'\[\033['*'m\]'*) 	PS1="\[\033[01;36m\][${_ro_name}]\[\033[00m\] ${PS1}" ;;
-+		*) 					PS1="[${_ro_name}] ${PS1}" ;;
-+		esac
-+	fi
- else
- 	# Setup a bland default prompt.  Since this prompt should be useable
- 	# on color and non-color terminals, as well as shells that don't
-@@ -120,6 +145,10 @@
- 	PS1="`whoami`@`uname -n | cut -f1 -d.` \$ "
- fi
- 
-+# when chaining prefixes, we want the prompt to be passed to the child too,
-+# so we need to export it.
-+export PS1
-+
- for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
- 	if [ -r "$sh" ] ; then
- 		. "$sh"
-@@ -146,7 +175,7 @@
- 	if [[ ! -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/emerge ]]; then
- 		export EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
- 	fi
--elif [[ "${EPREFIX}" != "@GENTOO_PORTAGE_EPREFIX@" ]]; then
-+elif [[ "${EPREFIX}" != "@GENTOO_PORTAGE_EPREFIX@" && ${_ro_recursion_level} == 0 ]]; then
- 	echo "WARNING: EPREFIX is set from environment to \"${EPREFIX}\"."
- 	echo "         You are entering the prefix \"@GENTOO_PORTAGE_EPREFIX@\"."
- 	echo "         Having EPREFIX set this way will probably render this environment unusable."
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-recursion.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-recursion.patch
deleted file mode 100644
index 7188383..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining-recursion.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru baselayout-1.12.5.orig/etc/profile baselayout-1.12.5/etc/profile
---- baselayout-1.12.5.orig/etc/profile	2009-07-20 09:10:30 +0200
-+++ baselayout-1.12.5/etc/profile	2009-07-20 09:49:01 +0200
-@@ -17,10 +17,29 @@
- _ro_root=$(. "/tools/mduft/eprefix/preserved"/etc/make.conf && echo $READONLY_EPREFIX)
- _ro_deps=${_ro_root#*:}
- _ro_root=${_ro_root%:*}
-+
-+#
-+# prevent dooming of _ro_* variables by recursing down the
-+# profile chain, by backing the up, tagged by resursion depth.
-+#
-+
-+[[ -z "${_ro_recursion_level}" ]] && _ro_recursion_level=0
-+((++_ro_recursion_level))
-+
-+for _ro_backup_var in _ro_root _ro_deps; do
-+	eval "_ro_b${_ro_recursion_level}_${_ro_backup_var}=\${${_ro_backup_var}}"
-+done
-+
- if [ -n "${_ro_root}" -a -f "${_ro_root}"/etc/profile ]; then
- 	. "${_ro_root}"/etc/profile
- fi
- 
-+for _ro_backup_var in _ro_root _ro_deps; do
-+	eval "${_ro_backup_var}=\${_ro_b${_ro_recursion_level}_${_ro_backup_var}}"
-+done
-+
-+((--_ro_recursion_level))
-+
- #
- # With prefix-chaining we want another set of variables that
- # should be retained for all prefixes. for example it is ok
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining.patch
deleted file mode 100644
index f17d1bb..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ru baselayout-1.12.5.orig/etc/profile baselayout-1.12.5/etc/profile
---- baselayout-1.12.5.orig/etc/profile	2009-03-24 08:18:37.000000000 +0100
-+++ baselayout-1.12.5/etc/profile	2009-03-24 11:50:57.000000000 +0100
-@@ -4,6 +4,40 @@
- # environment for login shells.
- #
- 
-+#
-+# for prefix-chaining, the very first thing to do is to load
-+# the profiles for all chained instances above.
-+#
-+# TODO: is it safe in any case to shell source make.conf?
-+# don't do any recursive expansion here. if the parent can
-+# use READONLY_EPREFIX's, it has to have the same profile as
-+# we have here, and thus it will source parents before
-+# evaluating anything from itself.
-+#
-+_ro_root=$(. "@GENTOO_PORTAGE_EPREFIX@"/etc/make.conf && echo $READONLY_EPREFIX)
-+_ro_deps=${_ro_root#*:}
-+_ro_root=${_ro_root%:*}
-+if [ -n "${_ro_root}" -a -f "${_ro_root}"/etc/profile ]; then
-+	. "${_ro_root}"/etc/profile
-+fi
-+
-+#
-+# With prefix-chaining we want another set of variables that
-+# should be retained for all prefixes. for example it is ok
-+# to retain PKG_CONFIG_PATH if the parent of the chain can
-+# be used to resolve RDEPEND...
-+#
-+if [[ -n "${_ro_root}" ]]; then
-+	_ro_chained_path_vars="PATH MANPATH"
-+
-+	[[ ${_ro_deps} == *RDEPEND* ]] && 
-+		_ro_chained_path_vars="${_ro_chained_path_vars} PKG_CONFIG_PATH"
-+
-+	for var in ${_ro_chained_path_vars}; do
-+		eval "_ro_backupenv_paths_${var}=\${${var}}"
-+	done
-+fi
-+
- # Load environment settings from profile.env, which is created by
- # env-update from the files in /etc/env.d
- if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
-@@ -21,10 +55,17 @@
- # It is intentional in the following line to use || instead of -o.
- # This way the evaluation can be short-circuited and calling whoami is
- # avoided.
-+#
-+# system directories are only appended if this prefix is the last
-+# one in a chain of prefixes (or the only prefix in the chain), so
-+# that they don't end up in the middle of multiple different prefix
-+# paths (profile is recursive now, see above!)
- if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
--	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
-+	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}"
-+	[[ -z "${_ro_root}" ]] && PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
- else
--	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
-+	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}"
-+	[[ -z "${_ro_root}" ]] && PATH="$PATH:/usr/bin:/bin"
- fi
- export PATH
- unset ROOTPATH
-@@ -63,3 +104,18 @@
- 	fi
- done
- unset sh
-+
-+#
-+# finally chain the save variables for previous prefixes in the chain.
-+#
-+if [[ -n "${_ro_chained_path_vars}" ]]; then
-+	for var in ${_ro_chained_path_vars}; do
-+		eval "export ${var}=\${${var}}:\${_ro_backupenv_paths_${var}}"
-+		eval "unset _ro_backupenv_paths_${var}"
-+	done
-+fi
-+
-+unset _ro_root
-+unset _ro_deps
-+unset _ro_chained_path_vars
-+
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-no-consoletype.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-no-consoletype.patch
deleted file mode 100644
index 442dea3..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-no-consoletype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- baselayout-1.12.5/src/Makefile	2007-10-17 21:22:08 +0400
-+++ baselayout-1.12.5/src/Makefile	2007-10-17 21:22:23 +0400
-@@ -9,7 +9,7 @@
- LIBDIR = lib
- 
- BIN_TARGETS =
--SBIN_TARGETS = consoletype runscript start-stop-daemon
-+SBIN_TARGETS = runscript start-stop-daemon
- SYS_WHITELIST = env_whitelist
- 
- TARGET = $(BIN_TARGETS) $(SBIN_TARGETS)
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-pidof.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-pidof.patch
deleted file mode 100644
index 0a592cc..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-pidof.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- baselayout-1.12.5/sbin/rc-daemon.sh	2007-10-18 19:15:34 +0400
-+++ baselayout-1.12.5/sbin/rc-daemon.sh	2007-10-18 19:20:32 +0400
-@@ -186,7 +186,7 @@
- 		args="${args} '"${arg}"'"
- 	done
- 
--	eval /bin/pidof -x ${args}
-+	eval @GENTOO_PORTAGE_EPREFIX@/bin/pidof -x ${args}
- }
- 
- # bool is_daemon_running(char* cmd, char* pidfile)
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-sh.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-sh.patch
deleted file mode 100644
index a1f4593..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-sh.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -ur sbin/rc-daemon.sh @GENTOO_PORTAGE_EPREFIX@/lib/rcscripts/sh/rc-daemon.sh
---- baselayout-1.12.5/sbin/rc-daemon.sh	2006-09-14 14:11:34 +0400
-+++ baselayout-1.12.5/sbin/rc-daemon.sh	2007-10-18 01:20:10 +0400
-@@ -226,7 +229,7 @@
- # We don't do anyting fancy - just pass the given options
- # to start-stop-daemon and return the value
- rc_start_daemon() {
--	eval /sbin/start-stop-daemon "${args}"
-+	eval @GENTOO_PORTAGE_EPREFIX@/sbin/start-stop-daemon "${args}"
- 	local retval="$?"
- 
- 	[[ ${retval} != "0" ]] && return "${retval}"
-@@ -365,7 +368,7 @@
- 
- 	# We pass --oknodo and --test directly to start-stop-daemon and return
- 	if ${nothing}; then
--		eval /sbin/start-stop-daemon "${args}"
-+		eval @GENTOO_PORTAGE_EPREFIX@/sbin/start-stop-daemon "${args}"
- 		return "$?"
- 	fi
- 
-diff -ur sbin/rc-services.sh @GENTOO_PORTAGE_EPREFIX@/lib/rcscripts/sh/rc-services.sh
---- baselayout-1.12.5/sbin/rc-services.sh	2006-09-14 14:11:34 +0400
-+++ baselayout-1.12.5/sbin/rc-services.sh	2007-10-18 01:25:55 +0400
-@@ -8,9 +8,9 @@
- 
- if [[ ${RC_GOT_DEPTREE_INFO} != "yes" ]] ; then
- 	# Only try and update if we are root
--	if [[ ${EUID} == "0" ]] && ! /sbin/depscan.sh ; then
-+	if [[ ${EUID} == "0" ]] && ! @GENTOO_PORTAGE_EPREFIX@/sbin/depscan.sh ; then
- 		echo
--		eerror "Error running '/sbin/depscan.sh'!"
-+		eerror "Error running '@GENTOO_PORTAGE_EPREFIX@/sbin/depscan.sh'!"
- 		eerror "Please correct any problems above."
- 		exit 1
- 	fi
-@@ -19,7 +19,7 @@
- 	if [[ ${RC_GOT_DEPTREE_INFO} != "yes" ]] ; then
- 		echo
- 		eerror "Dependency info is missing!  Please run"
--		eerror "  # /sbin/depscan.sh"
-+		eerror "  # @GENTOO_PORTAGE_EPREFIX@/sbin/depscan.sh"
- 		eerror "to fix this."
- 		exit 1
- 	fi
-@@ -134,7 +134,7 @@
- 	if ! get_dep_info "${myservice}" >/dev/null ; then
- 		eerror "Could not get dependency info for ${myservice}!" > /dev/stderr
- 		eerror "Please run:" > /dev/stderr
--		eerror "  # /sbin/depscan.sh" > /dev/stderr
-+		eerror "  # @GENTOO_PORTAGE_EPREFIX@/sbin/depscan.sh" > /dev/stderr
- 		eerror "to try and fix this." > /dev/stderr
- 		return 1
- 	fi
-@@ -212,11 +212,11 @@
- 
- 	[[ -z $1 || -z $2 ]] && return 1
- 
--	[[ $2 != "${BOOTLEVEL}" && -e /etc/runlevels/"${BOOTLEVEL}"/.fake ]] && \
--		fake_services="$( < /etc/runlevels/"${BOOTLEVEL}"/.fake )"
-+	[[ $2 != "${BOOTLEVEL}" && -e @GENTOO_PORTAGE_EPREFIX@/etc/runlevels/"${BOOTLEVEL}"/.fake ]] && \
-+		fake_services="$( < @GENTOO_PORTAGE_EPREFIX@/etc/runlevels/"${BOOTLEVEL}"/.fake )"
- 
--	[[ -e /etc/runlevels/"$2"/.fake ]] && \
--		fake_services="${fake_services} $( < /etc/runlevels/"$2"/.fake )"
-+	[[ -e @GENTOO_PORTAGE_EPREFIX@/etc/runlevels/"$2"/.fake ]] && \
-+		fake_services="${fake_services} $( < @GENTOO_PORTAGE_EPREFIX@/etc/runlevels/"$2"/.fake )"
- 
- 	for x in ${fake_services} ; do
- 		[[ $1 == "${x##*/}" ]] && return 0
-@@ -232,7 +232,7 @@
- in_runlevel() {
- 	[[ -z $1 || -z $2 ]] && return 1
- 
--	[[ -L "/etc/runlevels/$2/$1" ]] && return 0
-+	[[ -L "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/$2/$1" ]] && return 0
- 
- 	return 1
- }
-@@ -385,7 +385,7 @@
- 	local service="$1"
- 	[[ -z ${service} ]] && return 1
- 
--	if [[ ! -e "/etc/init.d/${service}" ]] ; then
-+	if [[ ! -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" ]] ; then
- 		mark_service_stopped "${service}"
- 		return 1
- 	fi
-@@ -408,8 +408,8 @@
- 		# if we can not start the services in parallel
- 		# then just start it and return the exit status
- 		(
--			profiling name "/etc/init.d/${service} start"
--			"/etc/init.d/${service}" start
-+			profiling name "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service} start"
-+			"@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" start
- 		)
- 		
- 		service_started "${service}" || service_inactive "${service}" \
-@@ -423,8 +423,8 @@
- 	else
- 		# if parallel startup is allowed, start it in background
- 		(
--			profiling name "/etc/init.d/${service} start"
--			"/etc/init.d/${service}" start
-+			profiling name "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service} start"
-+			"@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" start
- 			
- 			service_started "${service}" || service_inactive "${service}" \
- 				|| service_scheduled "${service}"
-@@ -445,7 +445,7 @@
- 	local service="$1"
- 	[[ -z ${service} ]] && return 1
- 
--	if [[ ! -e "/etc/init.d/${service}" ]] ; then
-+	if [[ ! -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" ]] ; then
- 		mark_service_stopped "${service}"
- 		return 0
- 	fi
-@@ -470,7 +470,7 @@
- 		  ${STOP_CRITICAL} == "yes" ]] ; then
- 		# if we can not start the services in parallel
- 		# then just start it and return the exit status
--		( "/etc/init.d/${service}" stop )
-+		( "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" stop )
- 		service_stopped "${service}"
- 		retval=$?
- 		end_service "${service}" "${retval}"
-@@ -479,7 +479,7 @@
- 	else
- 		# if parallel startup is allowed, start it in background
- 		(
--			( "/etc/init.d/${service}" stop )
-+			( "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" stop )
- 			service_stopped "${service}"
- 			retval=$?
- 			end_service "${service}" "${retval}"
-@@ -496,7 +496,7 @@
- mark_service_coldplugged() {
- 	[[ -z $1 ]] && return 1
- 
--	ln -snf "/etc/init.d/$1" "${svcdir}/coldplugged/$1"
-+	ln -snf "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/$1" "${svcdir}/coldplugged/$1"
- 	return 0
- }
- 
-@@ -507,7 +507,7 @@
- mark_service_starting() {
- 	[[ -z $1 ]] && return 1
- 
--	ln -sn "/etc/init.d/$1" "${svcdir}/starting/$1" 2>/dev/null || return 1
-+	ln -sn "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/$1" "${svcdir}/starting/$1" 2>/dev/null || return 1
- 
- 	[[ -f "${svcdir}/started/$1" ]] && rm -f "${svcdir}/started/$1"
- 	[[ -f "${svcdir}/inactive/$1" ]] \
-@@ -522,7 +522,7 @@
- mark_service_started() {
- 	[[ -z $1 ]] && return 1
- 
--	ln -snf "/etc/init.d/$1" "${svcdir}/started/$1"
-+	ln -snf "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/$1" "${svcdir}/started/$1"
- 	
- 	rm -f "${svcdir}/starting/$1" "${svcdir}/inactive/$1" \
- 		"${svcdir}/wasinactive/$1" "${svcdir}/stopping/$1" \
-@@ -538,7 +538,7 @@
- mark_service_inactive() {
- 	[[ -z $1 ]] && return 1
- 
--	ln -snf "/etc/init.d/$1" "${svcdir}/inactive/$1"
-+	ln -snf "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/$1" "${svcdir}/inactive/$1"
- 	
- 	rm -f "${svcdir}/started/$1" "${svcdir}/wasinactive/$1" \
- 		"${svcdir}/starting/$1" "${svcdir}/stopping/$1"
-@@ -553,7 +553,7 @@
- mark_service_stopping() {
- 	[[ -z $1 ]] && return 1
- 
--	ln -sn "/etc/init.d/$1" "${svcdir}/stopping/$1" 2>/dev/null || return 1
-+	ln -sn "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/$1" "${svcdir}/stopping/$1" 2>/dev/null || return 1
- 
- 	rm -f "${svcdir}/started/$1"
- 	[[ -f "${svcdir}/inactive/$1" ]] \
-@@ -690,7 +691,7 @@
- mark_service_failed() {
- 	[[ -z $1 || ! -d "${svcdir}/failed" ]] && return 1
- 
--	ln -snf "/etc/init.d/$1" "${svcdir}/failed/$1"
-+	ln -snf "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/$1" "${svcdir}/failed/$1"
- }
- 
- # bool service_failed(service)
-@@ -744,8 +745,8 @@
- 			return $?
- 			;;
- 		yes)
--			for x in $(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
--				$(dolisting "/etc/runlevels/${SOFTLEVEL}/net.*") ; do
-+			for x in $(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}/net.*") \
-+				$(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${SOFTLEVEL}/net.*") ; do
- 				local y="${x##*/}"
- 				[[ ${y} == "$1" ]] && return 1
- 				service_started "${y}" || return 1
-@@ -785,8 +786,8 @@
- 	[[ -f "${svcdir}/softlevel" ]] && mylevel=$( < "${svcdir}/softlevel" )
- 
- 	for x in $( i$1 "$2" ) ; do
--		[[ -e "/etc/runlevels/${BOOTLEVEL}/${x}" || \
--		   -e "/etc/runlevels/${mylevel}/${x}" || \
-+		[[ -e "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}/${x}" || \
-+		   -e "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${mylevel}/${x}" || \
- 		   ${x} == "net" ]] \
- 				&& valid="${valid} ${x}"
- 	done
-@@ -836,9 +837,9 @@
- 			net_services="${net_services} ${x##*/}"
- 		done
- 	else
--		for x in $(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
--			$(dolisting "/etc/runlevels/${SOFTLEVEL}/net.*") \
--			$(dolisting "/etc/runlevels/coldplugged/net.*") ; do
-+		for x in $(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}/net.*") \
-+			$(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${SOFTLEVEL}/net.*") \
-+			$(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/coldplugged/net.*") ; do
- 			net_services="${net_services} ${x##*/}"
- 		done
- 	fi
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-src.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-src.patch
deleted file mode 100644
index a6ee5db..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-src.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- baselayout-1.12.5/src/runscript.c	2007-10-17 21:11:10 +0400
-+++ baselayout-1.12.5/src/runscript.c	2007-10-17 21:13:56 +0400
-@@ -22,16 +22,16 @@
- # define LIBDIR		"lib"
- #endif
- 
--#define SBIN_RC		"/sbin/rc"
--#define PROFILE_ENV	"/etc/profile.env"
--#define RCSCRIPTS_LIB	"/" LIBDIR "/rcscripts"
-+#define SBIN_RC		"@GENTOO_PORTAGE_EPREFIX@/sbin/rc"
-+#define PROFILE_ENV	"@GENTOO_PORTAGE_EPREFIX@/etc/profile.env"
-+#define RCSCRIPTS_LIB	"@GENTOO_PORTAGE_EPREFIX@/" LIBDIR "/rcscripts"
- #define SYS_WHITELIST	RCSCRIPTS_LIB "/conf.d/env_whitelist"
--#define USR_WHITELIST	"/etc/conf.d/env_whitelist"
-+#define USR_WHITELIST	"@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/env_whitelist"
- #define RCSCRIPT_HELP	RCSCRIPTS_LIB "/sh/rc-help.sh"
- #define SELINUX_LIB	RCSCRIPTS_LIB "/runscript_selinux.so"
- #define SOFTLEVEL	"SOFTLEVEL"
- 
--#define DEFAULT_PATH	"PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin"
-+#define DEFAULT_PATH	"PATH=@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/local/sbin"
- 
- #define IS_SBIN_RC()	(0 == strcmp(caller, SBIN_RC))
- 
-@@ -217,7 +217,7 @@
- 	int new = 1;
- 
- 	/* Need to be /bin/bash, else BASH is invalid */
--	myargs[0] = "/bin/bash";
-+	myargs[0] = "@GENTOO_PORTAGE_EPREFIX@/bin/bash";
- 	while (argv[new] != 0) {
- 		myargs[new] = argv[new];
- 		new++;
-@@ -243,10 +243,10 @@
- 	setup_selinux(argc, argv);
- 
- 	if (!IS_SBIN_RC()) {
--		if (execve("/sbin/runscript.sh", myargs, myenv) < 0)
-+		if (execve("@GENTOO_PORTAGE_EPREFIX@/sbin/runscript.sh", myargs, myenv) < 0)
- 			exit(1);
- 	} else {
--		if (execve("/bin/bash", myargs, myenv) < 0)
-+		if (execve("@GENTOO_PORTAGE_EPREFIX@/bin/bash", myargs, myenv) < 0)
- 			exit(1);
- 	}
- 
-diff -ur ./sbin/depscan.sh /Users/dirk/src@GENTOO_PORTAGE_EPREFIX@/sbin/depscan.sh
---- baselayout-1.12.5/sbin/depscan.sh	2007-10-17 21:26:21 +0400
-+++ baselayout-1.12.5/sbin/depscan.sh	2007-10-17 18:58:23 +0400
-@@ -7,7 +7,7 @@
- fi
- 
- argv0=${0##*/}
--source /etc/init.d/functions.sh || {
-+source @GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh || {
- 	echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
- 	exit 1
- }
-@@ -89,7 +91,7 @@
- 	fi
- 
- 	touch "${mtime_test}"
--	for config in /etc/conf.d/* /etc/init.d/* /etc/rc.conf
-+	for config in @GENTOO_PORTAGE_EPREFIX@/etc/conf.d/* @GENTOO_PORTAGE_EPREFIX@/etc/init.d/* @GENTOO_PORTAGE_EPREFIX@/etc/rc.conf
- 	do
- 		! ${update} \
- 			&& is_older_than "${mysvcdir}/depcache" "${config}" \
-@@ -104,7 +106,7 @@
- 	rm -f "${mtime_test}"
- 
- 	if [[ ${clock_screw} == 1 ]] ; then
--		ewarn "One of the files in /etc/{conf.d,init.d} or /etc/rc.conf"
-+		ewarn "One of the files in @GENTOO_PORTAGE_EPREFIX@/etc/{conf.d,init.d} or @GENTOO_PORTAGE_EPREFIX@/etc/rc.conf"
- 		ewarn "has a modification time in the future!"
- 	fi
- 
-@@ -125,17 +127,17 @@
- 
- export SVCDIR DEPTYPES ORDTYPES
- 
--cd /etc/init.d
-+cd @GENTOO_PORTAGE_EPREFIX@/etc/init.d
- 
--/bin/gawk \
--	-f /lib/rcscripts/awk/functions.awk \
--	-f /lib/rcscripts/awk/cachedepends.awk || \
-+@GENTOO_PORTAGE_EPREFIX@/bin/gawk \
-+	-f @GENTOO_PORTAGE_EPREFIX@/lib/rcscripts/awk/functions.awk \
-+	-f @GENTOO_PORTAGE_EPREFIX@/lib/rcscripts/awk/cachedepends.awk || \
- 	retval=1
- 
--bash "${mysvcdir}/depcache" | \
--/bin/gawk \
--	-f /lib/rcscripts/awk/functions.awk \
--	-f /lib/rcscripts/awk/gendepends.awk || \
-+@GENTOO_PORTAGE_EPREFIX@/bin/bash "${mysvcdir}/depcache" | \
-+@GENTOO_PORTAGE_EPREFIX@/bin/gawk \
-+	-f @GENTOO_PORTAGE_EPREFIX@/lib/rcscripts/awk/functions.awk \
-+	-f @GENTOO_PORTAGE_EPREFIX@/lib/rcscripts/awk/gendepends.awk || \
- 	retval=1
- 
- touch "${mysvcdir}"/dep{cache,tree}
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix.patch
deleted file mode 100644
index 3394a32..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix.patch
+++ /dev/null
@@ -1,409 +0,0 @@
---- baselayout-1.12.5/etc/env.d/00basic
-+++ baselayout-1.12.5/etc/env.d/00basic
-@@ -1,10 +1,11 @@
--# /etc/env.d/00basic
-+# @GENTOO_PORTAGE_EPREFIX@/etc/env.d/00basic
- 
--PATH="/opt/bin"
--ROOTPATH="/opt/bin"
--LDPATH="/usr/local/lib"
--MANPATH="/usr/local/share/man:/usr/share/man"
--INFOPATH="/usr/share/info"
-+# in prefix we have sbin variants in user path!
-+PATH="@GENTOO_PORTAGE_EPREFIX@/opt/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin"
-+ROOTPATH="@GENTOO_PORTAGE_EPREFIX@/opt/bin"
-+LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/local/lib"
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/man"
-+INFOPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/info"
- CVS_RSH="ssh"
--PAGER="/usr/bin/less"
-+PAGER="@GENTOO_PORTAGE_EPREFIX@/usr/bin/less"
- LESSOPEN="|lesspipe.sh %s"
---- baselayout-1.12.5/sbin/env-update.sh
-+++ baselayout-1.12.5/sbin/env-update.sh
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Copyright 1999-2004 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--source /sbin/functions.sh || exit 1
-+source "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh || exit 1
- 
--if [[ ${EUID} != "0" ]] ; then
-+if [[ ${EPREFIX/\//} == "" ]] && [[ ${EUID} != "0" ]] ; then
- 	eerror "$0: must be root."
- 	exit 1
- fi
-@@ -13,8 +13,8 @@
- echo "usage: env-update.sh
- 
- note:
--      This utility generates /etc/profile.env and /etc/csh.env
--      from the contents of /etc/env.d/
-+      This utility generates @GENTOO_PORTAGE_EPREFIX@/etc/profile.env and @GENTOO_PORTAGE_EPREFIX@/etc/csh.env
-+      from the contents of @GENTOO_PORTAGE_EPREFIX@/etc/env.d/
- "
- 	exit 1
- }
-@@ -30,9 +30,9 @@
- if [[ $# != "0" ]] ; then
- 	usage
- else
--	/bin/gawk \
--		-f /lib/rcscripts/awk/functions.awk \
--		-f /lib/rcscripts/awk/genenviron.awk
-+	"@GENTOO_PORTAGE_EPREFIX@"/bin/gawk \
-+		-f "@GENTOO_PORTAGE_EPREFIX@"/lib/rcscripts/awk/functions.awk \
-+		-f "@GENTOO_PORTAGE_EPREFIX@"/lib/rcscripts/awk/genenviron.awk
- fi
- 
- # vim:ts=4
---- baselayout-1.12.5/sbin/functions.sh
-+++ baselayout-1.12.5/sbin/functions.sh
-@@ -4,11 +4,11 @@
- RC_GOT_FUNCTIONS="yes"
- 
- # Override defaults with user settings ...
--[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
-+[[ -f @GENTOO_PORTAGE_EPREFIX@/etc/conf.d/rc ]] && source "@GENTOO_PORTAGE_EPREFIX@"/etc/conf.d/rc
- 
- # Check /etc/conf.d/rc for a description of these ...
--declare -r svclib="/lib/rcscripts"
--declare -r svcdir="${svcdir:-/var/lib/init.d}"
-+declare -r svclib="@GENTOO_PORTAGE_EPREFIX@/lib/rcscripts"
-+declare -r svcdir="${svcdir:-@GENTOO_PORTAGE_EPREFIX@/var/lib/init.d}"
- svcmount="${svcmount:-no}"
- svcfstype="${svcfstype:-tmpfs}"
- svcsize="${svcsize:-1024}"
-@@ -83,7 +84,7 @@
- }
- # This will override the splash() function...
- if ! import_addon splash-functions.sh ; then
--	[[ -f /sbin/splash-functions.sh ]] && source /sbin/splash-functions.sh
-+	[[ -f @GENTOO_PORTAGE_EPREFIX@/sbin/splash-functions.sh ]] && source "@GENTOO_PORTAGE_EPREFIX@"/sbin/splash-functions.sh
- fi
- 
- # void profiling(...)
-@@ -114,8 +115,8 @@
- 	local newbootlevel=
- 	local newsoftlevel=
- 
--	if [[ -r /proc/cmdline ]] ; then
--		for copt in $(</proc/cmdline) ; do
-+	if [[ -r @GENTOO_PORTAGE_EPREFIX@/proc/cmdline ]] ; then
-+		for copt in $(<"@GENTOO_PORTAGE_EPREFIX@"/proc/cmdline) ; do
- 			case "${copt%=*}" in
- 				bootlevel)
- 					newbootlevel="${copt##*=}"
-@@ -153,8 +154,8 @@
- 	fi
- 
- 	if [[ ${RC_USE_CONFIG_PROFILE} == "yes" && -n ${DEFAULTLEVEL} ]] && \
--	   [[ -d "/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" || \
--	      -L "/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" ]] ; then
-+	   [[ -d "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" || \
-+	      -L "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" ]] ; then
- 		export BOOTLEVEL="${BOOTLEVEL}.${DEFAULTLEVEL}"
- 	fi
- 
-@@ -176,8 +177,8 @@
- get_libdir() {
- 	if [[ -n ${CONF_LIBDIR_OVERRIDE} ]] ; then
- 		CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
--	elif [[ -x /usr/bin/portageq ]] ; then
--		CONF_LIBDIR="$(/usr/bin/portageq envvar CONF_LIBDIR)"
-+	elif [[ -x @GENTOO_PORTAGE_EPREFIX@/usr/bin/portageq ]] ; then
-+		CONF_LIBDIR="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar CONF_LIBDIR)"
- 	fi
- 	echo "${CONF_LIBDIR:=lib}"
- }
-@@ -190,14 +191,14 @@
- 	local pri=
- 	local tag=
- 
--	if [[ -x /usr/bin/logger ]] ; then
-+	if [[ -x @GENTOO_PORTAGE_EPREFIX@/usr/bin/logger ]] ; then
- 		pri="$1"
- 		tag="$2"
- 
- 		shift 2
- 		[[ -z "$*" ]] && return 0
- 
--		/usr/bin/logger -p "${pri}" -t "${tag}" -- "$*"
-+		"@GENTOO_PORTAGE_EPREFIX@"/usr/bin/logger -p "${pri}" -t "${tag}" -- "$*"
- 	fi
- 
- 	return 0
-@@ -269,7 +270,7 @@
- 	fi
- 
- 	local name="rc-scripts"
--	[[ $0 != "/sbin/runscript.sh" ]] && name="${0##*/}"
-+	[[ $0 != "@GENTOO_PORTAGE_EPREFIX@/sbin/runscript.sh" ]] && name="${0##*/}"
- 	# Log warnings to system log
- 	esyslog "daemon.warning" "${name}" "$*"
- 
-@@ -290,7 +291,7 @@
- 	fi
- 
- 	local name="rc-scripts"
--	[[ $0 != "/sbin/runscript.sh" ]] && name="${0##*/}"
-+	[[ $0 != "@GENTOO_PORTAGE_EPREFIX@/sbin/runscript.sh" ]] && name="${0##*/}"
- 	# Log errors to system log
- 	esyslog "daemon.err" "rc-scripts" "$*"
- 
-@@ -488,9 +489,9 @@
- get_bootparam() {
- 	local x copt params retval=1
- 
--	[[ ! -r /proc/cmdline ]] && return 1
-+	[[ ! -r @GENTOO_PORTAGE_EPREFIX@/proc/cmdline ]] && return 1
- 
--	for copt in $(< /proc/cmdline) ; do
-+	for copt in $(< "@GENTOO_PORTAGE_EPREFIX@"/proc/cmdline) ; do
- 		if [[ ${copt%=*} == "gentoo" ]] ; then
- 			params=$(gawk -v PARAMS="${copt##*=}" '
- 				BEGIN {
-@@ -583,8 +584,8 @@
- #    get the version of baselayout that this system is running
- #
- get_base_ver() {
--	[[ ! -r /etc/gentoo-release ]] && return 0
--	local ver="$(</etc/gentoo-release)"
-+	[[ ! -r @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release ]] && return 0
-+	local ver="$(<"@GENTOO_PORTAGE_EPREFIX@"/etc/gentoo-release)"
- 	echo "${ver##* }"
- }
- 
-@@ -602,8 +603,8 @@
- is_net_fs() {
- 	local fstype
- 	# /proc/mounts is always accurate but may not always be available
--	if [[ -e /proc/mounts ]] ; then
--		fstype="$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' /proc/mounts )"
-+	if [[ -e @GENTOO_PORTAGE_EPREFIX@/proc/mounts ]] ; then
-+		fstype="$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' "@GENTOO_PORTAGE_EPREFIX@"/proc/mounts )"
- 	else
- 		fstype="$( mount | sed -n -e 's:.* on '"$1"' type \([^ ]*\).*:\1:p' )"
- 	fi
-@@ -618,7 +619,7 @@
- #   EXAMPLE:  if is_union_fs / ; then ...
- #
- is_union_fs() {
--	[[ ! -x /sbin/unionctl ]] && return 1
-+	[[ ! -x @GENTOO_PORTAGE_EPREFIX@/sbin/unionctl ]] && return 1
- 	unionctl "$1" --list &>/dev/null
- }
- 
-@@ -629,7 +630,7 @@
- #   EXAMPLE:  if is_uml_sys ; then ...
- #
- is_uml_sys() {
--	grep -qs 'UML' /proc/cpuinfo
-+	grep -qs 'UML' "@GENTOO_PORTAGE_EPREFIX@"/proc/cpuinfo
- }
- 
- # bool is_vserver_sys()
-@@ -639,7 +640,7 @@
- #   EXAMPLE:  if is_vserver_sys ; then ...
- #
- is_vserver_sys() {
--	grep -qs '^s_context:[[:space:]]*[1-9]' /proc/self/status
-+	grep -qs '^s_context:[[:space:]]*[1-9]' "@GENTOO_PORTAGE_EPREFIX@"/proc/self/status
- }
- 
- # bool is_xenU_sys()
-@@ -649,9 +650,9 @@
- #   EXAMPLE:  if is_xenU_sys ; then ...
- #
- is_xenU_sys() {
--	[[ ! -d /proc/xen ]] && return 1
--	[[ ! -r /proc/xen/capabilities ]] && return 1
--	grep -q "control_d" /proc/xen/capabilities && return 1
-+	[[ ! -d "@GENTOO_PORTAGE_EPREFIX@"/proc/xen ]] && return 1
-+	[[ ! -r "@GENTOO_PORTAGE_EPREFIX@"/proc/xen/capabilities ]] && return 1
-+	grep -q "control_d" "@GENTOO_PORTAGE_EPREFIX@"/proc/xen/capabilities && return 1
- 	return 0
- }
- 
-@@ -667,7 +668,7 @@
- 	gawk '$1 ~ "^#" { next }
- 	     $2 == "'$*'" { stab="-t "$3" -o "$4" "$1" "$2; }
- 	     END { print stab; }
--	' /etc/fstab
-+	' "@GENTOO_PORTAGE_EPREFIX@"/etc/fstab
- }
- 
- # char *reverse_list(list)
-@@ -771,13 +772,13 @@
- 	# Setup a basic $PATH.  Just add system default to existing.
- 	# This should solve both /sbin and /usr/sbin not present when
- 	# doing 'su -c foo', or for something like:  PATH= rcscript start
--	PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:${PATH}"
-+	PATH="@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/local/sbin:${PATH}"
- 
- 	# Cache the CONSOLETYPE - this is important as backgrounded shells don't
- 	# have a TTY. rc unsets it at the end of running so it shouldn't hang
- 	# around
- 	if [[ -z ${CONSOLETYPE} ]] ; then
--		export CONSOLETYPE="$( /sbin/consoletype 2>/dev/null )"
-+		export CONSOLETYPE="$( "@GENTOO_PORTAGE_EPREFIX@"/sbin/consoletype 2>/dev/null )"
- 	fi
- 	if [[ ${CONSOLETYPE} == "serial" ]] ; then
- 		RC_NOCOLOR="yes"
-@@ -797,7 +798,7 @@
- 
- 	# If we are not /sbin/rc then ensure that we cannot change level variables
- 	if [[ -n ${BASH_SOURCE} \
--		&& ${BASH_SOURCE[${#BASH_SOURCE[@]}-1]} != "/sbin/rc" ]] ; then
-+		&& ${BASH_SOURCE[${#BASH_SOURCE[@]}-1]} != "@GENTOO_PORTAGE_EPREFIX@/sbin/rc" ]] ; then
- 		declare -r BOOTLEVEL DEFAULTLEVEL SOFTLEVEL
- 	fi
- else
---- baselayout-1.12.5/etc/profile
-+++ baselayout-1.12.5/etc/profile
-@@ -1,4 +1,4 @@
--# /etc/profile: login shell setup
-+# @GENTOO_PORTAGE_EPREFIX@/etc/profile: login shell setup
- #
- # That this file is used by any Bourne-shell derivative to setup the
- # environment for login shells.
-@@ -6,8 +6,8 @@
- 
- # Load environment settings from profile.env, which is created by
- # env-update from the files in /etc/env.d
--if [ -e /etc/profile.env ] ; then
--	. /etc/profile.env
-+if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
-+	. "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env
- fi
- 
- # 077 would be more secure, but 022 is generally quite realistic
-@@ -22,23 +22,23 @@
- # This way the evaluation can be short-circuited and calling whoami is
- # avoided.
- if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
--	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
-+	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
- else
--	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
-+	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
- fi
- export PATH
- unset ROOTPATH
- 
- # Extract the value of EDITOR
--[ -z "$EDITOR" ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`"
--[ -z "$EDITOR" ] && EDITOR="/bin/nano"
-+[ -z "$EDITOR" ] && EDITOR="`. @GENTOO_PORTAGE_EPREFIX@/etc/rc.conf 2>/dev/null; echo $EDITOR`"
-+[ -z "$EDITOR" ] && EDITOR="@GENTOO_PORTAGE_EPREFIX@/bin/nano"
- export EDITOR
- 
- if [ -n "${BASH_VERSION}" ] ; then
- 	# Newer bash ebuilds include /etc/bash/bashrc which will setup PS1
- 	# including color.  We leave out color here because not all
- 	# terminals support it.
--	if [ -f /etc/bash/bashrc ] ; then
-+	if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/bash/bashrc ] ; then
- 		# Bash login shells run only /etc/profile
- 		# Bash non-login shells run only /etc/bash/bashrc
- 		# Since we want to run /etc/bash/bashrc regardless, we source it 
-@@ -46,7 +46,7 @@
- 		# this *after* the user's .bash_profile runs (without putting 
- 		# it in the user's dot-files), but it shouldn't make any 
- 		# difference.
--		. /etc/bash/bashrc
-+		. "@GENTOO_PORTAGE_EPREFIX@"/etc/bash/bashrc
- 	else
- 		PS1='\u@\h \w \$ '
- 	fi
-@@ -57,7 +57,7 @@
- 	PS1="`whoami`@`uname -n | cut -f1 -d.` \$ "
- fi
- 
--for sh in /etc/profile.d/*.sh ; do
-+for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
- 	if [ -r "$sh" ] ; then
- 		. "$sh"
- 	fi
---- baselayout-1.12.5/sbin/runscript.sh~	2006-09-14 12:11:34 +0200
-+++ baselayout-1.12.5/sbin/runscript.sh	2007-10-06 13:28:40 +0200
-@@ -1,18 +1,18 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Copyright 1999-2006 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
- # Common functions
--[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source /sbin/functions.sh
-+[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source @GENTOO_PORTAGE_EPREFIX@/sbin/functions.sh
- 
--# User must be root to run most script stuff (except status)
--if [[ ${EUID} != "0" ]] && ! [[ $2 == "status" && $# -eq 2 ]] ; then
--	eerror "$0: must be root to run init scripts"
--	exit 1
--fi
-+## User must be root to run most script stuff (except status)
-+#if [[ ${EUID} != "0" ]] && ! [[ $2 == "status" && $# -eq 2 ]] ; then
-+#    eerror "$0: must be root to run init scripts"
-+#    exit 1
-+#fi
- 
- myscript="$1"
--if [[ -L $1 && ! -L "/etc/init.d/${1##*/}" ]] ; then
-+if [[ -L $1 && ! -L "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${1##*/}" ]] ; then
- 	SVCNAME="$(readlink "$1")"
- else
- 	SVCNAME="$1"
-@@ -84,12 +84,12 @@
- #     configuration, if the system administrator chose to put it
- #     there (if it exists).
- if net_service "${SVCNAME}" ; then
--	conf="$(add_suffix /etc/conf.d/net)"
-+	conf="$(add_suffix @GENTOO_PORTAGE_EPREFIX@/etc/conf.d/net)"
- 	[[ -e ${conf} ]] && source "${conf}"
- fi
--conf="$(add_suffix "/etc/conf.d/${SVCNAME}")"
-+conf="$(add_suffix "@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}")"
- [[ -e ${conf} ]] && source "${conf}"
--conf="$(add_suffix /etc/rc.conf)"
-+conf="$(add_suffix @GENTOO_PORTAGE_EPREFIX@/etc/rc.conf)"
- [[ -e ${conf} ]] && source "${conf}"
- 
- mylevel="${SOFTLEVEL}"
-@@ -146,7 +146,7 @@
- 	local service="$1" start="$2"
- 	[[ ! -d "${svcdir}/scheduled/${service}" ]] \
- 		&& mkdir -p "${svcdir}/scheduled/${service}"
--	ln -snf "/etc/init.d/${service}" \
-+	ln -snf "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" \
- 		"${svcdir}/scheduled/${service}/${start}"
- }
- 
-@@ -334,9 +334,9 @@
- 	if [[ ${retval} == "0" && ${RC_NO_DEPS} != "yes" ]] ; then
- 		local startupservices="$(ineed "${SVCNAME}") $(valid_iuse "${SVCNAME}")"
- 		local netservices=
--		for x in $(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
--			$(dolisting "/etc/runlevels/${mylevel}/net.*") \
--			$(dolisting "/var/lib/init.d/coldplugged/net.*") ; do 
-+		for x in $(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}/net.*") \
-+			$(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${mylevel}/net.*") \
-+			$(dolisting "@GENTOO_PORTAGE_EPREFIX@/var/lib/init.d/coldplugged/net.*") ; do 
- 			netservices="${netservices} ${x##*/}"
- 		done
- 
-@@ -631,9 +631,9 @@
- 
- 		# Simple way to try and detect if the service use svc_{start,stop}
- 		# to restart if it have a custom restart() funtion.
--		if [[ -n $(egrep '^[[:space:]]*restart[[:space:]]*()' "/etc/init.d/${SVCNAME}") ]] ; then
--			if [[ -z $(egrep 'svc_stop' "/etc/init.d/${SVCNAME}") || \
--			      -z $(egrep 'svc_start' "/etc/init.d/${SVCNAME}") ]] ; then
-+		if [[ -n $(egrep '^[[:space:]]*restart[[:space:]]*()' "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${SVCNAME}") ]] ; then
-+			if [[ -z $(egrep 'svc_stop' "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${SVCNAME}") || \
-+			      -z $(egrep 'svc_start' "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${SVCNAME}") ]] ; then
- 				echo
- 				ewarn "Please use 'svc_stop; svc_start' and not 'stop; start' to"
- 				ewarn "restart the service in its custom 'restart()' function."
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch
deleted file mode 100644
index 20e4582..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/start-stop-daemon.c
-+++ src/start-stop-daemon.c
-@@ -44,7 +44,7 @@
- #  define OSLinux
- #elif defined(__GNU__)
- #  define OSHURD
--#elif defined(__sparc__)
-+#elif defined (__SVR4) && defined (__sun)
- #  define OSsunos
- #elif defined(OPENBSD) || defined(__OpenBSD__)
- #  define OSOpenBSD
-@@ -94,6 +94,9 @@
- #if defined(OSaix)
- #include <sys/procfs.h>
- #endif
-+#if defined(OSsunos)
-+#include <procfs.h>
-+#endif
- 
- #include <errno.h>
- #include <stdio.h>
-@@ -188,7 +191,7 @@
- static void do_pidfile(const char *name);
- static void do_stop(int signal_nr, int quietmode,
- 		    int *n_killed, int *n_notkilled, int retry_nr);
--#if defined(OSLinux) || defined(OShpux) || defined(OSaix)
-+#if defined(OSLinux) || defined(OShpux) || defined(OSaix) || defined(OSsunos)
- static int pid_is_exec(pid_t pid, const struct stat *esb);
- #endif
- 
-@@ -765,7 +768,7 @@
- static void
- check(pid_t pid)
- {
--#if defined(OSLinux) || defined(OShpux) || defined(OSaix)
-+#if defined(OSLinux) || defined(OShpux) || defined(OSaix) || defined(OSsunos)
- 	if (execname && !pid_is_exec(pid, &exec_stat))
- 		return;
- #elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -801,7 +804,7 @@
- /* WTA: this  needs to be an autoconf check for /proc/pid existance.
-  */
- 
--#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix)
-+#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix) || defined(OSsunos)
- static void
- do_procinit(void)
- {
-@@ -1069,7 +1072,7 @@
- }
- #endif /* OShpux */
- 
--#if defined(OSaix)
-+#if defined(OSaix) || defined(OSsunos)
- /* max possible pid (signed long) in theory:
-  * 32bit: 2147483647 (10 digits)
-  * 64bit: 9223372036854775807 (19 digits)
-@@ -1119,7 +1122,7 @@
- 	}
- 	return strcmp(name, psi.pr_fname) == 0;
- }
--#endif /* OSaix */
-+#endif /* OSaix || OSsunos */
- 
- 
- static void
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-strsep.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-strsep.patch
deleted file mode 100644
index 3e67a22..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-strsep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/core/misc.h
-+++ src/core/misc.h
-@@ -284,5 +284,9 @@
- void file_unmap(char *buf, size_t bufsize);
- size_t buf_get_line(char *buf, size_t buflen, size_t cur);
- 
-+#if defined (__SVR4) && defined (__sun)
-+char* strsep(char** str, const char* delims);
-+#endif
-+
- #endif /* _MISC_H */
- 
---- src/core/misc.c
-+++ src/core/misc.c
-@@ -647,3 +647,27 @@
- 	return count - cur;
- }
- 
-+#if defined (__SVR4) && defined (__sun)
-+char* strsep(char** str, const char* delims)
-+{
-+	char* token;
-+
-+	if (*str == NULL) {
-+		/* No more tokens */
-+		return NULL;
-+	}
-+
-+	token=*str;
-+	while (**str != '\0') {
-+		if (strchr(delims, **str) != NULL) {
-+			**str = '\0';
-+			(*str)++;
-+			return token;
-+		}
-+		(*str)++;
-+	}
-+	/* There is no other token */
-+	*str = NULL;
-+	return token;
-+}
-+#endif
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-termios_h.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-termios_h.patch
deleted file mode 100644
index 8c84bf6..0000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-termios_h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-<termios.h> is standard as per SUSv2 already:
-http://pubs.opengroup.org/onlinepubs/007908799/xsh/termios.h.html
-AIX does not provide <sys/termios.h> at all, Linux, Solaris, HP-UX,
-Darwin and Interix have both, redirecting one to the other.
-
---- src/start-stop-daemon.c.orig	2011-03-28 13:55:36 +0200
-+++ src/start-stop-daemon.c	2011-03-28 14:50:47 +0200
-@@ -37,6 +37,9 @@
- #define NONRETURNING \
- 	__attribute__((noreturn))
- 
-+#define HAVE_TERMIOS_H
-+#undef HAVE_SYS_TERMIOS_H
-+
- #if defined(linux) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
- #  define OSLinux
- #elif defined(__GNU__)
-@@ -97,7 +123,11 @@
- #include <grp.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
--#include <sys/termios.h>
-+#if defined(HAVE_TERMIOS_H)
-+# include <termios.h>
-+#elif defined(HAVE_SYS_TERMIOS_H)
-+# include <sys/termios.h>
-+#endif
- #include <fcntl.h>
- #include <limits.h>
- #include <assert.h>
diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
deleted file mode 100644
index ab2f5b1..0000000
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>prefix@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='prefix-chaining'>install in a chained Prefix environment</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
deleted file mode 100644
index 9fa4b6d..0000000
--- a/sys-apps/etckeeper/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for sys-apps/etckeeper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.6 2012/07/24 21:18:08 hwoarang Exp $
-
-  24 Jul 2012; Markos Chandras <hwoarang@gentoo.org> etckeeper-0.63.ebuild:
-  Stable on amd64 wrt bug #427656
-
-  23 Jul 2012; Jeff Horelick <jdhore@gentoo.org> etckeeper-0.63.ebuild:
-  marked x86 per bug 427656
-
-  16 Jun 2012; Julian Ospald <hasufell@gentoo.org> etckeeper-0.63.ebuild:
-  fix doc destination
-
-  16 Jun 2012; Julian Ospald <hasufell@gentoo.org> etckeeper-0.63.ebuild:
-  clean up the dependency mess
-
-  16 Jun 2012; Julian Ospald <hasufell@gentoo.org> etckeeper-0.63.ebuild:
-  add bazaar useflag to fix dependency issues
-
-*etckeeper-0.63 (16 Jun 2012)
-
-  16 Jun 2012; Julian Ospald <hasufell@gentoo.org> +etckeeper-0.63.ebuild,
-  +files/etckeeper-0.63-gentoo.patch, +files/bashrc, +metadata.xml:
-  initial import with Manuel Rüger wrt bug #216114
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
deleted file mode 100644
index 1509568..0000000
--- a/sys-apps/etckeeper/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 99etckeeper 60 RMD160 c4c6369eaa97f368467cec6e21ecce5e46c62797 SHA1 25365ed601354c0304734b8d5c4c514f17ccda95 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f
-AUX bashrc 116 RMD160 52a676f18da32eee69844cda73d506aef455becb SHA1 db19b0983d8787313f4c94770cb1630c61fe0436 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a
-AUX etckeeper-0.63-gentoo.patch 2140 RMD160 e620af5a1f2d88c02742d0fc65d95d962760454c SHA1 b85c63827d7ad71921dab7cd33d0d4a3bc7b5bd9 SHA256 45c79f5e6f8c7a242923acd40302c18dfeedc5a1a0e4b6c85c821b0fbf129bdb
-DIST etckeeper-0.63.tar.gz 45799 RMD160 8cd1ebc64e969a7afac1db84b2f116b5ad7a4963 SHA1 dac7196852653dadb34e500c4d6e764640758273 SHA256 c745b1a635bc3a4d184d6547c2551a72f067addc01a766fc741e85ba2f623763
-EBUILD etckeeper-0.63.ebuild 1777 RMD160 71f7b7a9280968ececaecb4a770f140752b51137 SHA1 e1652be11da564707d9436d1ac4b63e4b63385bb SHA256 bc0e8dc15ce664052edd63959b972b71cf4bdb11c9b808080b3b3719d1551785
-MISC ChangeLog 973 RMD160 a548d598f1a2cf6959d306144dd26a82452b2786 SHA1 90428acc458cf6414d1be68d24d18c71b957cc09 SHA256 ccb0efe1322a5b2ee89facfa028efe7da1f7c7feaa88fae49a2c7bb8a3a17b59
-MISC metadata.xml 539 RMD160 07bfffccca4d1acc35ddca3243d2652fe25d5d8d SHA1 32b7e826e0fe8df11fe1b2f2159c79f54abbd52e SHA256 5af6d3f5b2139f1f21c83e10f84bb6e6e7840163bc640053e7d3fe55632565c3
diff --git a/sys-apps/etckeeper/etckeeper-0.63.ebuild b/sys-apps/etckeeper/etckeeper-0.63.ebuild
deleted file mode 100644
index 6758ecf..0000000
--- a/sys-apps/etckeeper/etckeeper-0.63.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild,v 1.9 2012/07/24 21:18:08 hwoarang Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="bazaar? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
-
-inherit eutils bash-completion-r1 python prefix
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="http://kitenet.net/~joey/code/etckeeper/"
-SRC_URI="http://git.kitenet.net/?p=${PN}.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-IUSE="bazaar"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-VCS_DEPEND="
-	dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs
-	dev-vcs/bzr"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	|| ( ${VCS_DEPEND} )"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	use bazaar && emake
-}
-
-src_install(){
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		$(PYTHON) ./etckeeper-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_execute_function bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99etckeeper
-		eprefixify "${ED}"/etc/env.d/99etckeeper
-	fi
-
-	newbashcomp bash_completion ${PN}
-	docinto examples
-	dodoc "${FILESDIR}"/bashrc
-}
-
-pkg_postinst(){
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you additionally need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${P}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/files/99etckeeper b/sys-apps/etckeeper/files/99etckeeper
deleted file mode 100644
index 9848af2..0000000
--- a/sys-apps/etckeeper/files/99etckeeper
+++ /dev/null
@@ -1 +0,0 @@
-ETCKEEPER_CONF_DIR="@GENTOO_PORTAGE_EPREFIX@/etc/etckeeper"
diff --git a/sys-apps/etckeeper/files/bashrc b/sys-apps/etckeeper/files/bashrc
deleted file mode 100644
index ce53621..0000000
--- a/sys-apps/etckeeper/files/bashrc
+++ /dev/null
@@ -1,4 +0,0 @@
-case "${EBUILD_PHASE}" in
-	preinst|prerm) etckeeper pre-install ;;
-	postinst|postrm) etckeeper post-install ;;
-esac
diff --git a/sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch
deleted file mode 100644
index ae15137..0000000
--- a/sys-apps/etckeeper/files/etckeeper-0.63-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Original patch by Luke-Jr (luke-jr+gentoobugs@utopios.org)
-Minor fixes by Manuel Rueger (mrueg@rueg.eu)
-
-https://bugs.gentoo.org/show_bug.cgi?id=216114
-Gentoo specific additions
-
---- Makefile
-+++ Makefile
-@@ -23,7 +23,6 @@
- 	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
- 	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper
- 	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
--	$(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
- ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
- 	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
- 	mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex
-@@ -36,7 +35,6 @@
- 	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
- 	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
- endif
--	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
- 	echo "** installation successful"
- 
- clean: etckeeper.spec
---- etckeeper.conf
-+++ etckeeper.conf
-@@ -31,8 +31,10 @@
- 
- # The high-level package manager that's being used.
- # (apt, pacman-g2, yum etc)
--HIGHLEVEL_PACKAGE_MANAGER=apt
-+# For gentoo this is emerge
-+HIGHLEVEL_PACKAGE_MANAGER=emerge
- 
- # The low-level package manager that's being used.
- # (dpkg, rpm, pacman-g2, etc)
--LOWLEVEL_PACKAGE_MANAGER=dpkg
-+# For gentoo this is qlist
-+LOWLEVEL_PACKAGE_MANAGER=qlist
---- list-installed.d/50list-installed
-+++ list-installed.d/50list-installed
-@@ -7,4 +7,6 @@
- 		egrep '(ok installed|ok config-files)' | cut -f2,3
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
- 	rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
-+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
-+	qlist -ICv
- fi
---- update-ignore.d/01update-ignore
-+++ update-ignore.d/01update-ignore
-@@ -99,6 +99,10 @@
- 		ignore "*.pacorig"
- 		ignore "*.pacsave"
- 		nl
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then
-+		comment "new and old versions of conffiles, stored by emerge"
-+		ignore "*.cfg_*"
-+		nl
- 	fi
- 	
- 	comment "old versions of files"
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
deleted file mode 100644
index 7fe7bb5..0000000
--- a/sys-apps/etckeeper/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>hasufell@gentoo.org</email>
-		<name>Julian Ospald</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
-	<maintainer>
-		<email>gentoo@rueg.eu</email>
-		<name>Manuel Rüger</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
-	<use>
-		<flag name='bazaar'>Support <pkg>dev-vcs/bzr</pkg> based repository</flag>
-	</use>
-</pkgmetadata>
-
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index d0bba23..577834d 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -28,6 +28,6 @@ EBUILD openrc-0.9.9.1.ebuild 14113 SHA256 86e9db379c6c811631ffd923ee5dc2d99864a5
 EBUILD openrc-0.9.9.2.ebuild 14113 SHA256 6a9a71bf343c0aaac5c655c0571bbe482e32036bff495b34242ba7c40725bf61 SHA512 98b92def5df4fbe983933603996ae5a499695c55118c889d29949043c32c1780e220b6c4f2c454bcba02c6804a70029a84e89fd4398c4f39367aa92d33c19ca8 WHIRLPOOL b5d9dac23c6610c6ad9c57c99e0ab31186d0e5d61a9d6c5d06c22e471f46f6d825bf039bade081f49df4be75dd38295d12088b23c1d3d4370c47d4e7203ebb3c
 EBUILD openrc-0.9.9.3.ebuild 14659 SHA256 7850c27fea686525e6ada88922fb781bb0eb6a4b43fe5b138c5203043fffd79b SHA512 ca1ac31bf76c85705b88f2e292bbbb7341c850337b437011573a1eed747564961c6e4149d933d68b5486103d73aa492293afd1ecca3f61d85c8b4088208c4238 WHIRLPOOL a663b316d519dec16b6af62c61c947f084846589ff10f3d9fb33ede7785b3aa0c7e4ba2cd82a095dc79d3591989f12e67631312c637b6cc9b38f9b647e9e2f21
 EBUILD openrc-0.9.9.ebuild 14111 SHA256 cd930975d6c297ded8df70a5cfbc5d36d9b1141114d8ad1eb085721c7fa736f5 SHA512 47fa88774b758e41ed6519c6a50f6a08e4c88e5aa5d2d6b64d8f0dff013a6227c5d8bfaa9dc91693196108b004ca448ad6fa3153d586fbdd855a3e5eb896c00b WHIRLPOOL d863b4331054c16a597a66c46756de1280541909ebed29b4e733c8106621d004fd92d3a9f51e39d84407968b56bf3cf428bb6fb9d1fcdb01cbf4ac3f972fd938
-EBUILD openrc-9999.ebuild 15024 SHA256 1ac5fe877c79663c91c64627d96f3a79c22d6680b29eb551c5a1190c3ff5497a SHA512 c1308e1ee96cb4c3bb38e1eae1840aa35cf5da63147e3d9837c3f8eeb00b939298297577b526f0d13bdf89b17cb79f1e1bd855b62579ceb96733cf0934f96cd8 WHIRLPOOL c6f6eedbfcb78cdd75b10b9cc209b280f471b17ad88d4df4ad46a213d7f1c0115f4f9e8d67a65cd0dd7ecc6e54df7647e7e8df7b8498b11d71e2293807a6db4c
+EBUILD openrc-9999.ebuild 15023 SHA256 5952c1650a91c69f554d13408a9ba2f780a7ab5706d0d52e2e2c010e6223bfd1 SHA512 96404cbd40ad6e0c5a89415f2da87a2bf0fc77eddec629b27022f215c35b9d729751fa1a021c045bc66296474325e4e6ccce64c630479c541aef6ec9ac901cc4 WHIRLPOOL 494121909f9ac7f12f326fb69ba7ffe6e682244075ed6bc98aca9d0de6975e26a22037288dc83d5524a931566031112ceececb3abf6963816d556006fd799aa2
 MISC ChangeLog 37614 SHA256 d3f5fabdee737584ff1e4658900fc298f1d66fa9c753eaa7db102d96f2ce3eaa SHA512 37660935908fae1ee79ddaab108c0e27fd05b8379a47e453019818c81b31b9a08fa5f84ae8a1906e89a995f20d9b70794e0d10120bc75079bbdf39186e1efcba WHIRLPOOL 9108d35f51b2c04b1e592ff7f13686cee0d3209920a52cc4d9e3779182448ab2a9992f2119c55c04d31bcc635246d30e2175ed537b1b0c464f6aeed151a973b2
 MISC metadata.xml 159 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8 SHA512 3862e7014f5d98121283995fef167029b22d8f96a1a52609f9d3745e09ed2b1f4da128fcbbaeb8dfe644d0b38164fa52ff917f9c9e378190d094a5c368cdcc11 WHIRLPOOL 8061045c1d245ce95aa6912f7ef22d811a8ef71d95fc87c4b12a54016384d288b8a2251ce555e1bfb1a18db78089921a9399fdc8d37cab8f91f484bcb4137c93
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index c1df113..41c75c3 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 EGIT_REPO_URI="http://git.heroxbd.z.tuna.tsinghua.edu.cn/${PN}.git"
-EGIT_BRANCH=$(use runit && echo "prefix" || echo "prefix-runit")
+use runit && EGIT_BRANCH="prefix-runit" || EGIT_BRANCH="prefix"
 [[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
 inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
 unset SCM_ECLASS