Add init.d logic from the live git ebuild.

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

3 files changed, 42 insertions, 17 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 0c7ff70158f4..2970f8b401f1 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.335 2013/01/25 18:51:27 vapier Exp $
+
+  25 Jan 2013; Mike Frysinger <vapier@gentoo.org> busybox-1.21.0.ebuild:
+  Add init.d logic from the live git ebuild.
 
 *busybox-1.21.0 (22 Jan 2013)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9937f4282827..0330fff08d63 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -37,24 +37,24 @@ EBUILD busybox-1.19.3-r1.ebuild 8449 SHA256 89497a117be3235619155c56984ada796850
 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-1.21.0.ebuild 7128 SHA256 2f91ddcf816ae2b2467d1ef2062d500dfcb498143fb79cd36645d7c22b4ed882 SHA512 89de82e96863731fc428f5844fb61c214b2b65e26891bbdb24ef1cde91900176228f2a4934e4b0125e4457286634018a0cb861ee49d1d653eeabc412ced63923 WHIRLPOOL e720a3d909b1ffde1a3a22de5818028831aed21f9e624c460393b72cb51de890c0373332c84c8ac9540cb149f1511bea3539a896f5b020eb6a1e4f3bfa1f7620
+EBUILD busybox-1.21.0.ebuild 7859 SHA256 5692bb7c1efec1a04d58af498aa798245be4a3a6790e7a8e168d0673af3d9aeb SHA512 db22cb1840fd72d32fd4024aa0d6a9bb6c641abfad048c2d828120a424ea1ba0953801b406b16d7b6b8007756b60111e253448cc656f44bce202da285d342e5b WHIRLPOOL 7e959752ece73678e5dcdf725d56718c42315608aa2b04b81255a2dee30a5eb80bda462e8ee61cabcea5b21854bbf92f1152b77ddeab2f166c4ed7a02a9809e4
 EBUILD busybox-9999.ebuild 7857 SHA256 da2b987c1670ab47b314e19931f2260fa532506f7b70b0dd33511e1b410492e3 SHA512 92bcf7af32ad52a41b9377442c70a4c5180211f0050b3c516ba6a37c824f2c82e91a183253e6e282b38be76f774bde08b67ec3e655a6c7357efe400b6a47f325 WHIRLPOOL 0aa150fe7bd932ab16202af3ca4ef23f39c37c53da3129ddb1cea2903de39c2d357c239085d381c9bb4c9085abd78ad584ae707332b039dbcb204045d3450e43
-MISC ChangeLog 51586 SHA256 f5bc1544ad47b26678585e2e82e7894b2e15677afd8c81402ae06c5a7bccd805 SHA512 1a9d06e0593675ce03da1d8624bdcd2b4123e7947186722dd621627b2d5fb7666a4aa7f0a06394c1af4d5d466fa66d1d8220f4785d72d3d9011457b5b9c7157e WHIRLPOOL 11a7516818398cf8aefb54604cd2bfd78eb558947c5d0e83c5545d040c71bf84eefa7eb3d10d510e83fa2c1bbcc60ae3b11e4d70d5f0497932dcc0dc78c818c6
+MISC ChangeLog 51705 SHA256 5dc02fd257ded8e705c85f596b3709f9e153fd85784e75edae91c67650ae3d01 SHA512 c93e651eca2fd2c6c2cb850ebbbe59ff0d2e85a3133a462e81011ca29c166b0ba89d20c78f493ba8352ea74c1a76ec889e77d56781bff75fc4729fcde109e923 WHIRLPOOL 863252efc8cac7a33cdf05741019ea526040cfc97a5d779447396e73f457f98118ac72d6f6f89f3349bb84fd0bcf050717c2a703233eb78406e8e20a3e129c5e
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJRAtQxAAoJELEHsLL7fEFWjH0QAKKHJyGzYfTvNDmDnLZ17tOY
+li79yeBGjWIMzBdUDu0z36y6xc5yDJjOxtCySNhz1P0vvH09zTIgOOzITH6KDbWx
+bHtcO4f4JvMAfSfu1rZlaRiUxjKV+jcJ6veLF0Ld9/tcGrJx7yK2YxMxsoyP90Mm
+p4/RSUDz8OlZBvSN4b1v0otDnZfIhvxNzyf7JB03XYib5L4dAJKMXz3Uyhs9cwWH
+5btMefbILESix2Bi+ycrMgg3xQlFmneqfz7DsuZfEkyYWlGeYrqzCcL8qQLeRL7T
+hd/UkMRjSLakFZ4ZoZy7x/7ewXmlvSxTDZyguBwksNAGqzWsUydb18tlUgSFqRRO
+pj1rr4HZSRtr54etcTOp7epzFAr1KnTSKYHHKLirrKkzoSHK4lcxvVPkk1P3zenw
+mX3pGywIL+vUpavYez9mhrEZWz8Y0LnG/3qXDfZZ+PPWWO9p5rX0Mqtx9y6MX3CR
+be6DK0F3sRar30QWFqCC+5jM3vCXFxV22QhJ5OFG0gV5ifNSqXWIJjGvl5I53eCZ
+gOyYRY47REK7sBVhqtNggcw4FnnBVn2E/+y/eRTUTu/XZX1BJNYufEhPakpQvwk+
+ExSOkLJa39c0aSFTshrXdqcnalDQ2S/I/12REhu5jLs5j4xqMZf3VLMHDT/1Xoam
+8UJr+Tp3OZevpoFYenAz
+=EDJh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.21.0.ebuild b/sys-apps/busybox/busybox-1.21.0.ebuild
index fcfb99a91a84..9e76dfcf6a37 100644
--- a/sys-apps/busybox/busybox-1.21.0.ebuild
+++ b/sys-apps/busybox/busybox-1.21.0.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.2 2013/01/25 18:51:27 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -45,6 +45,10 @@ busybox_config_option() {
 	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
 }
 
+busybox_config_enabled() {
+	grep "^CONFIG_$1=y" -q .config
+}
+
 src_prepare() {
 	unset KBUILD_OUTPUT #88088
 	append-flags -fno-strict-aliasing #310413
@@ -197,6 +201,24 @@ src_install() {
 		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
+
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
 	rm _install/bin/busybox