version bump and sync live ebuild

(Portage version: 2.2.0_alpha120/cvs/Linux i686)

1 files changed, 12 insertions, 40 deletions

diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 64a94f29f23c..b0a777fb2da7 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.8 2012/05/03 03:03:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.9 2012/08/01 17:15:24 williamh Exp $
 
 EAPI=4
 
@@ -22,10 +22,10 @@ if [ "${PV}" != "9999" ]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-DEPEND="!<sys-fs/udev-182"
-RDEPEND="${DEPEND}
-	>=sys-fs/udev-182
-	sys-apps/openrc"
+DEPEND=""
+RDEPEND=">=sys-fs/udev-187
+	sys-apps/openrc
+	!<sys-fs/udev-186"
 
 src_compile()
 {
@@ -34,58 +34,30 @@ src_compile()
 
 pkg_postinst()
 {
-	local enable_postmount=false
-
-	# FIXME: inconsistent handling of init-scripts here
-	#  * udev is added to sysinit in openrc-ebuild
-	#  * we add udev-postmount to default in here
-	#
-
 	# If we are building stages, add udev to the sysinit runlevel automatically.
 	if use build
 	then
-		if [[ -x "${ROOT}"/etc/init.d/udev  \
+		if [[ -x "${ROOT}"/etc/init.d/udev \
 			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
 		then
 			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
 		fi
-		enable_postmount=true
 	fi
 
 	# migration to >=openrc-0.4
-	if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
+	if [[ -e "${ROOT}"/etc/runlevels/sysinit \
+		&& ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
 	then
 		ewarn
 		ewarn "You need to add the udev init script to the runlevel sysinit,"
-		ewarn "else your system will not be able to boot"
+		ewarn "otherwise your system will not be able to boot"
 		ewarn "after updating to >=openrc-0.4.0"
 		ewarn "Run this to enable udev for >=openrc-0.4.0:"
 		ewarn "\trc-update add udev sysinit"
 		ewarn
 	fi
 
-	# add udev-postmount to default runlevel instead of that ugly injecting
-	# like a hotplug event, 2009/10/15
-
-	# already enabled?
-	[[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
-
-	[[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
-	[[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
-
-	if $enable_postmount
-	then
-		local initd=udev-postmount
-
-		if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
-			[[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
-		then
-			ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
-			elog "Auto-adding '${initd}' service to your default runlevel"
-		fi
-	else
-		elog "You should add the udev-postmount service to default runlevel."
-		elog "Run this to add it:"
-		elog "\trc-update add udev-postmount default"
-	fi
+	ewarn "The udev-postmount service has been removed because the reasons for"
+	ewarn "its existance have been removed upstream."
+	ewarn "Please remove it from your runlevels."
 }