Version bump, bug #537978

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 5ce8085eff780ac677b66c1300394e8f1d720494..a4f13e7a320b84ebae78f78ca8dda7e9d0032609 100644 (file)
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.380 2015/01/23 01:35:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.381 2015/02/02 17:00:22 blueness Exp $
+
+*busybox-1.23.1 (02 Feb 2015)
+
+  02 Feb 2015; Anthony G. Basile <blueness@gentoo.org> +busybox-1.23.1.ebuild,
+  busybox-9999.ebuild:
+  Version bump, bug #537978
 
   23 Jan 2015; William Hubbs <williamh@gentoo.org> -busybox-1.23.0.ebuild:
   remove broken 1.23.0 version

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 934644af7e755b3897b4966637b11b54604ff906..36b57d9de97abdaa8fc33ba4e4f1221b090eeebf 100644 (file)
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -42,6 +42,7 @@ DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1d
 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
 EBUILD busybox-1.20.2.ebuild 8689 SHA256 7b8d73cfd1fef71b4dff1d1401a06409efcc13f8ee7738b93f627f0c28d051b7 SHA512 40588e7619e5895f1516bf7265c353d3176a18b2211a0573e86f2b1b6734eff82ab9c337b6f28846dddbbddf970fbedab917ff9d05ea5d3cf801f0a65cc0ae3b WHIRLPOOL 046fdffc6253a8d621d276ea4070d313d3e508f9b7778ad5c8e76132848be0b301d4284ae989ba3da3ca584daa35e76cef807e5c268fd50d8db61aaed8d620b1
 EBUILD busybox-1.21.0.ebuild 8495 SHA256 600280b92cb34dd2cfe592e3e74e2b2ea199c7e1755a7f670fb5b76db1db7177 SHA512 8cd8b5879396b3646071b7d463e569853042be068392f6bb80edd1d877e499be42333037038e884c05c51805a59db457f3782d395e7f730d41a34c3c075ede1c WHIRLPOOL 66005062d38e9def9cd716b351f7513d1435266e259713ee31c39dbec84c9acae9c89616b528886fba553cd00728729afe43ec1a1cdef7f98df6e0af8f15ea5a
 EBUILD busybox-1.21.1.ebuild 8506 SHA256 45e6ad003eaa29c594772f24aa1903f36125bb3857d8fb86c6af2290e6755204 SHA512 7b663ee5e3580ab0f5b31c725ce5d7481cc38edcacacda035a20ea953be2a6edbe0b4c8834bb923bbac7a17001f213efdc8a259a92b85cdf7bdcfdd533be4ff3 WHIRLPOOL c66565d1749fccaa0d5e66e975d4497596ac74b114beeade6a68110535616c937d88fbfa5ffe2f3a01b032b164afaefb51da559918a35bcefbe2394bf6754490
@@ -49,13 +50,24 @@ EBUILD busybox-1.22.0.ebuild 8506 SHA256 409a8606aacc2292e12fea917d25d15e91e0307
 EBUILD busybox-1.22.1-r1.ebuild 8611 SHA256 f6d7d70facd2d74146f4bbc6115b542a734c3e76ef290a8d2d53f478f480d6e7 SHA512 77050af4651358b9a9accc3ff1e0c48b9936ed0b5a9a89d9e0438031bb89bf8034f4469a52280617b2bcde10ea76c75b34d2f42eaa291b1672ed01dd26a21aea WHIRLPOOL 22ed631429879a312c0a32021475aa94f21768a6834a4f058dc678d0c66e317ed1bd8c2c308aaed7fb909e19443ee8780c5dc29a98b9167cf64757d7f91a349a
 EBUILD busybox-1.22.1.ebuild 8514 SHA256 46a33d9cc0b202130435b0e5439d5f09b52fe746ef6dbbf099f735c2d3452dbf SHA512 bea8bbae90aa1120db826e942baf26cb971df6c61b550928d7428dfee9ba046b50f7210b929377549d0bcacee00848e1d942069f06c8b411bc18dfdc192da188 WHIRLPOOL 42991983892dca8e7228334856ffb0a8d79a82eca26749ef98f5f39102fc2625826c083f8e7452789d4c58bb6b76351d673d8d8de1171336a6e28582ce59c300
 EBUILD busybox-1.23.0-r1.ebuild 8684 SHA256 636cf388337828edc8a63adbc6b1e06b51c006e67b42537a0c10b3098126d3a2 SHA512 2b96f461ce8be2edc810eb006c7b19e6e7724e8ae1dc4bb807e3b5c7dc97fc2de2df6f825e968dcb7c7fb3b5922ae25b1625ba8e47ffcda682a8fb309123c42d WHIRLPOOL 4ffb659bd15e381c8f08834a0d4a779a8c7b62fd6d46fbf313328f4a215a0178cf62c4e921ce4e78a8cf6680a4d3fae73047a3627879587d69960aece69c4add
-EBUILD busybox-9999.ebuild 8679 SHA256 95c55b192ad5b478e2e0ac6ca14098739dd91d1a66ecab63fd230a664b7a7bed SHA512 5ea5bdab42e50b40f5c9b3b1af2067df4f2f9b1461523e6e865fc1a7e85c0d542f59b066a5f2d0d7028d19123b3a0c9f8ec280982d6bccde63f2f8693b7ccc06 WHIRLPOOL fc024c777df631c54eae398dbe6f1e451c55516aceaf74d5f0c2618a987e7db7835bb43e5531db297b901099a945dc24f8ad8c1757a5ed2194ff0cc6453e2d38
-MISC ChangeLog 58217 SHA256 3e6c3f7e055989bf46e4d85d645b2f2a136662406cbd794357ad124637efdfde SHA512 cb6b9f12abfc5cc036ae0f7a52d91cf6c38f040e24f7495787d88ee78210cc5abd8769ce80a03ba9f509517a50978be3fc4ba0b1a8b213267bf6b0c042b2372b WHIRLPOOL e5fdf8d722678e5a2a40e4ac1ce4250d6029a1371ccc2ad3dd9d07ff1c8cbcffcd0393fcde35b99659f207746f8b6c03c7d5e6cddaa07d4683ecd15d708f23a2
+EBUILD busybox-1.23.1.ebuild 8687 SHA256 ecc9c45bc0357064c1ba152d4e5cfb6edc11302b422083b07e93ed33b4f77f93 SHA512 18b9b22c04ad040198f104f846a57a1cb9697295fe9c9e4492b07115400940da044a59e01d5ede2b0f797930aa2b60b16687589b45c7066bf0176766598b9e9e WHIRLPOOL f3c1de71dfc1cdae30ced77dd605cee6e9061346b3e4cfbcbe45c11ba19d731f481952c8cb45a4d69d888c2e65fe2e456d6131111f24dba6617320ef56bb722a
+EBUILD busybox-9999.ebuild 8686 SHA256 91fd13fc4d310b99dda74a6acdbf0ec611f1929c90c0e1faf8c4156c704808df SHA512 9948081e3eb5968c2ca23c19ace77b5fe384bd81552dc60b9ee63c6f10da1b9e04a2f18b6dee7ef1a6c5f24b751bd12ec2c00f10fed7d9c02f20002ad2fb804e WHIRLPOOL 53f1a6f16a916cfc387bc3ce07c09ffddb3cdc43f0f04634f96ab554a51c2f84e6e180493b1040a212abf04e12355efb8180b0340f9a99aef2bcd97a35c96419
+MISC ChangeLog 58379 SHA256 8632bc9f3b58792a3561bca9b2b09cbd85f92ae5d6a7e32e5aa003e34b47d0b9 SHA512 4f4a8b43d826869f49585b092f854ebf813be1b88374682fd99d07684bb3dd39c2c6e557ddf7a293204c8cfce91d583519e1f5a10f38e9d0e86356a9a93aa4f4 WHIRLPOOL a81be3de15a78607510a8edeb6179285d437ec24c51642044d8cd36d89c0e40c0a3c1fc38518b43a0330841a6b2c9a55b42373de7fbc7e58af2ccacbad12234c
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTBpU4ACgkQblQW9DDEZThRWQCgsKUfcUrARalU4LuA/6GeUqRU
-ywwAnA3qOBYDNj5fDgNyFxPR84MQkulj
-=5f86
+iQIcBAEBCAAGBQJUz627AAoJEJOE+m71LUu6qk8P/iNCkEyJyXb9NCK9FaVe6kpz
+Ga1pL3BaS7TrII25SSGftqbX/zPRobJQtFVfQp2xx8F372OI2q2Lxq8Gh0tZYDDd
+A8KP1WjVNRyVFhtL9xR9nJ6XaShAngUplwGKXaXNRob+QUPaOptriCNpLJb2yukw
+Wbuum2EzUZh1qgwGi8dragrOW5iyggNzfTrvYz6mt1Ys467JexzCzX4fF6MoWTSi
+usSAEms7X0jK+A7Aj2vMjU5BuUzV2KKFfQzWJIsvuGolrn4bcvL1Eu9+zxQ7wUHA
+vepG58nZnruPwZ6Db6mrA1x7VdLPB19JeY3tc5GjrPbJ1hTITNMRP3lT/mXcm2NU
+vI8Al/e67e0bjMrXOV1D9gAa1YidsGvwvDX9cn354C55XOf6D/JGtLVLYNlTOIcV
+xRsJ6sVNDLSbtCUiUOiMGqFGmY0u0TSSbokj1PtHuT2zho5tLxB0OXY+Ni3vv7hU
+9gvO9jNnLMoaK+erqjgL9V9+phYdlTr2YfTOqlKJ7Odm3nHv0z0DPUR7WlmyAb+s
+mdyNLypM9swOajyEwZZvnP9qbrG5V8FmlNr4iR0u2ErPO7G0SZghTSMluVxhfJkP
+x8FYdJt39ch1zX0szfEYsmOCO5xaSX2khVFgpJ8ifn36flVB+a8ZywgPVWmjnBIn
+u5gTnGjv5UpDFURRSDeZ
+=QPV6
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/busybox/busybox-1.23.1.ebuild b/sys-apps/busybox/busybox-1.23.1.ebuild
new file mode 100644 (file)
index 0000000..fa13787
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.23.1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.1.ebuild,v 1.1 2015/02/02 17:00:22 blueness 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 ~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
+}

diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 00b73928b6e0879d02569fbe34ff9eac7131f57c..19f91f69401d94e199b111f43ba6f2176e82683b 100644 (file)
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.16 2015/01/23 01:32:41 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.17 2015/02/02 17:00:22 blueness Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 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"
+       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"