If /etc/runlevels/sysinit is missing when we are installing for the first time, create the directory. This way we don't have to pull in sys-apps/openrc as a dependency, and sys-apps/systemd can continue to depend on this package unconditionally wrt #487080

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 114 insertions, 8 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index c1a3eee439b5..0c5a3562d53b 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/udev-init-scripts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.91 2014/04/03 18:37:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.92 2014/04/03 19:16:01 ssuominen Exp $
+
+*udev-init-scripts-26-r2 (03 Apr 2014)
+
+  03 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +udev-init-scripts-26-r2.ebuild, udev-init-scripts-9999.ebuild:
+  If /etc/runlevels/sysinit is missing when we are installing for the first
+  time, create the directory. This way we don't have to pull in sys-apps/openrc
+  as a dependency, and sys-apps/systemd can continue to depend on this package
+  unconditionally wrt #487080
 
   03 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   udev-init-scripts-26-r1.ebuild, udev-init-scripts-26.ebuild,
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild
new file mode 100644
index 000000000000..8e5db1b04e80
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 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-26-r2.ebuild,v 1.1 2014/04/03 19:16:01 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils udev
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
+	inherit git-2
+fi
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+RESTRICT="test"
+
+RDEPEND=">=virtual/udev-180
+	!<sys-fs/udev-186"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare()
+{
+	epatch_user
+}
+
+src_install()
+{
+	default
+
+	# These are now part of >=net-misc/netifrc-0.2.1:
+	rm -f "${D}"/$(get_udevdir)/{net.sh,rules.d/90-network.rules}
+}
+
+pkg_postinst()
+{
+	# Add udev and udev-mount to the sysinit runlevel automatically if this is
+	# the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		if [[ ! -d "${ROOT}"etc/runlevels/sysinit ]]
+		then
+			mkdir -p "${ROOT}"etc/runlevels/sysinit
+		fi
+		if [[ -x "${ROOT}"etc/init.d/udev ]]
+		then
+			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+		fi
+		if [[ -x "${ROOT}"etc/init.d/udev-mount ]]
+		then
+			ln -s /etc/init.d/udev-mount \
+				"${ROOT}"etc/runlevels/sysinit/udev-mount
+		fi
+	fi
+
+	# Warn the user about adding the scripts to their sysinit runlevel
+	if [[ -e "${ROOT}"etc/runlevels/sysinit ]]
+	then
+		if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev ]]
+		then
+			ewarn
+			ewarn "You need to add udev to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev sysinit"
+		fi
+		if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]]
+		then
+			ewarn
+			ewarn "You need to add udev-mount to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev-mount sysinit"
+		fi
+	fi
+
+	if ! has_version "sys-fs/eudev[rule-generator]" && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		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."
+	fi
+}
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 a7cd6f1a3325..1cd87b817c19 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-2014 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.26 2014/04/03 18:37:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.27 2014/04/03 19:16:01 ssuominen Exp $
 
 EAPI=5
 
@@ -25,8 +25,7 @@ fi
 
 RESTRICT="test"
 
-RDEPEND="sys-apps/openrc
-	>=virtual/udev-180
+RDEPEND=">=virtual/udev-180
 	!<sys-fs/udev-186"
 DEPEND="${RDEPEND}"
 
@@ -41,13 +40,15 @@ pkg_postinst()
 	# the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]
 	then
-		if [[ -x "${ROOT}"etc/init.d/udev \
-			&& -d "${ROOT}"etc/runlevels/sysinit ]]
+		if [[ ! -d "${ROOT}"etc/runlevels/sysinit ]]
+		then
+			mkdir -p "${ROOT}"etc/runlevels/sysinit
+		fi
+		if [[ -x "${ROOT}"etc/init.d/udev ]]
 		then
 			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
 		fi
-		if [[ -x "${ROOT}"etc/init.d/udev-mount \
-			&& -d "${ROOT}"etc/runlevels/sysinit ]]
+		if [[ -x "${ROOT}"etc/init.d/udev-mount ]]
 		then
 			ln -s /etc/init.d/udev-mount \
 				"${ROOT}"etc/runlevels/sysinit/udev-mount