Fix the live ebuild to remove /etc/conf.d/net.example and

  /etc/conf.d/wireless.example if they have not been modified and to add
  comments to them advising that they are obsolete if they have.
  This closes #291254.
Package-Manager: portage-2.2_rc49/cvs/Linux i686

3 files changed, 40 insertions, 4 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index d8089ce0d8d9..3d1524141838 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.91 2009/10/31 01:04:54 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.92 2009/11/08 19:43:41 williamh Exp $
+
+  08 Nov 2009; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+  Fix the live ebuild to remove /etc/conf.d/net.example and
+  /etc/conf.d/wireless.example if they have not been modified and to add
+  comments to them advising that they are obsolete if they have.
+  This closes #291254.
 
   31 Oct 2009; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
   removed dev spaces from src_uri
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9eb1079619c5..d8bb26896f66 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -18,6 +18,6 @@ DIST openrc-0.5.2.tar.bz2 153419 RMD160 a2c5e11e1df7325c4e9678cabee62d1168c8bff7
 EBUILD openrc-0.4.3-r4.ebuild 11196 RMD160 534248be8b72b188c2183b84f7658d93e3b43a0f SHA1 ea7174eccc245368139f6315fd675c04c90b14ac SHA256 f67aa1cdd9638fbf86dd3b85c96b2fb71cc60d0905dfc42916707457d09c2347
 EBUILD openrc-0.5.2-r1.ebuild 12008 RMD160 d83125ec521333169fcdc4c2fabf25814526cba7 SHA1 d8f74de48eb2b468ad114ef2b6d105cd55a00f2b SHA256 5a0ca85a763c76a1b0fb999fc5597bbae142d91c691f828c384aee83afb58393
 EBUILD openrc-0.5.2.ebuild 12005 RMD160 51371542eb2aca18b2d49d0341994b174fb8ac97 SHA1 8b813caae5c975f0bc436a08ad80fc2c9e70368b SHA256 58679bf0cff94d02318eac2a12ad9c23d6f69bc698189facafac07e636a9366c
-EBUILD openrc-9999.ebuild 11873 RMD160 2320f2e6c1aee16ca0d3a8ea71f5a2ff32299f05 SHA1 99dc8ae0a7a7ed6b675c118902b064c08ab372cd SHA256 7baae27de15c5d150b901bd600ffe3487398600c2e5c2d9463017ca5812dfe91
-MISC ChangeLog 18579 RMD160 818e7bd01ee4adcb262a3a624e058808cbfcac87 SHA1 98758f30f60e5e3b62564bd18238e9b82b4e09c2 SHA256 f76849e4368aa714c4567ca9053cea3793ce3915103c8873cc50d68892817f21
+EBUILD openrc-9999.ebuild 13080 RMD160 f81daa937c32a3441f201b7591ad8036f04d22a4 SHA1 29ee78b3e4e24ae1d3e4a770a20c811a126863f7 SHA256 4a8aa896d13bfdc617261c82bcc059572f55cde62548192bbecbfd92da81203e
+MISC ChangeLog 18872 RMD160 1ef5da604a5dcdf9ace4a2ed7680c668cd8fe49a SHA1 608afd8e1902df39cb476aa4d714989d01ed7720 SHA256 75f3eb33e3c1c03c9bfee3bad3e9387825839e22cfd202de6ebaba1265589a5a
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index bb6e8bb4f3f1..75c55225cb76 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.61 2009/10/31 01:04:54 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.62 2009/11/08 19:43:41 williamh Exp $
 
 EAPI="1"
 
@@ -354,6 +354,36 @@ pkg_postinst() {
 	# update the dependency tree bug #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
 
+	# /etc/conf.d/net.example is no longer valid
+	local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
+	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
+	if [[ -e "${NET_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
+			rm -f "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} should be removed."
+		fi
+		elog "The new version is in ${ROOT}/usr/share/${PF}/net.example"
+	fi
+
+	# /etc/conf.d/wireless.example is no longer valid
+	local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example"
+	local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
+	if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
+			rm -f "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
+		fi
+		elog "If you are using the old style network scripts,"
+		elog "Configure wireless settings in ${ROOT}/etc/conf.d/net"
+		elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example"
+	fi
+
 	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
 		ewarn "/etc/modules.autoload.d is no longer used.  Please convert"
 		ewarn "your files to /etc/conf.d/modules and delete the directory."