Synchronize use of ROOT

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 43 insertions, 57 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/Manifest b/sys-fs/udev-init-scripts/Manifest
index 54680094f977..033927d3b8bf 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 DIST udev-init-scripts-26.tar.bz2 4921 SHA256 eff4cd581cb5d57a1fa09772f9f82a37d9a33a3828f0b7e988278a974864d203 SHA512 cbf5de51c7c1f63cfb7ded47175c3dfee0483972ce966d71bb164c78d6d6818d24a1e72cbaf9c3c0dda3674e6bb3b98c53a9e8cba27a8de6176689ddd39b0d9c WHIRLPOOL 6ade24698c8b1b1e7397f494e99e67e960505d846f21e8955e0a433dcde1d5ec5f580d13d867c78c13fc4157dbb532b0a5d4c1adedcda60f2e4186936a53b72a
 EBUILD udev-init-scripts-26-r1.ebuild 2566 SHA256 23b0fded0d5da53ef6d313e22f4e8f34bf909aa8acb91deba0021fb70219f1b1 SHA512 89d1fd92a38cc2e0e258918e09b92f84e30d7bf3b88f968db4570fbf84b17459ea0192f4b34f793c060d82309336f477d5c2398ba87911ed3724a8c3aa6fc0e3 WHIRLPOOL 2e1d5852f84e25e6375a197ab84530f2c2269b75824090d6184e6683b3c59212533c4798c860add794d3b2849dfe247650d261d5bc5637cbe620763941d4e408
-EBUILD udev-init-scripts-26-r2.ebuild 2567 SHA256 99b9b50fdc3f6ad75376ac22b3bce6003804b58300399a43cd7c8ffdc8cde640 SHA512 d15a86e8b162ee0e13da79cf17bbe66dca68304be02fea0fefeb4dc8df874dc3500e99f4d2259ab6a5c959cabb5d585801117a9becb3b49f33dd7116c6944d47 WHIRLPOOL df18bb53d6bf62a3e6af9d22ad126bcc49910bf913f0560f889471741568aed1fdba3e49d2ef7f83f1486682854ad56b0adaf9340071c84d1d4ad78864d1d9f2
+EBUILD udev-init-scripts-26-r2.ebuild 2576 SHA256 05a81372c422de94376dee6dacf8487eb06999e0c0fd81cdedd668b3205abfc4 SHA512 9ec3c3b394d65114717d884100c33a2dfe76a5b8efef08598abedd5d431aa32b309abf9b39217cab0778804c8ddf8e4a4511035f0f4228ee291e657cef057686 WHIRLPOOL ec5c11e638432fb53bda8f18b9c259381c9f6e8d62e299bc4e228c74a2356648b47d16216555ebcc5831c40de229f37804d8c2ebe76602fae15a2d0a116aa9bc
 EBUILD udev-init-scripts-26.ebuild 2498 SHA256 0d13eeb8ce72172f963a9a659da4dcba7ef405002fb68c7200a287ac716bf4a5 SHA512 54ae645014fbb86817543a1f135ee587a506bfd539b839b42d401fb73b48913db24da9cf0f665650d463bc8d4becb3722f514c899048c01fd4a112c8ec5d39b1 WHIRLPOOL 736681e77ff53cc8fbb581457dcf78632760245c12f908f5ee38e43b1cc022433eaa6a4c79d53edf62c4909a2efd3aa5419db25d716e93defc674161e939961d
-EBUILD udev-init-scripts-9999.ebuild 2400 SHA256 5ac277f2b78d493c64310f2101dcbc8441128b17c12f86f3b773a3215be12a05 SHA512 2b1ffb8b36c97f6a15966028d6ae55b7eb0696a95ded90ecfeb9836e38b67b9c643f89b02ae84c518cf5cc4133280e8887195ae9d133ced930e91a319e9627ba WHIRLPOOL 9dd99270ea1a4e378c1d1a5d3f8fd30dfd1a073330616d0d95e1643ceba5ff9d6451085cf66d527efc4128e1531b85f89ea739dd37f99a6dcd459225a1d005d9
-MISC ChangeLog 14588 SHA256 b4a5f492265bea6fe2e15148e104ed9a10327047311ab7724772a532860044f0 SHA512 9b4fa1b055b416f8878c484c7ca11b6917565b36c08a7f70c2d058b1e943b39773091145a7d991b3acd8a9bce6c9faf399a6fbae9463d1f1462a9d0f186bdbe9 WHIRLPOOL 06f32e0de1aaeedc7eebf547a986742461d827b54ee7ed5054fc69cf7c79984ac989fd728b005eac0b81a645949f4999c1030ad99a56a12c18c52b4596ed9aca
+EBUILD udev-init-scripts-9999.ebuild 2409 SHA256 665cbbf90f5c686ec2872394ad3e8cd86f7f072652aa84ab2f2d12dd1bd0415f SHA512 938507cb8c449b4e40b27be783d167d75f17dfaef5c5ddc38da7cb26ab38b464f9c4d865f07e32ccc5baae9648830b48f235180183d3491caa4dcc0db572bb74 WHIRLPOOL 2bbd1574eb40d29b3c06d89b76a79d5a385431bdeb1f3a4aa39152105c3a624e1c6703acbf88e22ab40316fea99419d7f5d00dabf21f1b57b63cacf4e0b4cc1a
+MISC ChangeLog 14843 SHA256 e334c83a85c8cc42d7767479954a1b49d1af030d6f1e54940ea70380889b1bc0 SHA512 17d44b03142a65da5a93ec795fea28f71c492b59f6b9f48a2c5ced9c0a4fb85faddd83e417493d9b19de1d1a47da87eafabd4cd2b55d6782ead8468a9a501ea9 WHIRLPOOL 5fe5d88a7d996ec5d79808ee79358d5659da486a30869ffe27186329206cb8096c036e98dbac30cf29a51978ec155bc393db4a4ffe25784dcecb81ddbb62d267
 MISC metadata.xml 206 SHA256 e8bae0ea2f16b0ad92858b68718c01ab85b5e6995a35b88c74e4ad9772b9f813 SHA512 f6558663be8014488111639a4eeadc9e691f57f2eb4f3c97d6022a50ab2659fac2df458cefed5e29a6661d59221b15332aefa00c027552a8f4bbefc3988e2a90 WHIRLPOOL b515e201c4f614326c4ee0ef0e13fd9d277e913d96265ecce11b41c9628fa38d1e34f90fab1073527e153a9e2e8929c5fee748a8e5eaf98b58fe15928c8ad457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPbIjAAoJEEdUh39IaPFNmDMH/0d70SC/AkqaQqIMX5YGMq5D
-PgUYJEuOnyEv1286+MDhb3RoCJCNt90kMzb8c8VlDxyoIsP6eLr9Nrle2fUYrRxq
-1fJWb1kqPWsvlJmIbIRozN3pAUy/mZQ/lJvFSZCksNnWg+CKyBdLe+YVZ4EQoIsp
-dBINu/F98jIdLNyqrwwsBDll+n1n2Q0+xP2c1b9i6uhyBupvbADk8Wk3DZpzo6q5
-XmdjIKa3R3kIEECQSw4A1pMj7rR7oSgzgLbzFxF8XMsUBUU2uxgaluoYtyeoNkvU
-otao4kC2+qS+XBqCTgo2QLjIgqlciKuv9SkXq4l1oeDOhQWxiKJpTwk+q0FBedI=
-=mGB7
+iQEcBAEBCAAGBQJTP+CBAAoJEEdUh39IaPFN8usIAIriNtBMB64wBR+SWRVIc2/v
+tY/elp2dHAVty9IQveoSovuwL1Efb7BYEd7hWqfx1AKgDyLzkKi9AuaPhawwRwGi
+8shiyTQsWW4PMfLG7Vev5ANQoj8qFqbSjwvh2GwMq9BJ3ckfDFa7ZKFvpNDkry2Q
+rfN5pzrCqadniFgQmN79BlyqjJ5/CMuW6phgE7TPopiNOWUDxtziKK/fCZYeQxaL
+Tm+90ywZsMkkIGSl7imqz0JHQReIYQQqyNeHkVVieY0iXZWPvWp3U31Mf6gQhQDC
+A71wYgmYCITrIiviuqaCRu/hSqit5w6P3+pwJ3LJAf++zeTiS5oj+cxrXYTIh4c=
+=6iDr
 -----END PGP SIGNATURE-----
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,"