sync live ebuild

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 23 insertions, 17 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 08a1be0691a9..5bde832cc367 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # 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.378 2015/01/22 22:57:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.379 2015/01/23 01:32:41 williamh Exp $
+
+  23 Jan 2015; William Hubbs <williamh@gentoo.org> busybox-9999.ebuild:
+  sync live ebuild
 
 *busybox-1.23.0-r1 (22 Jan 2015)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 14e289e2e07d..ec9246642029 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -50,13 +50,13 @@ EBUILD busybox-1.22.1-r1.ebuild 8611 SHA256 f6d7d70facd2d74146f4bbc6115b542a734c
 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-1.23.0.ebuild 8678 SHA256 e7d9029d09c2fa0b4594e5132bbbbdb75d839b677555090a03b6979f0f328274 SHA512 9a0ee6f8a72946170d3ad19c417563d5a6f74e46056fb6e856bc1e8f8e128ade4d9bc90f2555ab67a1b3412dcf118f1bc5187fd92b9dedfaaef3e34ff395ec5c WHIRLPOOL 8815be1348e03bf10418bd418c3fca23b7c5c1802749b37376fecbeb9a43916a9fa371441d58ea2baf1e6ab11941c0a78862e326ee4cb1e2292109bfde8c1309
-EBUILD busybox-9999.ebuild 8506 SHA256 08368826e7140b6d925b7eb348f1ccb99a851b825f9d6f4d80adee57d4f6dec0 SHA512 44f90f8eeb41cd2db2306df90debe289b7cd5ccf72bbd8185f64747067fc41717692a7609976738d6efefc9367a91d68c2ee9ae21ac74e3707dd896b5e6b4b69 WHIRLPOOL 11708cfbf79cb597a9f3ca75d0bffd77b0d1a247dbb25fecefeda5fe35aa5b5141c2b161c1e370c6c088597c0d9f4cd3db207e2071a456b3a66ec7203c11f2b7
-MISC ChangeLog 58018 SHA256 d053e15092213a9ba96f835398298180f1f9f7e3d58fa67beddab2b322716a3d SHA512 ad4ea8780679c38ef7e0cac464e2697b1819ecbd85a355d93531258483f5edb9f86bd2b9b3ba85c5e295771edb0e2b4187a06c7a3218184cfa82196007dc66a3 WHIRLPOOL 7169709040614cda742e03441ba5d453c3f455957a5a28b67e78b68256ae83d14a70b3286108091df24f994f28fb62f3c7792d6a8b1a259410c0942f1e98b056
+EBUILD busybox-9999.ebuild 8679 SHA256 95c55b192ad5b478e2e0ac6ca14098739dd91d1a66ecab63fd230a664b7a7bed SHA512 5ea5bdab42e50b40f5c9b3b1af2067df4f2f9b1461523e6e865fc1a7e85c0d542f59b066a5f2d0d7028d19123b3a0c9f8ec280982d6bccde63f2f8693b7ccc06 WHIRLPOOL fc024c777df631c54eae398dbe6f1e451c55516aceaf74d5f0c2618a987e7db7835bb43e5531db297b901099a945dc24f8ad8c1757a5ed2194ff0cc6453e2d38
+MISC ChangeLog 58110 SHA256 76294a7c25c513c07130648348d763530f69e432b4300933c4ed36d238b18519 SHA512 faf72375c64c8bd31e3a12bc7b9d41582eb7f831600b9e8d28013d4524a96f2228d9ca1d2c3ab781ee2d45602c0aa652b262c4e28879b16007162ad4eed99b8c WHIRLPOOL d4402fd9145b3d11c96d5509e1779df7fd3b2e9c5df8eb9309e4a51e63f01ae38b2eac4503b31b73b4e839cbf07a98a4f48dde90354b1cfc556cddc952f3162c
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTBgFkACgkQblQW9DDEZTg75wCeOMfBsZ6ijLLXhpKkSpS3Hco4
-syYAoIvXcmRq2xpIarWzU1IUrwpv7rUz
-=ThZ3
+iEYEAREIAAYFAlTBpMIACgkQblQW9DDEZTj7YwCbBp0KmIa6qYZBdAgY+aFyu4U8
+rw4Anihm+x3zQcTaxVYzKl3MMPTCL0vt
+=CPQi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index b767c8cc91f3..00b73928b6e0 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.15 2013/02/28 22:43:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.16 2015/01/23 01:32:41 williamh Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -21,15 +21,16 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
+IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
 RESTRICT="test"
 
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
+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}
 
@@ -66,7 +67,7 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	#epatch "${FILESDIR}"/${P}-*.patch
+#	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
@@ -94,18 +95,18 @@ src_configure() {
 
 	restore_config .config
 	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
+		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 allyesconfig > /dev/null
+	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 oldconfig >/dev/null
+	yes "" | emake -j1 -s oldconfig >/dev/null
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -127,6 +128,7 @@ src_configure() {
 		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
@@ -143,6 +145,7 @@ src_configure() {
 	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
 
@@ -206,7 +209,7 @@ src_install() {
 		exeinto /$(get_libdir)/mdev/
 		doexe "${FILESDIR}"/mdev/*
 
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
+		newinitd "${FILESDIR}"/mdev.initd mdev
 	fi
 	if use livecd ; then
 		dosym busybox /bin/vi