sys-apps/busybox: dont USE flags, check .config for sysklogd, ntpd, watchdog

3 files changed, 14 insertions, 20 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 0427f20..580051f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -13,5 +13,5 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
 AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
 AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
 AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9414 SHA256 2a2734acf43b8574326b5aa18e376fbcbb58a2db1a70c9acd46c78d534d40a7e SHA512 5b3ce0dd551e85c2c889ad719c3484d19e253e568be4e0a0f9fa8ea53d6fa7eaa30bb611025ea435f794eab8bca124d30127a9c92d39859a1a1676384c950d60 WHIRLPOOL 79222b5bf719ba52baccc4a55477604a2f5f7b39f0f849feae971b550b68f8ea5bd28235766df2a803cfde6c3f5c5c652049a4ddf28d60aab1fe601fbb2ff8fd
-MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
+EBUILD busybox-9999.ebuild 9292 SHA256 2fce0ccf747047d6fd3935e17aa3681309ea014832279f04f680d24664ad54a5 SHA512 6989f63a237be62f0ad602c88093a1fb022bdd14c327d3b8102f74b9a49070fd122d26f293ed581bbd27f7d87b31e045540eee11e0444386eb3ff39249b7c49c WHIRLPOOL 241a40c458eaa4e22776731861e798c05da54888928312e3e4c1f5e693f47aa783540260b5e59f7af346f1f9bbf5db74cf907f1d74cc9c1490c00955ab750dd3
+MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index d891ca1..b360865 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -57,7 +57,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev ntpd -pam selinux sep-usr +static sysklogd systemd watchdog"
+IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd"
 RESTRICT="test"
 
 RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
@@ -81,6 +81,14 @@ busybox_config_option() {
 	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
 }
 
+busybox_has() {
+	if grep "^CONFIG_$1=y" -q .config >/dev/null; then
+		return 0
+	else
+		return 1
+	fi
+}
+
 src_prepare() {
 	unset KBUILD_OUTPUT #88088
 	append-flags -fno-strict-aliasing #310413
@@ -169,17 +177,6 @@ src_configure() {
 	# this opt only controls mounting with <linux-2.6.23
 	busybox_config_option n FEATURE_MOUNT_NFS
 
-	# add busybox daemon's, bug #444718
-	if use ntpd; then
-		busybox_config_option y NTPD
-		busybox_config_option y FEATURE_NTPD_SERVER
-	fi
-	if use sysklogd; then
-		busybox_config_option y SYSLOGD
-		busybox_config_option y KLOGD
-	fi
-	use watchdog && busybox_config_option y WATCHDOG
-
 	# default a bunch of uncommon options to off
 	local opt
 	for opt in \
@@ -244,15 +241,15 @@ src_install() {
 	fi
 
 	# add busybox daemon's, bug #444718
-	if use ntpd; then
+	if busybox_has NTPD && busybox_has FEATURE_NTPD_SERVER; then
 		newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"
 		newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
 	fi
-	if use sysklogd; then
+	if busybox_has SYSLOGD && busybox_has KLOGD; then
 		newconfd "${FILESDIR}/busybox-sysklogd.confd" "busybox-sysklogd"
 		newinitd "${FILESDIR}/busybox-sysklogd.initd" "busybox-sysklogd"
 	fi
-	if use watchdog; then
+	if busybox_has WATCHDOG; then
 		newconfd "${FILESDIR}/busybox-watchdog.confd" "busybox-watchdog"
 		newinitd "${FILESDIR}/busybox-watchdog.initd" "busybox-watchdog"
 	fi
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index e053635..72850fb 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -9,8 +9,5 @@
 <flag name="sep-usr">Support a separate /usr without needing an initramfs by booting with init=/ginit</flag>
 <flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag>
 <flag name="systemd">Support systemd</flag>
-<flag name="ntpd">Enable ntpd daemon</flag>
-<flag name="sysklogd">Enable sysklogd daemon</flag>
-<flag name="watchdog">Enable watchdog daemon</flag>
 </use>
 </pkgmetadata>