Install the udhcp config files when features are enabled.

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

4 files changed, 54 insertions, 12 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 2f254260a9de..843d0197ba67 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.340 2013/02/19 01:42:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.341 2013/02/27 05:44:01 vapier Exp $
+
+  27 Feb 2013; Mike Frysinger <vapier@gentoo.org> busybox-1.21.0.ebuild,
+  busybox-9999.ebuild:
+  Install the udhcp config files when features are enabled.
 
   19 Feb 2013; Zac Medico <zmedico@gentoo.org> busybox-1.21.0.ebuild,
   busybox-9999.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9f2043a681c3..2447fa2b62a3 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -38,14 +38,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 7997 SHA256 cfd8a775d7b40cb54f71fa0d5757af514e8f84c8461977cb0aae5289b1c56d13 SHA512 ab9807e9b086b1c07fa6356717293a1d51fc773842deeefed06a8500d2b8d3405e45d1815905414cc4104b477b938b5a9a9cbcec15734b2cdcac030990a93b37 WHIRLPOOL e0df9389d662b1637296a891751ee975d94a421224f308d1aae7e1c3a5cc307231c38553386e40e8c933407c87d35de511ccd04ba8e49cdda4a29f4d696ebe76
-EBUILD busybox-9999.ebuild 7997 SHA256 90bec38e818f4e4f0c9fe2e6622cb343fa0f87496966c34d8f1164a514ce6fa7 SHA512 5eeea9a88e5e50d7af83e2b548ac621af49b4f54e0e46df93cc5dc0faa82494795bac0ee118027501b4ac22fa6282a4f015fedf4f67992c9c42da4d64d43a8de WHIRLPOOL d39a7547ad7aa85ccde3b56d772ef5e8d6aed3d7971fecad59b2ce9de1d449a91bc257337961947c2dde4181c12919b7845aaf0d5c9895bc5b67932b27be1b48
-MISC ChangeLog 52380 SHA256 6d1c2fcf978ea185481a152e2fa2fc92e62daabfb006c2db887816f8e774fa63 SHA512 e2537f904ba213df67e805e166fb76d7772f6ccee89e8431c63bd16e8ddccaa43ebaa49a100b87ca61919244788cd619be3338e81b2e2f7086caf284a77dd2ae WHIRLPOOL 8d244aebc70d1baff2bb015c2b046f20082aa90cbf444dc540e20e8f433d16455e0e8c773acd1b8e56b88b986c7d46d79a1e27a4b7c177139a64e4fc34915eda
+EBUILD busybox-1.21.0.ebuild 8400 SHA256 02b17783e412ff17ad987fa3cc062c8055cc7fe7f0eddbae2160fe6e231379cc SHA512 7b5526ef52964722ff0eb692fb9cf24c16889a9e3cc97e709c3ef148bfa93cb32f3b3edef40d7ff8479f80d4c610f05afba0cd56b236b4a91cd36bdc64ad7df2 WHIRLPOOL 08a1791ef5f49eab730b63fa32a62578511c89b6927cbfc36418785de69dd65a6f60df167a9bbb78bbf515a6590955673b3e14a573b7a751fa99a71361817ae6
+EBUILD busybox-9999.ebuild 8399 SHA256 f25cc54d4c0e91ee04b104f6c9b9158ceea9b4d012433234a97cdadc3b2e67b3 SHA512 077e0945737b5d1aeb6e5df918f26f522fc3195b919f15ee6c59c6dab8e512249561df5eb7f51bb9c31c8de106aa97f257847577542de91182bd21d74187a336 WHIRLPOOL bf07621296df8fd7c3189079c8cd65478ba6aab5e4da28ea83ac092f2af3179909a8050d96cf2bbbbe856f435cb9b8f637058d1dc64201ed73d59f68db80f314
+MISC ChangeLog 52536 SHA256 6da9122bf71f9c1c4b0c3a12c86bf2583565255465b69fb6e50ea1f03a047c67 SHA512 98fdc716ba6ff6b2d203288e2e2b6bbc8ca51e1b403d58f8282739539568795c42d2350e60f7a64031c20e61b59bf207b696ca583e567ff17dcf126d280005b8 WHIRLPOOL d1c2e053f66a7f7ddbc2003c4d18ed0ea7597eafcd6b659ab8c81e42f7f3d58526082233167c1ffd98c18887399173e60ce180d1b77e298f7a605d255cf76620
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEi2JEACgkQ/ejvha5XGaOE6ACgp9s3s5lV5KtkGu5gkskR87YZ
-EiAAn2r9sO7hoLVHyaZaJNAN/Y+A2D8i
-=ur26
+iQIcBAEBCAAGBQJRLZ1mAAoJELEHsLL7fEFW3P8QAMh14vxqlDaNSPaVUFz0C+tE
+32bwRGFIiIuCkYTQuqcXSHLZJgZuPdhWMSYpGGVm7sxzGOp2J8kC9T1hnR783fh3
+oa60McPfH+OpcP1p/QTZMTKhI9eijZK/mxu/kMNNjuYkkgdi0wPCVxc5wuCemc5i
+rosIh3fjc0dJGtEJ0Ts/8o1p60EhJhWOY04jBVs8mlLogLhD1po0eVuSbuoenbL5
+QSo69wFZRTQRoJsrJnTdrPTsfc7SpclUns16yUzy5d7l8kGAWoFLFfAMdO1WZ241
+qZ76LzD/ZB5T/fBYfuSv8sGv1ocas5CkT0aifuf225lELIjxGwVSausIB5zeUB/1
+3BxdeZGfbBsb7uL0+z8Hp41AhrS81P3VyCZDiMKBqTEVcrjzGeqqx10xbvB1amyX
+qQRnwTSY7jO6noILmxZfTHhLDwSehsWGAlZGlQOvSFoLYlB5rurvPB50qxU3c8iT
+8VHtyXV+Db9rSy/2GxrAdMg/gF4naVgcMl+urpGgqU5fB63gKbAM6paGbhQ8MO/X
+7oA+Se7poXtkkfir557IpW6jpMMLthA9M+tI+GiKUzoX3mfZg+cTFBJtIEnHsocU
+u/Iz0/Hi4Y9Ict3JeWEtvIBXjOuR4hr0qAxdZvwfmG2FZTkbx2xU2bzclOOtjjjl
+OCLQUs+A9WQwqdCfPsxL
+=Jt0P
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.21.0.ebuild b/sys-apps/busybox/busybox-1.21.0.ebuild
index 889067e9a2cb..2a94485712f1 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.6 2013/02/19 01:42:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.7 2013/02/27 05:44:01 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -51,7 +51,12 @@ busybox_config_option() {
 }
 
 busybox_config_enabled() {
-	grep "^CONFIG_$1=y" -q .config
+	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() {
@@ -61,7 +66,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
@@ -224,6 +229,15 @@ src_install() {
 		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)
+		insinto "${path%/*}"
+		newins 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
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 3dce51d8f69c..a5b7eb34005c 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.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-9999.ebuild,v 1.12 2013/02/19 01:42:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.13 2013/02/27 05:44:01 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -51,7 +51,12 @@ busybox_config_option() {
 }
 
 busybox_config_enabled() {
-	grep "^CONFIG_$1=y" -q .config
+	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() {
@@ -224,6 +229,15 @@ src_install() {
 		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)
+		insinto "${path%/*}"
+		newins 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