Try to auto-detect on update, if the old version had udev enabled, and add it to sysinit runlevel if yes.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r1 i686

4 files changed, 62 insertions, 9 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index aad4fddbe90c..5541007dddde 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.48 2008/12/17 21:41:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.49 2008/12/19 22:19:24 zzam Exp $
+
+  19 Dec 2008; Matthias Schwarzott <zzam@gentoo.org> openrc-0.4.0.ebuild,
+  openrc-9999.ebuild:
+  Try to auto-detect on update, if the old version had udev enabled, and add
+  it to sysinit runlevel if yes.
 
   17 Dec 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.3.0-r1.ebuild,
   openrc-0.4.0.ebuild, openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index d1df82a77d55..4804bcf0414c 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -18,14 +18,14 @@ AUX 9999/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1
 DIST openrc-0.3.0.tar.bz2 145599 RMD160 ca45de6f222060a24542663fff343b84b870e72b SHA1 2fcac5cb7586b407714700b8325b8c3d705aa2cd SHA256 857a038dc123ae67bff7afee3137a292e03f0b7a3999fd9f150f6a75119cdd1a
 DIST openrc-0.4.0.tar.bz2 144297 RMD160 e41e9d75e104bd04fa64291f9b520235ea4c6fbc SHA1 5dc4fbc45363234a0f4ea3ede5beb3af8273a381 SHA256 1aa7210e7c52c6eb2398de359e852713f46e303ec8b8e748cdbb0cf75725ee76
 EBUILD openrc-0.3.0-r1.ebuild 9039 RMD160 f29f86e9ef54b08998bb9fa73674427c5ada7423 SHA1 b38cda65d80d5327cd2e9f49128e72559e9cc2c1 SHA256 c52156c84ccb363804c9227ad7cc331a61ce931e77e4e0fffdae2b77f6021443
-EBUILD openrc-0.4.0.ebuild 9490 RMD160 2439c4b9eb1191abf11d54ad0729cdd344c552e1 SHA1 03068c96f0bca20970f326352d7a85f6da00e406 SHA256 05136415b24f2accb15233c74a5dfabf0614b13803e656e9c7afbfe8cbda0ef5
-EBUILD openrc-9999.ebuild 9261 RMD160 faa8adecbadeb7c988d129361883660d10679042 SHA1 ca792175ceb64a346747ca5ad5d5084f4f4c7165 SHA256 b8e05cbcc04992a6a4edee7994af8641357cb6819791c36b9cad68913a84255b
-MISC ChangeLog 9322 RMD160 fc363ef171f94b50030d6d40a8dfad852d14d245 SHA1 a9e7b1707993fbc84245e283c1aed257adac2ad1 SHA256 3896c40e91650a9b1c428258444f7390e43533d030de96b4c345e2ff1dedc445
+EBUILD openrc-0.4.0.ebuild 10166 RMD160 6c401ae5d2caebdffdff42aad8254fc0e4583869 SHA1 dc6613720db7be736c3ba84ca1ead1af8c983cb6 SHA256 dd9eeef72ea627195d94535738a650f31da2ec7cf90488989e40eb5d33fa38f6
+EBUILD openrc-9999.ebuild 9937 RMD160 177a1210df9c10de3336c0da2d354b8a85b520d1 SHA1 7b5e417804bd164e914563c31c75b2dda0996221 SHA256 3b00f23035e19d2d191507e0828947b0d15e33f7af1337505201973276929603
+MISC ChangeLog 9527 RMD160 7c29da579b5013ae01eb1eaebe81d3dea37cf00e SHA1 3eeb084f4374e05f37a3e5d094cf1ce63e666159 SHA256 8f0b4ce45fab99ea21fa160e348625d2524ce57700035bd8af75f15ff991732e
 MISC metadata.xml 231 RMD160 c39b780fbbb9eb38f1ba1a0ee134231ca8e7449c SHA1 d5a4c0d0c7641c862b43e742f832bab6c69482d8 SHA256 02e8fa3806efbc7cea8bc78653397b8d59b398faca8bcfd3aabb216103cd8f4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklJcisACgkQoeSe8B0zEfw1XQCeK6h5ZdNs2eXwibB+FS5X7RPj
-NL0AnRpnlSnrgAKmbqkRojoHXRfFFnvM
-=ZsAC
+iEYEARECAAYFAklMHfMACgkQt2vP6XvVdOeQFgCfdJzIhN9QI7kvRRL0z80vhqjp
+dQwAnjFEX68e91ndu9HLuJyUroGKfDtf
+=/RP1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.4.0.ebuild b/sys-apps/openrc/openrc-0.4.0.ebuild
index 6849e7e3e2d5..353223552504 100644
--- a/sys-apps/openrc/openrc-0.4.0.ebuild
+++ b/sys-apps/openrc/openrc-0.4.0.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.4.0.ebuild,v 1.2 2008/12/17 21:41:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.0.ebuild,v 1.3 2008/12/19 22:19:24 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -174,6 +174,25 @@ pkg_preinst() {
 	# termencoding was added in 0.2.1 and needed in boot
 	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
 
+	# openrc-0.4.0 no longer loads the udev addon
+	enable_udev=0
+	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
+		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
+		! has_version ">=sys-apps/openrc-0.4.0"
+	then
+		# make sure udev is in sysinit if it was enabled before
+		local rc_devices=$(
+			[[ -f /etc/rc.conf ]] && source /etc/rc.conf
+			[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+			echo "${rc_devices:-${RC_DEVICES:-auto}}"
+		)
+		case ${rc_devices} in
+			udev|auto)
+				enable_udev=1
+				;;
+		esac
+	fi
+
 	# skip remaining migration if we already have openrc installed
 	has_version sys-apps/openrc && return 0
 
@@ -272,6 +291,11 @@ pkg_postinst() {
 		fi
 	fi
 
+	if [[ "$enable_udev" = 1 ]]; then
+		elog "Auto adding udev init script to the sysinit runlevel"
+		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+	fi
+
 	# update the dependency tree bug #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
 
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 73872f1c987f..6533b932242b 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.40 2008/12/17 21:41:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.41 2008/12/19 22:19:24 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -170,6 +170,25 @@ pkg_preinst() {
 		fi
 	done
 
+	# openrc-0.4.0 no longer loads the udev addon
+	enable_udev=0
+	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
+		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
+		! has_version ">=sys-apps/openrc-0.4.0"
+	then
+		# make sure udev is in sysinit if it was enabled before
+		local rc_devices=$(
+			[[ -f /etc/rc.conf ]] && source /etc/rc.conf
+			[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+			echo "${rc_devices:-${RC_DEVICES:-auto}}"
+		)
+		case ${rc_devices} in
+			udev|auto)
+				enable_udev=1
+				;;
+		esac
+	fi
+
 	# skip remaining migration if we already have openrc installed
 	has_version sys-apps/openrc && return 0
 
@@ -266,6 +285,11 @@ pkg_postinst() {
 		fi
 	fi
 
+	if [[ "$enable_udev" = 1 ]]; then
+		elog "Auto adding udev init script to the sysinit runlevel"
+		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+	fi
+
 	# update the dependency tree bug #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u