fix dependencies and sync live ebuild

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)

3 files changed, 22 insertions, 32 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index 7b40d1c143ed..1b7d745c1276 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,10 @@
 # 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.104 2014/08/17 18:16:53 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.105 2014/08/18 19:02:25 williamh Exp $
+
+  18 Aug 2014; William Hubbs <williamh@gentoo.org> udev-init-scripts-27.ebuild,
+  udev-init-scripts-9999.ebuild:
+  fix dependencies and sync live ebuild
 
 *udev-init-scripts-27 (17 Aug 2014)
 
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild
index c3071e976f46..4c8a24721736 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-27.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-27.ebuild,v 1.1 2014/08/17 18:16:53 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild,v 1.2 2014/08/18 19:02:25 williamh Exp $
 
 EAPI=5
 
@@ -23,18 +23,17 @@ IUSE=""
 
 RESTRICT="test"
 
-COMMON_DEPEND=">=virtual/udev-180
-	!<sys-fs/udev-186"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/openrc-0.13"
+RDEPEND=">=virtual/udev-180
+	!<sys-fs/udev-186
+	!<sys-apps/openrc-0.13"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch_user
 }
 
 pkg_postinst() {
-	# Add udev and udev-mount to the sysinit runlevel automatically if this is
+	# Add udev 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
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 8bded0b1a1c2..901f34bf82cc 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,16 +1,19 @@
 # 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.28 2014/04/05 10:58:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.29 2014/08/18 19:02:25 williamh Exp $
 
 EAPI=5
 
-inherit eutils
-
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
-	inherit git-2
+	inherit git-r3
+else
+	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
 
+inherit eutils
+
 DESCRIPTION="udev startup scripts for openrc"
 HOMEPAGE="http://www.gentoo.org"
 
@@ -18,15 +21,11 @@ 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"
+	!<sys-fs/udev-186
+	!<sys-apps/openrc-0.13"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -34,7 +33,7 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	# Add udev and udev-mount to the sysinit runlevel automatically if this is
+	# Add udev 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
@@ -43,13 +42,9 @@ pkg_postinst() {
 		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
+	# Warn the user about adding udev to their sysinit runlevel
 	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
 		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev ]]; then
 			ewarn
@@ -59,14 +54,6 @@ pkg_postinst() {
 			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]" && \