adjustments for separating netifrc: add a temporary pdepend with a use flag to bring it in and add warnings about both network use flags missing.

Package-Manager: portage-2.2.0/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 28 insertions, 32 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index a42c5079f575..90ad86dd00d5 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.271 2013/08/11 06:56:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.272 2013/08/14 03:56:38 williamh Exp $
+
+  14 Aug 2013; William Hubbs <williamh@gentoo.org> metadata.xml,
+  openrc-9999.ebuild:
+  adjustments for separating netifrc: add a temporary pdepend with a use flag to
+  bring it in and add warnings about both network use flags missing.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> openrc-0.11.8.ebuild,
   openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 3050f7178dd3..8706499b9701 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,17 +9,13 @@ AUX openrc.logrotate 71 SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7
 AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb WHIRLPOOL 4abc9f051155a62d3033258a06003a4ca3909d8104deca84d5c1605bc1c7e56167fd82b2b4b72fe7b707070de98a7628730de1ad3f14b924b5b1480fba5ef854
 DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c
 EBUILD openrc-0.11.8.ebuild 16313 SHA256 d4b00e3e986de2b8d9f47d81a3ba735485243af2ae8425f7d29b52e3d1071e24 SHA512 e8dd911b0b2336486275a13238e2a1cbe2d4a84e6d96e405da9581ec67cb0aed50735ae61e79ce5d742a38756061386a0319835e4aa416543f3aed7ea7143fc5 WHIRLPOOL 55bf4ef9c4d95731f827dd23decd8cea10ce333693965e004f7f14c9309228f51936b9f61377966aae2cae04faeb4cf85ddb02d18e18bc90afdb757d8f069d45
-EBUILD openrc-9999.ebuild 9989 SHA256 9a3e9e55ac0a7c1fa6f5c5dd816578fe739be9682d9d0fd7f12f98143c3ac9f2 SHA512 a0952de7d3102b9f40825810bc7de99670e94b0b95af4b37639711c46e942672a1acb5a2f74eb51050f052a3b9a5a72aec950d518440a61eb750d63271341f35 WHIRLPOOL 951c38f31fb5880a650b65b2a81a740457a63309a9f6b757baa7babd9446b0dfa685dfcf3cac695fe16ec19db7b15336f463b9f869dad764526de4b444dbd21a
-MISC ChangeLog 45896 SHA256 3466fbd621136eb219423fb1d1bee80ef93a289520c21b882e0d3ccffce6cfa2 SHA512 0aad48e7943e0af5a748966617abb4a25cd88f8dbd2f1b8d643d5004a989089cf153a2871b9c61c77a9e444f615132a25ac4ee7e2c91182484ed6087ea8e151b WHIRLPOOL e813ff202350b08b84ae6a23993d318177d7c8b035f61176db8dc872105ad05b75b5bfb09a507e574734eff5ec36a5cc6939bb9f05bcb4cf5573b97048c0bc69
-MISC metadata.xml 297 SHA256 85cd033d330fb2c67dbe209ef1bd6728ee39e434c3ebdb0453de361163af72ea SHA512 eb5abc5aab84528c2e4e5a4d2e7f5db1a026b8f4acaaec81cb65b3897f4f610e32af87b4f833fb7111c9d6856c5b0bf6dd5c0f8b1f2a96c88bd8625bbd2fa9eb WHIRLPOOL d086011ded5e7af75e900e96da92a7eca60635a64831aad5024eacf0b33000735eeaaf59e32e88e45f1c908ebeeba43307cf21b00add39e28700128c10a6fa73
+EBUILD openrc-9999.ebuild 9911 SHA256 b1b87fefb38fee4e7bee70c7e04ae4a11203f2bb6a818401ad1e25fc2312d277 SHA512 15f691dc6e4259f622b862bbba0ffedef2893da0e8b9b89a30dd25d98e5147c5d4d5374e3cd591a9ad07d8d4ff291ab479eae4e1969c05eb1bc36fe3433af47b WHIRLPOOL 6bce9207f86c2f83852e0feaadc5e094b4a4b560e0af5701ee79992daa904ff77616bde436ca11a16a0ad9e6b256ce5ac45eb1f2c1a5b4cf4878887c9f208738
+MISC ChangeLog 46133 SHA256 165027b11882aa51a3d02aa2aeaca6e64164d0255a4da0ae3058d4d73ca41b77 SHA512 83935a589bdd3db982bde308954f2bb2c2bca9b2a4000a5fdfc63dd64554895b731f1cf5f445ec64c2d0e6f3fc5db89ed33b0bac0f1b7ccdb9f351f6f7a6c80f WHIRLPOOL 8c1c7e7622bbb132f8227678ab20c8044de27d1b1f9ca6910fc49feb10da4743c712b8f7cc9edbf1c766edb48f40ef29f7f560acb2059d536cab00ca77d9ad46
+MISC metadata.xml 373 SHA256 02f4a9ad32e00c6c046a55dd14949c4b5a3b9a8f5d4725aa07c698c107bbc1cf SHA512 80d1f2a14cddd37e7d8866ff556c753e631eca6239c0474f8a067bf387778e702a8d15152b1324744110b2f5972c2e2858eb195f8448001f322e19acc589e033 WHIRLPOOL 8a8176f52fd07682ee407923e956962ded7ce45f1b9b535e80b84195f6407954f504c44dc1b0f2cb2af8ed8a84a1e8b4cd5dc956163431c59bbc1f7785fb9151
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSBzUjAAoJEEdUh39IaPFN1ssH/2qXjwfRt7RCUTUvcFWbqjyx
-HkrNvBLIfmlEP7q/hZUWSjedg2o7id5506Z3sTDlt8/7VHN2FuCxoHCqKJKSBh2R
-oTJiECo5pSyRq3OWIfakxrQ/gws3eHTDbPC4guIlNQfvHT1xt8yScFl1EXbLDzoD
-OMuOgb6gBs3S60+9LKTlc+s0BcTac/yLYI39YY3GoMA3WjQTIqCqturIITV0d3Gm
-r51FlD/bWnNDzPElJEQS4sPuFgcbkRSyec8nefn92Kra7paFPJ6rhqAtjlTi/cZs
-xgIbJj1FXWSNiFz1p4rZjjOWiWYglvW511iBoXp04Y4icpMAm063WM4BZy2qq0Q=
-=i8YY
+iEYEAREIAAYFAlILARUACgkQblQW9DDEZTjLVACgsapyWzSTnixZl7ZKyTRj0axc
+tRIAoKOjzuaaEop48VrqHTbkveYaDxAq
+=efvG
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index 6222e313b3ff..00439362b480 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>openrc</herd>
 	<use>
+		<flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
 		<flag name="newnet">enable the new network stack (experimental)</flag>
 		<flag name="tools">build optional tools</flag>
 	</use>
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 55ff188ef2e4..30e2691c5e08 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-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/openrc/openrc-9999.ebuild,v 1.125 2013/08/11 06:56:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.126 2013/08/14 03:56:38 williamh Exp $
 
 EAPI=5
 
@@ -19,8 +19,8 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs tools
-	unicode kernel_linux kernel_FreeBSD"
+IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+	tools unicode kernel_linux kernel_FreeBSD"
 
 COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
 	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
@@ -43,9 +43,10 @@ RDEPEND="${COMMON_DEPEND}
 		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
 	)"
 
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
 src_prepare() {
 	sed -i 's:0444:0644:' mk/sys.mk || die
-	sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
 
 	if [[ ${PV} == "9999" ]] ; then
 		local ver="git-${EGIT_VERSION:0:6}"
@@ -119,9 +120,6 @@ src_install() {
 	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
 	rm -rf "${ED}"/etc/runlevels
 
-	# Install the default net configuration
-	doconfd conf.d/net
-
 	# Setup unicode defaults for silly unicode users
 	set_config_yes_no /etc/rc.conf unicode use unicode
 
@@ -178,14 +176,6 @@ add_boot_init_mit_config() {
 pkg_preinst() {
 	local f LIBDIR=$(get_libdir)
 
-	# default net script is just comments, so no point in biting people
-	# in the ass by accident.  we save in preinst so that the package
-	# manager doesnt go throwing etc-update crap at us -- postinst is
-	# too late to prevent that.  this behavior also lets us keep the
-	# file in the CONTENTS for binary packages.
-	[[ -e "${EROOT}"etc/conf.d/net ]] && \
-		cp "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/
-
 	# avoid default thrashing in conf.d files when possible #295406
 	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
 		(
@@ -276,14 +266,18 @@ pkg_postinst() {
 	# update the dependency tree after touching all files #224171
 	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
 
-	if use newnet; then
-		local netscript=network
-	else
-		local netscript=net.lo
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+	ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+	ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+	ewarn "Or, you have the option of emerging openrc with the newnet"
+	ewarn "use flag and configuring /etc/conf.d/network and"
+	ewarn "/etc/conf.d/staticroute if you only use static interfaces."
 	fi
 
-	if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then
-		ewarn "Please add the $netscript script to your boot runlevel"
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
 		ewarn "as soon as possible. Not doing so could leave you with a system"
 		ewarn "without networking."
 	fi