Version bump.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 290 insertions, 64 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 019b491a9e94..0c7ff70158f4 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.333 2012/12/21 03:15:28 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.334 2013/01/22 01:48:41 vapier Exp $
+
+*busybox-1.21.0 (22 Jan 2013)
+
+  22 Jan 2013; Mike Frysinger <vapier@gentoo.org> +busybox-1.21.0.ebuild,
+  busybox-9999.ebuild:
+  Version bump.
 
   21 Dec 2012; Anthony G. Basile <blueness@gentoo.org> files/klogd.initd,
   files/ntpd.initd, files/syslogd.initd, files/watchdog.initd:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a1b03b694b14..9937f4282827 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -32,27 +32,29 @@ DIST busybox-1.19.3.tar.bz2 2167188 SHA256 a1a9a35732c719ef384f02b6e357c324d8be2
 DIST busybox-1.20.0.tar.bz2 2190652 SHA256 3c56508d984db1178664241ad548d118fb0aa71cdd2f8a9a93038e50b3b2bf16 SHA512 77423bebddb05b241747a7949cdbc1bc0db8506f5fb8fb152ac26a62ddfe8ad7fc8fcc597a5a3940428975611796f5a5ca666df6842df1bc32c6b70b6b8241c6 WHIRLPOOL 04ee6c5d0b5c020542968fa83c7d58edbeca42f2daaf9497589fbd65be1c0bb1da23dae9b7891acbd40cbd5b5560b62f229627e0636d342982fa600f7edaee17
 DIST busybox-1.20.1.tar.bz2 2190170 SHA256 3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9 SHA512 9ad2af7216ae79c2c8cf246654a2c591983d347d22bfe4cd54ae41eaee0ea17f7bf8d6834add3f1f843494d6980707e0443aaf663075fda6e4e7e29728606c53 WHIRLPOOL 07ce28698c63a38ce2c6d71bfbfe1f920f07a76d471db9b9b1a7260ef1bf493551bae67d9b9dc2be41783f1ce0cf56935c44eb7af2a1bc865807afaa87eaabec
 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
 EBUILD busybox-1.19.3-r1.ebuild 8449 SHA256 89497a117be3235619155c56984ada796850517d2e2583e4aefeebd02780822b SHA512 738cf1d3887471707815f8b3e22b5864ef16cfa1244f8b30cf7ccf5aa70a291484acacc3aa89cdca8be3cbbadb01fb767dd9f1a74566ebb30cdd15e30aee7935 WHIRLPOOL cfb0d1553813c7780589ba281b4a8216009adcec450843d4c2ab8e4fc39c2c5e0bac36f13743528c03ecc8c74503521b39e3a4e7db39bc1d37abe4fcf2526673
 EBUILD busybox-1.20.0.ebuild 8811 SHA256 19c606393839c21452f4352d6290495a27edddfc7b1d7fabff373da2d06a3dee SHA512 20c085027cea9ab62564f63eaf26f0ac205804ba2be6da02609dcd77c4adfa6dc6c08b56d7cb747d34938a3440bb27522a11515f50d71215f4bdca8d4c5ed04f WHIRLPOOL 822bf4e851f642d20a1786b53ca80cbeef86d2bee6d8775f395d87c254b66da991f1964c5f62e61f36d150566f0582e9c465e47285ad6315feb188435e6b5608
 EBUILD busybox-1.20.1.ebuild 8854 SHA256 6df4da6cff549e49babb76991fc9b0972b32a61e88906fc550a99e719dc861ed SHA512 72c291f76da4a018ee9b9a2a95150998afb2a5f26ad8125ac3b6e7f88c8a1aa7baf34908329aee6be7f8035041d42608d635efdbc7ec64dec901cc4b1ba7c41c WHIRLPOOL a63a743b92b9d4affa544dbe71005c0497bcf673a600c00b905043b6534dfed830cc225624e5f4c4b8166a3a7bc68f8b8ced1a90819f16943d0816278a63761b
 EBUILD busybox-1.20.2.ebuild 8690 SHA256 1561777575c2012653eaeb4940558feb4e9a2564f7368dc642ddbe83b3d81979 SHA512 1e49eeb8b67716e53287360dce03a7d706b3b11e9e8ea938a77a036b5b78dd16ecaa1fa702bf56ba33f5a5eb2df4a8c957cb9d0a5cd326af2b7344e49121659b WHIRLPOOL a58f6bee8782458c9871d312cdaa9459ddf57ce9621303c0bff1ed494cb200c2ce25611f2ab731f01165ff951fd9bfc14b29c836bcb4536610e05a45b5a726d4
-EBUILD busybox-9999.ebuild 9378 SHA256 809b14816479705bd2d69a2fd087b43ca39c0c0c5e9a576bfd62a1c1f06e9fe5 SHA512 a44ec169218db14469bbaf29f72ce61616965a37d5b7c5a4dd94101419c498c12529826cef761d1c005ee2895c0a077dc49a443ecd7d40e094da7aca3a1c00b4 WHIRLPOOL 7f885c412c3e272f5592541a4d87b647f92eb2040a92ffb0fbcc06f48d16bc7dade32676900194949114ca0590d48636dc8a3925f497215288fd5d692562edd0
-MISC ChangeLog 51443 SHA256 29904fadadde7d1ac167a99512dc4caf951047a162eeed6498f479ba82a081e0 SHA512 27d6e3ed0b993098bd80b6fb973ad84b2bb38e99e1dc146de22721b7a10b1789f56002afd5d6f2dfb3ad33d77b1aa8ed090940da2f8c47876384568c4ee55074 WHIRLPOOL 7227e18c7fb9418ed3ee8b0845ded52559d0d3c67b4363e7575b4c65a98d6763964e0e6bfa1b5b0902d64b719a07610c54dffb37080d19f95e9875cc74a7514f
+EBUILD busybox-1.21.0.ebuild 7128 SHA256 2f91ddcf816ae2b2467d1ef2062d500dfcb498143fb79cd36645d7c22b4ed882 SHA512 89de82e96863731fc428f5844fb61c214b2b65e26891bbdb24ef1cde91900176228f2a4934e4b0125e4457286634018a0cb861ee49d1d653eeabc412ced63923 WHIRLPOOL e720a3d909b1ffde1a3a22de5818028831aed21f9e624c460393b72cb51de890c0373332c84c8ac9540cb149f1511bea3539a896f5b020eb6a1e4f3bfa1f7620
+EBUILD busybox-9999.ebuild 7857 SHA256 da2b987c1670ab47b314e19931f2260fa532506f7b70b0dd33511e1b410492e3 SHA512 92bcf7af32ad52a41b9377442c70a4c5180211f0050b3c516ba6a37c824f2c82e91a183253e6e282b38be76f774bde08b67ec3e655a6c7357efe400b6a47f325 WHIRLPOOL 0aa150fe7bd932ab16202af3ca4ef23f39c37c53da3129ddb1cea2903de39c2d357c239085d381c9bb4c9085abd78ad584ae707332b039dbcb204045d3450e43
+MISC ChangeLog 51586 SHA256 f5bc1544ad47b26678585e2e82e7894b2e15677afd8c81402ae06c5a7bccd805 SHA512 1a9d06e0593675ce03da1d8624bdcd2b4123e7947186722dd621627b2d5fb7666a4aa7f0a06394c1af4d5d466fa66d1d8220f4785d72d3d9011457b5b9c7157e WHIRLPOOL 11a7516818398cf8aefb54604cd2bfd78eb558947c5d0e83c5545d040c71bf84eefa7eb3d10d510e83fa2c1bbcc60ae3b11e4d70d5f0497932dcc0dc78c818c6
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ09RZAAoJEJOE+m71LUu6y8sQALYeZw1Ez0c+XMp0WQnDIyiO
-gQ9uA8L4wqDJYYbCsg5/mKmQZKwQSQa8+ZLha7g13uryZEYsnyhWO+kDNbMHcULR
-cAGeRU1RO02l6SWSuJq9pU5PMKi3gX5jkXS/FH39jTyYQ9tEE3oNl/mCAV7M+oID
-QWhPFfQ6kxuk6k1zSAXkJHKzSek9oj+uGJphJtaEvduD9Fql+pNN7gVqE6esE+HX
-TF7agBOIqbItCtzaGD9j/dfwldANAn1/yOTgmUwR8Pmk0/jMYrHSZva6NCaTrs2K
-2uwjC24knYQ6M7Uk5IwYRZEpEWl5yWOwKa4SyQJVHp53W78Lhu98V6GIfJaPDS1o
-dDI48gr+nyl84Iun/MBKB0M+Ujyp5z/fUtMLYQTkinWL6L+iSAFEKs+aNo/yn63L
-NvRh9NvL5yeVsNvfC60WoQffiFejFGBggbD9ZS6pvbCzsHMt1CD2mIbNM3NRuRk5
-m6HnXT4uT4G1aOpjauQKSPdVfwj4VLDmEc/+b3oLoSlad3y+sDI/OC78YN4jiEiu
-maVyOUdw1SIFtD5dUkCaFCu48eTBHGKR+od1DyJA0Oh/Kp5lmX6afhtItxwFKa0O
-4TsEkW8c7MHOqV8P/K3eI/38Lwcbns2lKJmR1ftEPicXv3hpph/MrEyZR0m4vmpa
-zWE1XNOxvdqBJALclUu8
-=0aWQ
+iQIcBAEBCAAGBQJQ/fDvAAoJELEHsLL7fEFWNvMQAMtQ66wHEhbOwlb8xklwBrlr
+Q0L4Zbe70bB1Bdi40JK+V2IgF+YY8e3VW/6u5CsBxylffMxs+belxsdE2gnSEH+d
+ElbcrrLCbIhJm9SBkB0n94VZ4EjRpMZpVh+0crokMFTNj1VlzHYBsyXqrTqLmr5D
+lo2QQnmfKtwyydZsAun5WvRH6q5a6qcBZzgQuyP93uO+vOQLMyKqPgy6BcE1DtK1
+hKyUnlV8v61Rz4at9GYK4jfJBtNEUEtHJ+A0pBmIN6PGYfCfqkbEYoS+fUs4O022
+Xcw/Y5+KHUH/iTwmgbvdyp/Nx86EdDBcS8I4ZjgNVOW7Evi2JN2kkOdOgQad2qsA
+iPxQk+8hpQSytQSyanMutCWBCE7tSRFASbEHam/Q3/tzbgz1689mhxYsmbYqS5ua
+XIOV3Lsc9h5uEjJeIRcx2fqBkKjkfir2DXz11JAooounuOUaekKV0KKZaXqI4BMz
+DwCtIMnN34FxJhixnVWm7JfPvBg5rYNz7Kehb+nUztiGOmspbkjVt2li/eOm2E2O
+YK9MYCD6khenlM9Xm6+/O++0s/sBM8SYEY3nmfiWKi9c0EYFCrJxMw03r/+w2YZ7
+WuTX+oq6V0wYJSdz8nHJVXvV0YG+ld6yPgEo9SZ3n65MXOZzUlPb8ro3hvl7pKWJ
+uuzhCpWh/GIfA4bnO1fb
+=jYJh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.21.0.ebuild b/sys-apps/busybox/busybox-1.21.0.ebuild
new file mode 100644
index 000000000000..fcfb99a91a84
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.21.0.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.1 2013/01/22 01:48:41 vapier Exp $
+
+# 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 ~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}"/${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-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index c2bf8324f65b..45ece7ef7319 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,48 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.8 2012/12/04 12:10:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.9 2013/01/22 01:48:41 vapier Exp $
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
 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
@@ -70,13 +34,13 @@ 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
-		   ;;
+	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 ...)
 }