commit:     aaeb4496c781b71c516577eaa7b17ca1409c903f
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 17:15:59 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 21:19:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaeb4496

clean out old keyword shadowed versions

Package-Manager: portage-2.2.20.1

 sys-apps/busybox/Manifest                 |   5 -
 sys-apps/busybox/busybox-1.20.2.ebuild    | 291 ----------------------------
 sys-apps/busybox/busybox-1.21.1.ebuild    | 299 -----------------------------
 sys-apps/busybox/busybox-1.22.0.ebuild    | 299 -----------------------------
 sys-apps/busybox/busybox-1.22.1-r1.ebuild | 300 -----------------------------
 sys-apps/busybox/busybox-1.22.1.ebuild    | 299 -----------------------------
 sys-apps/busybox/busybox-1.23.0-r1.ebuild | 302 ------------------------------
 7 files changed, 1795 deletions(-)

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 70008b2..c7e1fc3 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,8 +1,3 @@
-DIST busybox-1.20.2.tar.bz2 2186738 SHA256 
eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 
089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
 WHIRLPOOL 
aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
 DIST busybox-1.21.0.tar.bz2 2200841 SHA256 
eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 
ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31
 WHIRLPOOL 
d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3
-DIST busybox-1.21.1.tar.bz2 2201917 SHA256 
cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 
b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1
 WHIRLPOOL 
8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c
-DIST busybox-1.22.0.tar.bz2 2218120 SHA256 
92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53 SHA512 
75d00fbad703d942c5a6882bda0c66fde32fb480ee9693c8da8107c2088ec5c95aad8eb3dbb2feceed095e133916fea27136328b7a1eba47e3b63bf50bc40a66
 WHIRLPOOL 
055aba8e8d116f664f61458f32c31c08bfdb0db97934eb00af02098981e25665aff16e9a371234a6859e4954d1568603a99ca7d6925cd42a27e7dae30523514f
-DIST busybox-1.22.1.tar.bz2 2218650 SHA256 
ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b SHA512 
3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80
 WHIRLPOOL 
8f022480960b81d673772bdda857b5b3860edd893a833a64f5184ec6816b6b0f328079ca67ec1ba1d288a7c4b805b39c6038f0d385884762a396a86ccea7b0c8
-DIST busybox-1.23.0.tar.bz2 2253001 SHA256 
483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4 SHA512 
02c8f9dd9e47ad67b417fa58ba952bbdda6e79bad5399fba3d8217803053c2fd045228bd76d56e97d40c98296841dc66e4fa829887c05378a83bdeabafeb7f72
 WHIRLPOOL 
01d68487d4d3cff4fb807970446f42db1dec3309fdd3fb0402f138eee28dc0885dba324b5b12b417effd4fad87581a32da09a0e9f7c050377025a52ecce2308b
 DIST busybox-1.23.1.tar.bz2 2252635 SHA256 
300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf SHA512 
60849c220dde596c4197f16dd844573b24dd46c8544345a2d5a2b1976fa0ac340d22fbc97f5a1437b7de1c04f4e16aa07b3d62bc77eb83b2467582a50ed4b362
 WHIRLPOOL 
7cd25e42e74663849b094df699a72deaf02b1088064a511341f76aaa419c936557bbafd54523c6818082dfd4e17605f06ee51abed238ef57a56a9be12c910f99
 DIST busybox-1.23.2.tar.bz2 2252786 SHA256 
05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a SHA512 
209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9
 WHIRLPOOL 
a0396f7f49ae702f1617e72d5d4646aceec4eba67219c7125bd8d0926d1acb1ef41ea15a7406c3cf5e5e0d8925cc75910ed5128e5fbdd257b80e2cb4f7a048a2

diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild 
b/sys-apps/busybox/busybox-1.20.2.ebuild
deleted file mode 100644
index 465f436..0000000
--- a/sys-apps/busybox/busybox-1.20.2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-################################################################################
-# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
-#
-# Busybox can be modified in many different ways. Here's a few ways to do it:
-#
-# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
-#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
-#     start of the line if you're installing to somewhere else than the root
-#     directory. This command will save the default configuration to
-#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
-#     defined), and it will tell you that it has done this. Note the location
-#     where the config file was saved.
-#
-#     FEATURES=keepwork USE=savedconfig emerge busybox
-#
-# (2) Go to the work directory and change the configuration of busybox using 
its
-#     menuconfig feature.
-#
-#     cd /var/tmp/portage/busybox*/work/busybox-*
-#     make menuconfig
-#
-# (3) Save your configuration to the default location and copy it to the
-#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
-#
-# (4) Emerge busybox with USE=savedconfig to use the configuration file you
-#     just generated.
-#
-################################################################################
-#
-# (1) Alternatively skip the above steps and simply emerge busybox without
-#     USE=savedconfig.
-#
-# (2) Edit the file it saves by hand. 
${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
-#
-# (3) Remerge busybox as using USE=savedconfig.
-#
-################################################################################
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/";
-if [[ ${PV} == "9999" ]] ; then
-       MY_P=${PN}
-       EGIT_REPO_URI="git://busybox.net/busybox.git"
-       inherit git-2
-else
-       MY_P=${PN}-${PV/_/-}
-       SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2";
-       KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-       pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-       static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-       >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-       case $1 in
-               y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
-               n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-               *) use $1 \
-                      && busybox_config_option y $2 \
-                      || busybox_config_option n $2
-                  return 0
-                  ;;
-       esac
-       einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 
...)
-}
-
-src_prepare() {
-       unset KBUILD_OUTPUT #88088
-       append-flags -fno-strict-aliasing #310413
-       use ppc64 && append-flags -mminimal-toc #130943
-
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-       epatch "${FILESDIR}"/${PN}-1.20.0-udhcpc6-ipv6.patch
-       epatch "${FILESDIR}"/${P}-*.patch
-       cp "${FILESDIR}"/ginit.c init/ || die
-
-       # flag cleanup
-       sed -i -r \
-               -e 
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
-               Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-       sed -i \
-               -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-               -e "/^AR\>/s:=.*:= $(tc-getAR):" \
-               -e "/^CC\>/s:=.*:= $(tc-getCC):" \
-               -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-               -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-               Makefile || die
-       sed -i \
-               -e 's:-static-libgcc::' \
-               Makefile.flags || die
-}
-
-src_configure() {
-       # check for a busybox config before making one of our own.
-       # if one exist lets return and use it.
-
-       restore_config .config
-       if [ -f .config ]; then
-               yes "" | emake -j1 oldconfig > /dev/null
-               return 0
-       else
-               ewarn "Could not locate user configfile, so we will save a 
default one"
-       fi
-
-       # setup the config file
-       emake -j1 allyesconfig > /dev/null
-       # nommu forces a bunch of things off which we want on #387555
-       busybox_config_option n NOMMU
-       sed -i '/^#/d' .config
-       yes "" | emake -j1 oldconfig >/dev/null
-
-       # now turn off stuff we really don't want
-       busybox_config_option n DMALLOC
-       busybox_config_option n FEATURE_SUID_CONFIG
-       busybox_config_option n BUILD_AT_ONCE
-       busybox_config_option n BUILD_LIBBUSYBOX
-       busybox_config_option n FEATURE_CLEAN_UP
-       busybox_config_option n MONOTONIC_SYSCALL
-       busybox_config_option n USE_PORTABLE_CODE
-       busybox_config_option n WERROR
-
-       # If these are not set and we are using a uclibc/busybox setup
-       # all calls to system() will fail.
-       busybox_config_option y ASH
-       busybox_config_option n HUSH
-
-       # disable ipv6 applets
-       if ! use ipv6; then
-               busybox_config_option n FEATURE_IPV6
-               busybox_config_option n TRACEROUTE6
-               busybox_config_option n PING6
-       fi
-
-       if use static && use pam ; then
-               ewarn "You cannot have USE='static pam'.  Assuming static is 
more important."
-       fi
-       busybox_config_option $(usex static n pam) PAM
-       busybox_config_option static STATIC
-       busybox_config_option systemd FEATURE_SYSTEMD
-       busybox_config_option math FEATURE_AWK_LIBM
-
-       # all the debug options are compiler related, so punt them
-       busybox_config_option n DEBUG
-       busybox_config_option y NO_DEBUG_LIB
-       busybox_config_option n DMALLOC
-       busybox_config_option n EFENCE
-
-       busybox_config_option selinux SELINUX
-
-       # this opt only controls mounting with <linux-2.6.23
-       busybox_config_option n FEATURE_MOUNT_NFS
-
-       # default a bunch of uncommon options to off
-       local opt
-       for opt in \
-               ADD_SHELL \
-               BEEP BOOTCHARTD \
-               CRONTAB \
-               DC DEVFSD DNSD DPKG{,_DEB} \
-               FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-               FEATURE_DEVFS \
-               HOSTID HUSH \
-               INETD INOTIFYD IPCALC \
-               LOCALE_SUPPORT LOGNAME LPD \
-               MAKEMIME MKFS_MINIX MSH \
-               OD \
-               RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS 
RUNSV{,DIR} \
-               SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-               TASKSET TCPSVD \
-               RPM RPM2CPIO \
-               UDPSVD UUDECODE UUENCODE
-       do
-               busybox_config_option n ${opt}
-       done
-
-       emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
-       emake V=1 busybox
-}
-
-src_install() {
-       unset KBUILD_OUTPUT #88088
-       save_config .config
-
-       into /
-       dodir /bin
-       if use sep-usr ; then
-               # install /ginit to take care of mounting stuff
-               exeinto /
-               newexe busybox_unstripped ginit
-               dosym /ginit /bin/bb
-               dosym bb /bin/busybox
-       else
-               newbin busybox_unstripped busybox
-               dosym busybox /bin/bb
-       fi
-       if use mdev ; then
-               dodir /$(get_libdir)/mdev/
-               use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-               exeinto /$(get_libdir)/mdev/
-               doexe "${FILESDIR}"/mdev/*
-
-               newinitd "${FILESDIR}"/mdev.rc.1 mdev
-       fi
-       if use livecd ; then
-               dosym busybox /bin/vi
-       fi
-
-       # bundle up the symlink files for use later
-       emake DESTDIR="${ED}" install
-       rm _install/bin/busybox
-       tar cf busybox-links.tar -C _install . || : #;die
-       insinto /usr/share/${PN}
-       use make-symlinks && doins busybox-links.tar
-
-       dodoc AUTHORS README TODO
-
-       cd docs
-       docinto txt
-       dodoc *.txt
-       docinto pod
-       dodoc *.pod
-       dohtml *.html
-
-       cd ../examples
-       docinto examples
-       dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-       if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && 
[[ ${ROOT} == "/" ]] ; then
-               ewarn "setting USE=make-symlinks and emerging to / is very 
dangerous."
-               ewarn "it WILL overwrite lots of system programs like: ls bash 
awk grep (bug 60805 for full list)."
-               ewarn "If you are creating a binary only and not merging this 
is probably ok."
-               ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really 
what you want."
-               die "silly options will destroy your system"
-       fi
-
-       if use make-symlinks ; then
-               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-       fi
-}
-
-pkg_postinst() {
-       savedconfig_pkg_postinst
-
-       if use make-symlinks ; then
-               cd "${T}" || die
-               mkdir _install
-               tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
-       fi
-
-       if use sep-usr ; then
-               elog "In order to use the sep-usr support, you have to update 
your"
-               elog "kernel command line.  Add the option:"
-               elog "     init=/ginit"
-               elog "To launch a different init than /sbin/init, use:"
-               elog "     init=/ginit /sbin/yourinit"
-               elog "To get a rescue shell, you may boot with:"
-               elog "     init=/ginit bb"
-       fi
-}

diff --git a/sys-apps/busybox/busybox-1.21.1.ebuild 
b/sys-apps/busybox/busybox-1.21.1.ebuild
deleted file mode 100644
index 7db94ec..0000000
--- a/sys-apps/busybox/busybox-1.21.1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/";
-if [[ ${PV} == "9999" ]] ; then
-       MY_P=${PN}
-       EGIT_REPO_URI="git://busybox.net/busybox.git"
-       inherit git-2
-else
-       MY_P=${PN}-${PV/_/-}
-       SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog 
systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-       pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-       static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-       >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-       local flag=$1 ; shift
-       if [[ ${flag} != [yn] ]] ; then
-               busybox_config_option $(usex ${flag} y n) "$@"
-               return
-       fi
-       while [[ $# -gt 0 ]] ; do
-               if [[ ${flag} == "y" ]] ; then
-                       sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-               else
-                       sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" 
.config
-               fi
-               einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find 
CONFIG_$1 ...)
-               shift
-       done
-}
-
-busybox_config_enabled() {
-       local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-       case ${val} in
-       "") return 1 ;;
-       y)  return 0 ;;
-       *)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-       esac
-}
-
-src_prepare() {
-       unset KBUILD_OUTPUT #88088
-       append-flags -fno-strict-aliasing #310413
-       use ppc64 && append-flags -mminimal-toc #130943
-
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-       epatch "${FILESDIR}"/${P}-*.patch
-       cp "${FILESDIR}"/ginit.c init/ || die
-
-       # flag cleanup
-       sed -i -r \
-               -e 
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
-               Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-       sed -i \
-               -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-               -e "/^AR\>/s:=.*:= $(tc-getAR):" \
-               -e "/^CC\>/s:=.*:= $(tc-getCC):" \
-               -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-               -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-               Makefile || die
-       sed -i \
-               -e 's:-static-libgcc::' \
-               Makefile.flags || die
-}
-
-src_configure() {
-       # check for a busybox config before making one of our own.
-       # if one exist lets return and use it.
-
-       restore_config .config
-       if [ -f .config ]; then
-               yes "" | emake -j1 oldconfig > /dev/null
-               return 0
-       else
-               ewarn "Could not locate user configfile, so we will save a 
default one"
-       fi
-
-       # setup the config file
-       emake -j1 allyesconfig > /dev/null
-       # nommu forces a bunch of things off which we want on #387555
-       busybox_config_option n NOMMU
-       sed -i '/^#/d' .config
-       yes "" | emake -j1 oldconfig >/dev/null
-
-       # now turn off stuff we really don't want
-       busybox_config_option n DMALLOC
-       busybox_config_option n FEATURE_SUID_CONFIG
-       busybox_config_option n BUILD_AT_ONCE
-       busybox_config_option n BUILD_LIBBUSYBOX
-       busybox_config_option n FEATURE_CLEAN_UP
-       busybox_config_option n MONOTONIC_SYSCALL
-       busybox_config_option n USE_PORTABLE_CODE
-       busybox_config_option n WERROR
-
-       # If these are not set and we are using a uclibc/busybox setup
-       # all calls to system() will fail.
-       busybox_config_option y ASH
-       busybox_config_option n HUSH
-
-       # disable ipv6 applets
-       if ! use ipv6; then
-               busybox_config_option n FEATURE_IPV6
-               busybox_config_option n TRACEROUTE6
-               busybox_config_option n PING6
-       fi
-
-       if use static && use pam ; then
-               ewarn "You cannot have USE='static pam'.  Assuming static is 
more important."
-       fi
-       busybox_config_option $(usex static n pam) PAM
-       busybox_config_option static STATIC
-       busybox_config_option syslog {K,SYS}LOGD LOGGER
-       busybox_config_option systemd FEATURE_SYSTEMD
-       busybox_config_option math FEATURE_AWK_LIBM
-
-       # all the debug options are compiler related, so punt them
-       busybox_config_option n DEBUG
-       busybox_config_option y NO_DEBUG_LIB
-       busybox_config_option n DMALLOC
-       busybox_config_option n EFENCE
-
-       busybox_config_option selinux SELINUX
-
-       # this opt only controls mounting with <linux-2.6.23
-       busybox_config_option n FEATURE_MOUNT_NFS
-
-       # default a bunch of uncommon options to off
-       local opt
-       for opt in \
-               ADD_SHELL \
-               BEEP BOOTCHARTD \
-               CRONTAB \
-               DC DEVFSD DNSD DPKG{,_DEB} \
-               FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-               FEATURE_DEVFS \
-               HOSTID HUSH \
-               INETD INOTIFYD IPCALC \
-               LOCALE_SUPPORT LOGNAME LPD \
-               MAKEMIME MKFS_MINIX MSH \
-               OD \
-               RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS 
RUNSV{,DIR} \
-               SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-               TASKSET TCPSVD \
-               RPM RPM2CPIO \
-               UDPSVD UUDECODE UUENCODE
-       do
-               busybox_config_option n ${opt}
-       done
-
-       emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
-       emake V=1 busybox
-}
-
-src_install() {
-       unset KBUILD_OUTPUT #88088
-       save_config .config
-
-       into /
-       dodir /bin
-       if use sep-usr ; then
-               # install /ginit to take care of mounting stuff
-               exeinto /
-               newexe busybox_unstripped ginit
-               dosym /ginit /bin/bb
-               dosym bb /bin/busybox
-       else
-               newbin busybox_unstripped busybox
-               dosym busybox /bin/bb
-       fi
-       if use mdev ; then
-               dodir /$(get_libdir)/mdev/
-               use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-               exeinto /$(get_libdir)/mdev/
-               doexe "${FILESDIR}"/mdev/*
-
-               newinitd "${FILESDIR}"/mdev.rc.1 mdev
-       fi
-       if use livecd ; then
-               dosym busybox /bin/vi
-       fi
-
-       # add busybox daemon's, bug #444718
-       if busybox_config_enabled FEATURE_NTPD_SERVER; then
-               newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-               newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-       fi
-       if busybox_config_enabled SYSLOGD; then
-               newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-               newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-       fi
-       if busybox_config_enabled KLOGD; then
-               newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-               newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-       fi
-       if busybox_config_enabled WATCHDOG; then
-               newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-               newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-       fi
-       if busybox_config_enabled UDHCPC; then
-               local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-               exeinto "${path%/*}"
-               newexe examples/udhcp/simple.script "${path##*/}"
-       fi
-       if busybox_config_enabled UDHCPD; then
-               insinto /etc
-               doins examples/udhcp/udhcpd.conf
-       fi
-
-       # bundle up the symlink files for use later
-       emake DESTDIR="${ED}" install
-       rm _install/bin/busybox
-       # for compatibility, provide /usr/bin/env
-       mkdir -p _install/usr/bin
-       ln -s /bin/env _install/usr/bin/env
-       tar cf busybox-links.tar -C _install . || : #;die
-       insinto /usr/share/${PN}
-       use make-symlinks && doins busybox-links.tar
-
-       dodoc AUTHORS README TODO
-
-       cd docs
-       docinto txt
-       dodoc *.txt
-       docinto pod
-       dodoc *.pod
-       dohtml *.html
-
-       cd ../examples
-       docinto examples
-       dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-       if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && 
[[ ${ROOT} == "/" ]] ; then
-               ewarn "setting USE=make-symlinks and emerging to / is very 
dangerous."
-               ewarn "it WILL overwrite lots of system programs like: ls bash 
awk grep (bug 60805 for full list)."
-               ewarn "If you are creating a binary only and not merging this 
is probably ok."
-               ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really 
what you want."
-               die "silly options will destroy your system"
-       fi
-
-       if use make-symlinks ; then
-               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-       fi
-}
-
-pkg_postinst() {
-       savedconfig_pkg_postinst
-
-       if use make-symlinks ; then
-               cd "${T}" || die
-               mkdir _install
-               tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
-       fi
-
-       if use sep-usr ; then
-               elog "In order to use the sep-usr support, you have to update 
your"
-               elog "kernel command line.  Add the option:"
-               elog "     init=/ginit"
-               elog "To launch a different init than /sbin/init, use:"
-               elog "     init=/ginit /sbin/yourinit"
-               elog "To get a rescue shell, you may boot with:"
-               elog "     init=/ginit bb"
-       fi
-}

diff --git a/sys-apps/busybox/busybox-1.22.0.ebuild 
b/sys-apps/busybox/busybox-1.22.0.ebuild
deleted file mode 100644
index 82f62c9..0000000
--- a/sys-apps/busybox/busybox-1.22.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/";
-if [[ ${PV} == "9999" ]] ; then
-       MY_P=${PN}
-       EGIT_REPO_URI="git://busybox.net/busybox.git"
-       inherit git-2
-else
-       MY_P=${PN}-${PV/_/-}
-       SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog 
systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-       pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-       static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-       >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-       local flag=$1 ; shift
-       if [[ ${flag} != [yn] ]] ; then
-               busybox_config_option $(usex ${flag} y n) "$@"
-               return
-       fi
-       while [[ $# -gt 0 ]] ; do
-               if [[ ${flag} == "y" ]] ; then
-                       sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-               else
-                       sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" 
.config
-               fi
-               einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find 
CONFIG_$1 ...)
-               shift
-       done
-}
-
-busybox_config_enabled() {
-       local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-       case ${val} in
-       "") return 1 ;;
-       y)  return 0 ;;
-       *)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-       esac
-}
-
-src_prepare() {
-       unset KBUILD_OUTPUT #88088
-       append-flags -fno-strict-aliasing #310413
-       use ppc64 && append-flags -mminimal-toc #130943
-
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-       epatch "${FILESDIR}"/${P}-*.patch
-       cp "${FILESDIR}"/ginit.c init/ || die
-
-       # flag cleanup
-       sed -i -r \
-               -e 
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
-               Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-       sed -i \
-               -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-               -e "/^AR\>/s:=.*:= $(tc-getAR):" \
-               -e "/^CC\>/s:=.*:= $(tc-getCC):" \
-               -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-               -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-               Makefile || die
-       sed -i \
-               -e 's:-static-libgcc::' \
-               Makefile.flags || die
-}
-
-src_configure() {
-       # check for a busybox config before making one of our own.
-       # if one exist lets return and use it.
-
-       restore_config .config
-       if [ -f .config ]; then
-               yes "" | emake -j1 oldconfig > /dev/null
-               return 0
-       else
-               ewarn "Could not locate user configfile, so we will save a 
default one"
-       fi
-
-       # setup the config file
-       emake -j1 allyesconfig > /dev/null
-       # nommu forces a bunch of things off which we want on #387555
-       busybox_config_option n NOMMU
-       sed -i '/^#/d' .config
-       yes "" | emake -j1 oldconfig >/dev/null
-
-       # now turn off stuff we really don't want
-       busybox_config_option n DMALLOC
-       busybox_config_option n FEATURE_SUID_CONFIG
-       busybox_config_option n BUILD_AT_ONCE
-       busybox_config_option n BUILD_LIBBUSYBOX
-       busybox_config_option n FEATURE_CLEAN_UP
-       busybox_config_option n MONOTONIC_SYSCALL
-       busybox_config_option n USE_PORTABLE_CODE
-       busybox_config_option n WERROR
-
-       # If these are not set and we are using a uclibc/busybox setup
-       # all calls to system() will fail.
-       busybox_config_option y ASH
-       busybox_config_option n HUSH
-
-       # disable ipv6 applets
-       if ! use ipv6; then
-               busybox_config_option n FEATURE_IPV6
-               busybox_config_option n TRACEROUTE6
-               busybox_config_option n PING6
-       fi
-
-       if use static && use pam ; then
-               ewarn "You cannot have USE='static pam'.  Assuming static is 
more important."
-       fi
-       busybox_config_option $(usex static n pam) PAM
-       busybox_config_option static STATIC
-       busybox_config_option syslog {K,SYS}LOGD LOGGER
-       busybox_config_option systemd FEATURE_SYSTEMD
-       busybox_config_option math FEATURE_AWK_LIBM
-
-       # all the debug options are compiler related, so punt them
-       busybox_config_option n DEBUG
-       busybox_config_option y NO_DEBUG_LIB
-       busybox_config_option n DMALLOC
-       busybox_config_option n EFENCE
-
-       busybox_config_option selinux SELINUX
-
-       # this opt only controls mounting with <linux-2.6.23
-       busybox_config_option n FEATURE_MOUNT_NFS
-
-       # default a bunch of uncommon options to off
-       local opt
-       for opt in \
-               ADD_SHELL \
-               BEEP BOOTCHARTD \
-               CRONTAB \
-               DC DEVFSD DNSD DPKG{,_DEB} \
-               FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-               FEATURE_DEVFS \
-               HOSTID HUSH \
-               INETD INOTIFYD IPCALC \
-               LOCALE_SUPPORT LOGNAME LPD \
-               MAKEMIME MKFS_MINIX MSH \
-               OD \
-               RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS 
RUNSV{,DIR} \
-               SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-               TASKSET TCPSVD \
-               RPM RPM2CPIO \
-               UDPSVD UUDECODE UUENCODE
-       do
-               busybox_config_option n ${opt}
-       done
-
-       emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
-       emake V=1 busybox
-}
-
-src_install() {
-       unset KBUILD_OUTPUT #88088
-       save_config .config
-
-       into /
-       dodir /bin
-       if use sep-usr ; then
-               # install /ginit to take care of mounting stuff
-               exeinto /
-               newexe busybox_unstripped ginit
-               dosym /ginit /bin/bb
-               dosym bb /bin/busybox
-       else
-               newbin busybox_unstripped busybox
-               dosym busybox /bin/bb
-       fi
-       if use mdev ; then
-               dodir /$(get_libdir)/mdev/
-               use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-               exeinto /$(get_libdir)/mdev/
-               doexe "${FILESDIR}"/mdev/*
-
-               newinitd "${FILESDIR}"/mdev.rc.1 mdev
-       fi
-       if use livecd ; then
-               dosym busybox /bin/vi
-       fi
-
-       # add busybox daemon's, bug #444718
-       if busybox_config_enabled FEATURE_NTPD_SERVER; then
-               newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-               newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-       fi
-       if busybox_config_enabled SYSLOGD; then
-               newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-               newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-       fi
-       if busybox_config_enabled KLOGD; then
-               newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-               newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-       fi
-       if busybox_config_enabled WATCHDOG; then
-               newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-               newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-       fi
-       if busybox_config_enabled UDHCPC; then
-               local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-               exeinto "${path%/*}"
-               newexe examples/udhcp/simple.script "${path##*/}"
-       fi
-       if busybox_config_enabled UDHCPD; then
-               insinto /etc
-               doins examples/udhcp/udhcpd.conf
-       fi
-
-       # bundle up the symlink files for use later
-       emake DESTDIR="${ED}" install
-       rm _install/bin/busybox
-       # for compatibility, provide /usr/bin/env
-       mkdir -p _install/usr/bin
-       ln -s /bin/env _install/usr/bin/env
-       tar cf busybox-links.tar -C _install . || : #;die
-       insinto /usr/share/${PN}
-       use make-symlinks && doins busybox-links.tar
-
-       dodoc AUTHORS README TODO
-
-       cd docs
-       docinto txt
-       dodoc *.txt
-       docinto pod
-       dodoc *.pod
-       dohtml *.html
-
-       cd ../examples
-       docinto examples
-       dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-       if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && 
[[ ${ROOT} == "/" ]] ; then
-               ewarn "setting USE=make-symlinks and emerging to / is very 
dangerous."
-               ewarn "it WILL overwrite lots of system programs like: ls bash 
awk grep (bug 60805 for full list)."
-               ewarn "If you are creating a binary only and not merging this 
is probably ok."
-               ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really 
what you want."
-               die "silly options will destroy your system"
-       fi
-
-       if use make-symlinks ; then
-               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-       fi
-}
-
-pkg_postinst() {
-       savedconfig_pkg_postinst
-
-       if use make-symlinks ; then
-               cd "${T}" || die
-               mkdir _install
-               tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
-       fi
-
-       if use sep-usr ; then
-               elog "In order to use the sep-usr support, you have to update 
your"
-               elog "kernel command line.  Add the option:"
-               elog "     init=/ginit"
-               elog "To launch a different init than /sbin/init, use:"
-               elog "     init=/ginit /sbin/yourinit"
-               elog "To get a rescue shell, you may boot with:"
-               elog "     init=/ginit bb"
-       fi
-}

diff --git a/sys-apps/busybox/busybox-1.22.1-r1.ebuild 
b/sys-apps/busybox/busybox-1.22.1-r1.ebuild
deleted file mode 100644
index d6d5bfa..0000000
--- a/sys-apps/busybox/busybox-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/";
-if [[ ${PV} == "9999" ]] ; then
-       MY_P=${PN}
-       EGIT_REPO_URI="git://busybox.net/busybox.git"
-       inherit git-2
-else
-       MY_P=${PN}-${PV/_/-}
-       SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static 
syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-       pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-       static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-       >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-       local flag=$1 ; shift
-       if [[ ${flag} != [yn] ]] ; then
-               busybox_config_option $(usex ${flag} y n) "$@"
-               return
-       fi
-       while [[ $# -gt 0 ]] ; do
-               if [[ ${flag} == "y" ]] ; then
-                       sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-               else
-                       sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" 
.config
-               fi
-               einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find 
CONFIG_$1 ...)
-               shift
-       done
-}
-
-busybox_config_enabled() {
-       local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-       case ${val} in
-       "") return 1 ;;
-       y)  return 0 ;;
-       *)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-       esac
-}
-
-src_prepare() {
-       unset KBUILD_OUTPUT #88088
-       append-flags -fno-strict-aliasing #310413
-       use ppc64 && append-flags -mminimal-toc #130943
-
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-       epatch "${FILESDIR}"/${P}-*.patch
-       cp "${FILESDIR}"/ginit.c init/ || die
-
-       # flag cleanup
-       sed -i -r \
-               -e 
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
-               Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-       sed -i \
-               -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-               -e "/^AR\>/s:=.*:= $(tc-getAR):" \
-               -e "/^CC\>/s:=.*:= $(tc-getCC):" \
-               -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-               -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-               Makefile || die
-       sed -i \
-               -e 's:-static-libgcc::' \
-               Makefile.flags || die
-}
-
-src_configure() {
-       # check for a busybox config before making one of our own.
-       # if one exist lets return and use it.
-
-       restore_config .config
-       if [ -f .config ]; then
-               yes "" | emake -j1 -s oldconfig >/dev/null
-               return 0
-       else
-               ewarn "Could not locate user configfile, so we will save a 
default one"
-       fi
-
-       # setup the config file
-       emake -j1 -s defconfig >/dev/null
-       # nommu forces a bunch of things off which we want on #387555
-       busybox_config_option n NOMMU
-       sed -i '/^#/d' .config
-       yes "" | emake -j1 -s oldconfig >/dev/null
-
-       # now turn off stuff we really don't want
-       busybox_config_option n DMALLOC
-       busybox_config_option n FEATURE_SUID_CONFIG
-       busybox_config_option n BUILD_AT_ONCE
-       busybox_config_option n BUILD_LIBBUSYBOX
-       busybox_config_option n FEATURE_CLEAN_UP
-       busybox_config_option n MONOTONIC_SYSCALL
-       busybox_config_option n USE_PORTABLE_CODE
-       busybox_config_option n WERROR
-
-       # If these are not set and we are using a uclibc/busybox setup
-       # all calls to system() will fail.
-       busybox_config_option y ASH
-       busybox_config_option n HUSH
-
-       # disable ipv6 applets
-       if ! use ipv6; then
-               busybox_config_option n FEATURE_IPV6
-               busybox_config_option n TRACEROUTE6
-               busybox_config_option n PING6
-               busybox_config_option n UDHCPC6
-       fi
-
-       if use static && use pam ; then
-               ewarn "You cannot have USE='static pam'.  Assuming static is 
more important."
-       fi
-       busybox_config_option $(usex static n pam) PAM
-       busybox_config_option static STATIC
-       busybox_config_option syslog {K,SYS}LOGD LOGGER
-       busybox_config_option systemd FEATURE_SYSTEMD
-       busybox_config_option math FEATURE_AWK_LIBM
-
-       # all the debug options are compiler related, so punt them
-       busybox_config_option n DEBUG
-       busybox_config_option y NO_DEBUG_LIB
-       busybox_config_option n DMALLOC
-       busybox_config_option n EFENCE
-       busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-       busybox_config_option selinux SELINUX
-
-       # this opt only controls mounting with <linux-2.6.23
-       busybox_config_option n FEATURE_MOUNT_NFS
-
-       # default a bunch of uncommon options to off
-       local opt
-       for opt in \
-               ADD_SHELL \
-               BEEP BOOTCHARTD \
-               CRONTAB \
-               DC DEVFSD DNSD DPKG{,_DEB} \
-               FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-               FEATURE_DEVFS \
-               HOSTID HUSH \
-               INETD INOTIFYD IPCALC \
-               LOCALE_SUPPORT LOGNAME LPD \
-               MAKEMIME MKFS_MINIX MSH \
-               OD \
-               RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS 
RUNSV{,DIR} \
-               SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-               TASKSET TCPSVD \
-               RPM RPM2CPIO \
-               UDPSVD UUDECODE UUENCODE
-       do
-               busybox_config_option n ${opt}
-       done
-
-       emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
-       emake V=1 busybox
-}
-
-src_install() {
-       unset KBUILD_OUTPUT #88088
-       save_config .config
-
-       into /
-       dodir /bin
-       if use sep-usr ; then
-               # install /ginit to take care of mounting stuff
-               exeinto /
-               newexe busybox_unstripped ginit
-               dosym /ginit /bin/bb
-               dosym bb /bin/busybox
-       else
-               newbin busybox_unstripped busybox
-               dosym busybox /bin/bb
-       fi
-       if use mdev ; then
-               dodir /$(get_libdir)/mdev/
-               use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-               exeinto /$(get_libdir)/mdev/
-               doexe "${FILESDIR}"/mdev/*
-
-               newinitd "${FILESDIR}"/mdev.rc.1 mdev
-       fi
-       if use livecd ; then
-               dosym busybox /bin/vi
-       fi
-
-       # add busybox daemon's, bug #444718
-       if busybox_config_enabled FEATURE_NTPD_SERVER; then
-               newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-               newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-       fi
-       if busybox_config_enabled SYSLOGD; then
-               newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-               newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-       fi
-       if busybox_config_enabled KLOGD; then
-               newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-               newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-       fi
-       if busybox_config_enabled WATCHDOG; then
-               newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-               newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-       fi
-       if busybox_config_enabled UDHCPC; then
-               local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-               exeinto "${path%/*}"
-               newexe examples/udhcp/simple.script "${path##*/}"
-       fi
-       if busybox_config_enabled UDHCPD; then
-               insinto /etc
-               doins examples/udhcp/udhcpd.conf
-       fi
-
-       # bundle up the symlink files for use later
-       emake DESTDIR="${ED}" install
-       rm _install/bin/busybox
-       # for compatibility, provide /usr/bin/env
-       mkdir -p _install/usr/bin
-       ln -s /bin/env _install/usr/bin/env
-       tar cf busybox-links.tar -C _install . || : #;die
-       insinto /usr/share/${PN}
-       use make-symlinks && doins busybox-links.tar
-
-       dodoc AUTHORS README TODO
-
-       cd docs
-       docinto txt
-       dodoc *.txt
-       docinto pod
-       dodoc *.pod
-       dohtml *.html
-
-       cd ../examples
-       docinto examples
-       dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-       if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && 
[[ ${ROOT} == "/" ]] ; then
-               ewarn "setting USE=make-symlinks and emerging to / is very 
dangerous."
-               ewarn "it WILL overwrite lots of system programs like: ls bash 
awk grep (bug 60805 for full list)."
-               ewarn "If you are creating a binary only and not merging this 
is probably ok."
-               ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really 
what you want."
-               die "silly options will destroy your system"
-       fi
-
-       if use make-symlinks ; then
-               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-       fi
-}
-
-pkg_postinst() {
-       savedconfig_pkg_postinst
-
-       if use make-symlinks ; then
-               cd "${T}" || die
-               mkdir _install
-               tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
-       fi
-
-       if use sep-usr ; then
-               elog "In order to use the sep-usr support, you have to update 
your"
-               elog "kernel command line.  Add the option:"
-               elog "     init=/ginit"
-               elog "To launch a different init than /sbin/init, use:"
-               elog "     init=/ginit /sbin/yourinit"
-               elog "To get a rescue shell, you may boot with:"
-               elog "     init=/ginit bb"
-       fi
-}

diff --git a/sys-apps/busybox/busybox-1.22.1.ebuild 
b/sys-apps/busybox/busybox-1.22.1.ebuild
deleted file mode 100644
index 9d6a3e7..0000000
--- a/sys-apps/busybox/busybox-1.22.1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/";
-if [[ ${PV} == "9999" ]] ; then
-       MY_P=${PN}
-       EGIT_REPO_URI="git://busybox.net/busybox.git"
-       inherit git-2
-else
-       MY_P=${PN}-${PV/_/-}
-       SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog 
systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-       pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-       static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-       >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-       local flag=$1 ; shift
-       if [[ ${flag} != [yn] ]] ; then
-               busybox_config_option $(usex ${flag} y n) "$@"
-               return
-       fi
-       while [[ $# -gt 0 ]] ; do
-               if [[ ${flag} == "y" ]] ; then
-                       sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-               else
-                       sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" 
.config
-               fi
-               einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find 
CONFIG_$1 ...)
-               shift
-       done
-}
-
-busybox_config_enabled() {
-       local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-       case ${val} in
-       "") return 1 ;;
-       y)  return 0 ;;
-       *)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-       esac
-}
-
-src_prepare() {
-       unset KBUILD_OUTPUT #88088
-       append-flags -fno-strict-aliasing #310413
-       use ppc64 && append-flags -mminimal-toc #130943
-
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-       epatch "${FILESDIR}"/${P}-*.patch
-       cp "${FILESDIR}"/ginit.c init/ || die
-
-       # flag cleanup
-       sed -i -r \
-               -e 
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
-               Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-       sed -i \
-               -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-               -e "/^AR\>/s:=.*:= $(tc-getAR):" \
-               -e "/^CC\>/s:=.*:= $(tc-getCC):" \
-               -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-               -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-               Makefile || die
-       sed -i \
-               -e 's:-static-libgcc::' \
-               Makefile.flags || die
-}
-
-src_configure() {
-       # check for a busybox config before making one of our own.
-       # if one exist lets return and use it.
-
-       restore_config .config
-       if [ -f .config ]; then
-               yes "" | emake -j1 oldconfig > /dev/null
-               return 0
-       else
-               ewarn "Could not locate user configfile, so we will save a 
default one"
-       fi
-
-       # setup the config file
-       emake -j1 allyesconfig > /dev/null
-       # nommu forces a bunch of things off which we want on #387555
-       busybox_config_option n NOMMU
-       sed -i '/^#/d' .config
-       yes "" | emake -j1 oldconfig >/dev/null
-
-       # now turn off stuff we really don't want
-       busybox_config_option n DMALLOC
-       busybox_config_option n FEATURE_SUID_CONFIG
-       busybox_config_option n BUILD_AT_ONCE
-       busybox_config_option n BUILD_LIBBUSYBOX
-       busybox_config_option n FEATURE_CLEAN_UP
-       busybox_config_option n MONOTONIC_SYSCALL
-       busybox_config_option n USE_PORTABLE_CODE
-       busybox_config_option n WERROR
-
-       # If these are not set and we are using a uclibc/busybox setup
-       # all calls to system() will fail.
-       busybox_config_option y ASH
-       busybox_config_option n HUSH
-
-       # disable ipv6 applets
-       if ! use ipv6; then
-               busybox_config_option n FEATURE_IPV6
-               busybox_config_option n TRACEROUTE6
-               busybox_config_option n PING6
-       fi
-
-       if use static && use pam ; then
-               ewarn "You cannot have USE='static pam'.  Assuming static is 
more important."
-       fi
-       busybox_config_option $(usex static n pam) PAM
-       busybox_config_option static STATIC
-       busybox_config_option syslog {K,SYS}LOGD LOGGER
-       busybox_config_option systemd FEATURE_SYSTEMD
-       busybox_config_option math FEATURE_AWK_LIBM
-
-       # all the debug options are compiler related, so punt them
-       busybox_config_option n DEBUG
-       busybox_config_option y NO_DEBUG_LIB
-       busybox_config_option n DMALLOC
-       busybox_config_option n EFENCE
-
-       busybox_config_option selinux SELINUX
-
-       # this opt only controls mounting with <linux-2.6.23
-       busybox_config_option n FEATURE_MOUNT_NFS
-
-       # default a bunch of uncommon options to off
-       local opt
-       for opt in \
-               ADD_SHELL \
-               BEEP BOOTCHARTD \
-               CRONTAB \
-               DC DEVFSD DNSD DPKG{,_DEB} \
-               FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-               FEATURE_DEVFS \
-               HOSTID HUSH \
-               INETD INOTIFYD IPCALC \
-               LOCALE_SUPPORT LOGNAME LPD \
-               MAKEMIME MKFS_MINIX MSH \
-               OD \
-               RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS 
RUNSV{,DIR} \
-               SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-               TASKSET TCPSVD \
-               RPM RPM2CPIO \
-               UDPSVD UUDECODE UUENCODE
-       do
-               busybox_config_option n ${opt}
-       done
-
-       emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
-       emake V=1 busybox
-}
-
-src_install() {
-       unset KBUILD_OUTPUT #88088
-       save_config .config
-
-       into /
-       dodir /bin
-       if use sep-usr ; then
-               # install /ginit to take care of mounting stuff
-               exeinto /
-               newexe busybox_unstripped ginit
-               dosym /ginit /bin/bb
-               dosym bb /bin/busybox
-       else
-               newbin busybox_unstripped busybox
-               dosym busybox /bin/bb
-       fi
-       if use mdev ; then
-               dodir /$(get_libdir)/mdev/
-               use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-               exeinto /$(get_libdir)/mdev/
-               doexe "${FILESDIR}"/mdev/*
-
-               newinitd "${FILESDIR}"/mdev.rc.1 mdev
-       fi
-       if use livecd ; then
-               dosym busybox /bin/vi
-       fi
-
-       # add busybox daemon's, bug #444718
-       if busybox_config_enabled FEATURE_NTPD_SERVER; then
-               newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-               newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-       fi
-       if busybox_config_enabled SYSLOGD; then
-               newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-               newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-       fi
-       if busybox_config_enabled KLOGD; then
-               newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-               newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-       fi
-       if busybox_config_enabled WATCHDOG; then
-               newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-               newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-       fi
-       if busybox_config_enabled UDHCPC; then
-               local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-               exeinto "${path%/*}"
-               newexe examples/udhcp/simple.script "${path##*/}"
-       fi
-       if busybox_config_enabled UDHCPD; then
-               insinto /etc
-               doins examples/udhcp/udhcpd.conf
-       fi
-
-       # bundle up the symlink files for use later
-       emake DESTDIR="${ED}" install
-       rm _install/bin/busybox
-       # for compatibility, provide /usr/bin/env
-       mkdir -p _install/usr/bin
-       ln -s /bin/env _install/usr/bin/env
-       tar cf busybox-links.tar -C _install . || : #;die
-       insinto /usr/share/${PN}
-       use make-symlinks && doins busybox-links.tar
-
-       dodoc AUTHORS README TODO
-
-       cd docs
-       docinto txt
-       dodoc *.txt
-       docinto pod
-       dodoc *.pod
-       dohtml *.html
-
-       cd ../examples
-       docinto examples
-       dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-       if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && 
[[ ${ROOT} == "/" ]] ; then
-               ewarn "setting USE=make-symlinks and emerging to / is very 
dangerous."
-               ewarn "it WILL overwrite lots of system programs like: ls bash 
awk grep (bug 60805 for full list)."
-               ewarn "If you are creating a binary only and not merging this 
is probably ok."
-               ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really 
what you want."
-               die "silly options will destroy your system"
-       fi
-
-       if use make-symlinks ; then
-               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-       fi
-}
-
-pkg_postinst() {
-       savedconfig_pkg_postinst
-
-       if use make-symlinks ; then
-               cd "${T}" || die
-               mkdir _install
-               tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
-       fi
-
-       if use sep-usr ; then
-               elog "In order to use the sep-usr support, you have to update 
your"
-               elog "kernel command line.  Add the option:"
-               elog "     init=/ginit"
-               elog "To launch a different init than /sbin/init, use:"
-               elog "     init=/ginit /sbin/yourinit"
-               elog "To get a rescue shell, you may boot with:"
-               elog "     init=/ginit bb"
-       fi
-}

diff --git a/sys-apps/busybox/busybox-1.23.0-r1.ebuild 
b/sys-apps/busybox/busybox-1.23.0-r1.ebuild
deleted file mode 100644
index e413eee..0000000
--- a/sys-apps/busybox/busybox-1.23.0-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/";
-if [[ ${PV} == "9999" ]] ; then
-       MY_P=${PN}
-       EGIT_REPO_URI="git://busybox.net/busybox.git"
-       inherit git-2
-else
-       MY_P=${PN}-${PV/_/-}
-       SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2";
-       KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static 
syslog systemd"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-       pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-       static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-       >=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-       local flag=$1 ; shift
-       if [[ ${flag} != [yn] ]] ; then
-               busybox_config_option $(usex ${flag} y n) "$@"
-               return
-       fi
-       while [[ $# -gt 0 ]] ; do
-               if [[ ${flag} == "y" ]] ; then
-                       sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
-               else
-                       sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" 
.config
-               fi
-               einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find 
CONFIG_$1 ...)
-               shift
-       done
-}
-
-busybox_config_enabled() {
-       local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-       case ${val} in
-       "") return 1 ;;
-       y)  return 0 ;;
-       *)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-       esac
-}
-
-src_prepare() {
-       unset KBUILD_OUTPUT #88088
-       append-flags -fno-strict-aliasing #310413
-       use ppc64 && append-flags -mminimal-toc #130943
-
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-#      epatch "${FILESDIR}"/${P}-*.patch
-       cp "${FILESDIR}"/ginit.c init/ || die
-
-       # flag cleanup
-       sed -i -r \
-               -e 
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
 \
-               Makefile.flags || die
-       #sed -i '/bbsh/s:^//::' include/applets.h
-       sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-       use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-       sed -i \
-               -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-               -e "/^AR\>/s:=.*:= $(tc-getAR):" \
-               -e "/^CC\>/s:=.*:= $(tc-getCC):" \
-               -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-               -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-               Makefile || die
-       sed -i \
-               -e 's:-static-libgcc::' \
-               Makefile.flags || die
-}
-
-src_configure() {
-       # check for a busybox config before making one of our own.
-       # if one exist lets return and use it.
-
-       restore_config .config
-       if [ -f .config ]; then
-               yes "" | emake -j1 -s oldconfig >/dev/null
-               return 0
-       else
-               ewarn "Could not locate user configfile, so we will save a 
default one"
-       fi
-
-       # setup the config file
-       emake -j1 -s allyesconfig >/dev/null
-       # nommu forces a bunch of things off which we want on #387555
-       busybox_config_option n NOMMU
-       sed -i '/^#/d' .config
-       yes "" | emake -j1 -s oldconfig >/dev/null
-
-       # now turn off stuff we really don't want
-       busybox_config_option n DMALLOC
-       busybox_config_option n FEATURE_SUID_CONFIG
-       busybox_config_option n BUILD_AT_ONCE
-       busybox_config_option n BUILD_LIBBUSYBOX
-       busybox_config_option n FEATURE_CLEAN_UP
-       busybox_config_option n MONOTONIC_SYSCALL
-       busybox_config_option n USE_PORTABLE_CODE
-       busybox_config_option n WERROR
-
-       # If these are not set and we are using a uclibc/busybox setup
-       # all calls to system() will fail.
-       busybox_config_option y ASH
-       busybox_config_option n HUSH
-
-       # disable ipv6 applets
-       if ! use ipv6; then
-               busybox_config_option n FEATURE_IPV6
-               busybox_config_option n TRACEROUTE6
-               busybox_config_option n PING6
-               busybox_config_option n UDHCPC6
-       fi
-
-       if use static && use pam ; then
-               ewarn "You cannot have USE='static pam'.  Assuming static is 
more important."
-       fi
-       busybox_config_option $(usex static n pam) PAM
-       busybox_config_option static STATIC
-       busybox_config_option syslog {K,SYS}LOGD LOGGER
-       busybox_config_option systemd FEATURE_SYSTEMD
-       busybox_config_option math FEATURE_AWK_LIBM
-
-       # all the debug options are compiler related, so punt them
-       busybox_config_option n DEBUG
-       busybox_config_option y NO_DEBUG_LIB
-       busybox_config_option n DMALLOC
-       busybox_config_option n EFENCE
-       busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-       busybox_config_option selinux SELINUX
-
-       # this opt only controls mounting with <linux-2.6.23
-       busybox_config_option n FEATURE_MOUNT_NFS
-
-       # default a bunch of uncommon options to off
-       local opt
-       for opt in \
-               ADD_SHELL \
-               BEEP BOOTCHARTD \
-               CRONTAB \
-               DC DEVFSD DNSD DPKG{,_DEB} \
-               FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-               FEATURE_DEVFS \
-               HOSTID HUSH \
-               INETD INOTIFYD IPCALC \
-               LOCALE_SUPPORT LOGNAME LPD \
-               MAKEMIME MKFS_MINIX MSH \
-               OD \
-               RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS 
RUNSV{,DIR} \
-               SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-               TASKSET TCPSVD \
-               RPM RPM2CPIO \
-               UDPSVD UUDECODE UUENCODE
-       do
-               busybox_config_option n ${opt}
-       done
-
-       emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-       unset KBUILD_OUTPUT #88088
-       export SKIP_STRIP=y
-
-       emake V=1 busybox
-}
-
-src_install() {
-       unset KBUILD_OUTPUT #88088
-       save_config .config
-
-       into /
-       dodir /bin
-       if use sep-usr ; then
-               # install /ginit to take care of mounting stuff
-               exeinto /
-               newexe busybox_unstripped ginit
-               dosym /ginit /bin/bb
-               dosym bb /bin/busybox
-       else
-               newbin busybox_unstripped busybox
-               dosym busybox /bin/bb
-       fi
-       if use mdev ; then
-               dodir /$(get_libdir)/mdev/
-               use make-symlinks || dosym /bin/bb /sbin/mdev
-               cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-               exeinto /$(get_libdir)/mdev/
-               doexe "${FILESDIR}"/mdev/*
-
-               newinitd "${FILESDIR}"/mdev.initd mdev
-       fi
-       if use livecd ; then
-               dosym busybox /bin/vi
-       fi
-
-       # add busybox daemon's, bug #444718
-       if busybox_config_enabled FEATURE_NTPD_SERVER; then
-               newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-               newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-       fi
-       if busybox_config_enabled SYSLOGD; then
-               newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-               newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-       fi
-       if busybox_config_enabled KLOGD; then
-               newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-               newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-       fi
-       if busybox_config_enabled WATCHDOG; then
-               newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-               newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-       fi
-       if busybox_config_enabled UDHCPC; then
-               local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-               exeinto "${path%/*}"
-               newexe examples/udhcp/simple.script "${path##*/}"
-       fi
-       if busybox_config_enabled UDHCPD; then
-               insinto /etc
-               doins examples/udhcp/udhcpd.conf
-       fi
-
-       # bundle up the symlink files for use later
-       emake DESTDIR="${ED}" install
-       rm _install/bin/busybox
-       # for compatibility, provide /usr/bin/env
-       mkdir -p _install/usr/bin
-       ln -s /bin/env _install/usr/bin/env
-       tar cf busybox-links.tar -C _install . || : #;die
-       insinto /usr/share/${PN}
-       use make-symlinks && doins busybox-links.tar
-
-       dodoc AUTHORS README TODO
-
-       cd docs
-       docinto txt
-       dodoc *.txt
-       docinto pod
-       dodoc *.pod
-       dohtml *.html
-
-       cd ../examples
-       docinto examples
-       dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-       if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && 
[[ ${ROOT} == "/" ]] ; then
-               ewarn "setting USE=make-symlinks and emerging to / is very 
dangerous."
-               ewarn "it WILL overwrite lots of system programs like: ls bash 
awk grep (bug 60805 for full list)."
-               ewarn "If you are creating a binary only and not merging this 
is probably ok."
-               ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really 
what you want."
-               die "silly options will destroy your system"
-       fi
-
-       if use make-symlinks ; then
-               mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-       fi
-}
-
-pkg_postinst() {
-       savedconfig_pkg_postinst
-
-       if use make-symlinks ; then
-               cd "${T}" || die
-               mkdir _install
-               tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
-       fi
-
-       if use sep-usr ; then
-               elog "In order to use the sep-usr support, you have to update 
your"
-               elog "kernel command line.  Add the option:"
-               elog "     init=/ginit"
-               elog "To launch a different init than /sbin/init, use:"
-               elog "     init=/ginit /sbin/yourinit"
-               elog "To get a rescue shell, you may boot with:"
-               elog "     init=/ginit bb"
-       fi
-}

Reply via email to