fix #217848 while retaining intended behavior

Package-Manager: portage-2.2_pre5

4 files changed, 30 insertions, 9 deletions

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 363eed19cc61..94e38c24b3b3 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -11,15 +11,15 @@ AUX openrc-0.2.1-openvz-support.patch 1811 RMD160 00e34172d2de8bc40bf8bb3d182c05
 AUX openrc-0.2.1-respect-fastboot.patch 1052 RMD160 2be0b1d912a8e7c9555ef25bcfa2559d2d5fd0d3 SHA1 2b206580e050fccfe59cb572a7177f437489a69c SHA256 1f24f2a804113d9b23f3277e77d2364ea21fd2ab85f01b258afb03b2ca3adddf
 DIST openrc-0.2.1.tar.bz2 141896 RMD160 67dfc4362181bd4d80c962209881aad3163cbee7 SHA1 f20729300d463a682cdb297c2c859c6e36f7e535 SHA256 226b75499e0220148ceedce76fc649bceb4a7fd52e5eb344d0ff149a4876e752
 DIST openrc-0.2.2.tar.bz2 142186 RMD160 50c54259e8824306f353f3bdc784c81ff075d1ba SHA1 60cac0ab72743b821b28b330e732b96d6170d63e SHA256 10b4ecff9b58e2d60d357a4d09770698c30d7031cd128d1b9f53a080f0df54e6
-EBUILD openrc-0.2.1-r2.ebuild 8734 RMD160 89729393aaaba17d6cde0d30c5c4b8d222d1cf47 SHA1 07437badb678fe7fb108592dceaf72b71a8788b8 SHA256 ab36d5e498c9455435851a9fe508e54e218ab7146e453e027a4e9fb201d7a39c
-EBUILD openrc-0.2.2.ebuild 8450 RMD160 a8f1918fe72b2154cd451a163e894022200808ef SHA1 7a52a3ec8c97d8703fdbd683538d49d08db05537 SHA256 9d36e0212880865a3f8a85ba8d74bb884761144a6e1f359b4877f74e2f5fefa2
-EBUILD openrc-9999.ebuild 8228 RMD160 ba3bbbc7a074d355a1d7e7ae6668901fbd89c6a6 SHA1 9b7d100fad0277dbc0064cc6cd5921553505cad8 SHA256 5dbf4e1e68cac267bf089a21489a15f8bbae0c2eb85f231c6c357c4f366c1b59
+EBUILD openrc-0.2.1-r2.ebuild 9029 RMD160 a212733cd41384ce59944c35a0aea25d6825cca7 SHA1 9b85d3b8864af851c5fa6292d0e6a80d21696bf8 SHA256 832a013292fe7f277f9c4d6e62d5b54a437eeb4542ad2208072a29c68483b3b8
+EBUILD openrc-0.2.2.ebuild 8745 RMD160 f463c4524b6d659af1275120d4645ebcd53994b0 SHA1 c4abaf7a7276efea9646118e1a598b4a7af025e4 SHA256 2c12add1d60baeb9e80d97cc4a4578639b1b727554d53fd46c3e31a2eefd8a43
+EBUILD openrc-9999.ebuild 8523 RMD160 c5c0bfe87eee8fb4ceaaced4b8b95ea6922e6189 SHA1 f9c7dd6283b63cf90a8327ebf9f59edfdee8dd50 SHA256 6fe7194d9a50459616b433dc80f335b9b7e5155711c9f7472980c1566c709547
 MISC ChangeLog 5634 RMD160 4d0ec84d4e21992ed64aab228a808960034fb70d SHA1 dc3d8f7fee5b96474fdb8770029497c9465cee8e SHA256 9f6d2c8234f2b8ce13c05f29eb9b6b3e7b68bfa121a65645f055eb144f7555a7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIBSwkj9hvisErhMIRAkzCAJ4urYWe9lbBc2hFoq+FhSWT1TIwsACgy/FL
-tB4xaFsW+4RtlqdwqfU7PHE=
-=hy2d
+iD8DBQFIBS8Mj9hvisErhMIRAiLoAJ9twnimCM58i7s8SPVW4FwukG24YACgn9rC
+Fyuz6SK6UD0BaTxeOF97bIY=
+=ZhCi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.2.1-r2.ebuild b/sys-apps/openrc/openrc-0.2.1-r2.ebuild
index 9af33b222cd5..43304b420d7d 100644
--- a/sys-apps/openrc/openrc-0.2.1-r2.ebuild
+++ b/sys-apps/openrc/openrc-0.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1-r2.ebuild,v 1.5 2008/04/15 22:28:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1-r2.ebuild,v 1.6 2008/04/15 22:41:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -127,6 +127,11 @@ add_boot_init_mit_config() {
 pkg_preinst() {
 	local f
 
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident
+	mv "${D}"/etc/conf.d/net "${T}"/
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
+
 	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
 	local clock
 	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
@@ -250,6 +255,8 @@ pkg_postinst() {
 	# Remove old baselayout links
 	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
 
+	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
+
 	# Make our runlevels if they don't exist
 	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
 		einfo "Copying across default runlevels"
diff --git a/sys-apps/openrc/openrc-0.2.2.ebuild b/sys-apps/openrc/openrc-0.2.2.ebuild
index 7308ccc59df7..006e29c8ffb2 100644
--- a/sys-apps/openrc/openrc-0.2.2.ebuild
+++ b/sys-apps/openrc/openrc-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild,v 1.3 2008/04/15 22:28:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild,v 1.4 2008/04/15 22:41:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -121,6 +121,11 @@ add_boot_init_mit_config() {
 pkg_preinst() {
 	local f
 
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident
+	mv "${D}"/etc/conf.d/net "${T}"/
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
+
 	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
 	local clock
 	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
@@ -244,6 +249,8 @@ pkg_postinst() {
 	# Remove old baselayout links
 	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
 
+	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
+
 	# Make our runlevels if they don't exist
 	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
 		einfo "Copying across default runlevels"
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index f06a99a7b009..bb6631be5565 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.30 2008/04/15 22:28:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.31 2008/04/15 22:41:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -121,6 +121,11 @@ add_boot_init_mit_config() {
 pkg_preinst() {
 	local f
 
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident
+	mv "${D}"/etc/conf.d/net "${T}"/
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
+
 	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
 	local clock
 	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
@@ -241,6 +246,8 @@ pkg_postinst() {
 	# Remove old baselayout links
 	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
 
+	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
+
 	# Make our runlevels if they don't exist
 	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
 		einfo "Copying across default runlevels"