Remove net.sh and 90-network.rules because they are now part of >=net-misc/netifrc-0.2.1 wrt #487922. This is temporary -r1 until 27 (and git) has been sorted out to prevent file collision.

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

3 files changed, 108 insertions, 4 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index e11e5366da4b..b50e33a29614 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,14 @@
 # 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.86 2014/01/18 05:16:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.87 2014/03/05 18:59:49 ssuominen Exp $
+
+*udev-init-scripts-26-r1 (05 Mar 2014)
+
+  05 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +udev-init-scripts-26-r1.ebuild, udev-init-scripts-26.ebuild:
+  Remove net.sh and 90-network.rules because they are now part of >=net-
+  misc/netifrc-0.2.1 wrt #487922. This is temporary -r1 until 27 (and git) has
+  been sorted out to prevent file collision.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> udev-init-scripts-26.ebuild,
   udev-init-scripts-9999.ebuild:
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild
new file mode 100644
index 000000000000..28f5ba3cc05b
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild
@@ -0,0 +1,92 @@
+# 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-r1.ebuild,v 1.1 2014/03/05 18:59:49 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"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=">=virtual/udev-180
+	!<sys-fs/udev-186"
+
+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 [[ -x "${ROOT}"etc/init.d/udev \
+			&& -d "${ROOT}"etc/runlevels/sysinit ]]
+		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 ]]
+		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 [[ -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-26.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild
index 1e29e5a1c9b3..b6d6e26c6082 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-26.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-26.ebuild,v 1.15 2014/01/18 05:16:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild,v 1.16 2014/03/05 18:59:49 ssuominen Exp $
 
 EAPI=5
 
@@ -25,8 +25,12 @@ fi
 
 RESTRICT="test"
 
-DEPEND="virtual/pkgconfig"
-RDEPEND=">=virtual/udev-180
+# net.sh and 90-network.rules are part of >=net-misc/netifrc-0.2.1:
+COMMON_DEPEND="!>=net-misc/netifrc-0.2.1"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/udev-180
 	!<sys-fs/udev-186"
 
 src_prepare()