Synchronize use of ROOT

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

3 files changed, 33 insertions, 47 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index 0c5a3562d53b..892a8b38f09c 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,11 @@
 # 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.92 2014/04/03 19:16:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.93 2014/04/05 10:58:31 ssuominen Exp $
+
+  05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  udev-init-scripts-26-r2.ebuild, udev-init-scripts-9999.ebuild:
+  Use ${ROOT%/} instead of ${ROOT}, synchronize coding style of 'then',
+  and remove useless quoting inside of [[ to match sys-fs/udev
 
 *udev-init-scripts-26-r2 (03 Apr 2014)
 
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
index 8e5db1b04e80..6872ea727b2b 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.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-r2.ebuild,v 1.1 2014/04/03 19:16:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild,v 1.2 2014/04/05 10:58:31 ssuominen Exp $
 
 EAPI=5
 
@@ -30,45 +30,36 @@ RDEPEND=">=virtual/udev-180
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare()
-{
+src_prepare() {
 	epatch_user
 }
 
-src_install()
-{
+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()
-{
+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
+	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
+		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
+		if [[ -x ${ROOT%/}/etc/init.d/udev-mount ]]; then
 			ln -s /etc/init.d/udev-mount \
-				"${ROOT}"etc/runlevels/sysinit/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
+	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,"
@@ -76,8 +67,7 @@ pkg_postinst()
 			ewarn "Run this command:"
 			ewarn "\trc-update add udev sysinit"
 		fi
-		if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]]
-		then
+		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,"
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 1cd87b817c19..8bded0b1a1c2 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.27 2014/04/03 19:16:01 ssuominen Exp $
+# $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 $
 
 EAPI=5
 
@@ -29,37 +29,29 @@ RDEPEND=">=virtual/udev-180
 	!<sys-fs/udev-186"
 DEPEND="${RDEPEND}"
 
-src_prepare()
-{
+src_prepare() {
 	epatch_user
 }
 
-pkg_postinst()
-{
+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
+	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
+		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
+		if [[ -x ${ROOT%/}/etc/init.d/udev-mount ]]; then
 			ln -s /etc/init.d/udev-mount \
-				"${ROOT}"etc/runlevels/sysinit/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
+	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,"
@@ -67,8 +59,7 @@ pkg_postinst()
 			ewarn "Run this command:"
 			ewarn "\trc-update add udev sysinit"
 		fi
-		if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]]
-		then
+		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,"