quoting fixes, make all tests use [[ and use $D for $ED since we are not on prefix

Package-Manager: portage-2.2.0_alpha93/cvs/Linux i686

3 files changed, 24 insertions, 20 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 7238d886a538..5adf8c21e3c0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.667 2012/03/22 15:25:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.668 2012/03/22 15:42:42 williamh Exp $
+
+  22 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  quoting fixes, make all tests use [[ and use $D for $ED since we are not on
+  prefix
 
   22 Mar 2012; William Hubbs <williamh@gentoo.org> udev-182.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 841bdf02e304..f1f88ff0fbab 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -132,14 +132,14 @@ EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302
 EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2 SHA1 2533fed6842fc8b3708bcf1ca541a4f13508cb1f SHA256 cca3497d3e06df3da7cc387543f3dc367782755cb504855e50e7900ae99e6b35
 EBUILD udev-171-r5.ebuild 15675 RMD160 3773748421c47184353d475517492d32e09cfe20 SHA1 bda04f4010759eae46b311093c23b863032ee360 SHA256 3d93d104eebe0370af1fffcdddf88023a565b388522a3463a68cf54caa689da6
 EBUILD udev-182.ebuild 10090 RMD160 157a0a816b0bbc8cf20be86309c1cebb7a3ba3e2 SHA1 a3f9214f6a366c9fb8edf952d32d83666d1066d1 SHA256 fcc3f361b422e5a9fa1eb7d3c4236ccb4ff3c76c38ef281e40e07699a23c306b
-EBUILD udev-9999.ebuild 10128 RMD160 e9da72b81ce45a5a2992885a6f1112dee7cd3481 SHA1 e2cea57380ad7f084f550ccd1cdbe26705658271 SHA256 d1b95a497ce0573952f6546f33c632ebaac2977e652286e27148812c50e07612
-MISC ChangeLog 28681 RMD160 8a4ea9bec8f7e5c4a97cfabfa3759b1af18a9d5a SHA1 c61741d42bea9c59ad948e96ba2b900556319ea0 SHA256 1a53d9bffbb2da5c4428d1a473236b10d34de6591e36e87254579a80d3028bdd
+EBUILD udev-9999.ebuild 10108 RMD160 8b37fea0eaae45fe7d1dae756b67d3885f56a24f SHA1 e04295eb9cf02b710d947300d4e059d6ab365b5b SHA256 a88807791a9ef86de5be233b2467e8bab1a170fbcab69522b57e3b187facaa56
+MISC ChangeLog 28838 RMD160 1b05864897a961310b348dc6fa5f8dfae6324ee1 SHA1 16cc34c646b8706497ae2dd92015e41031ee5d50 SHA256 0e3145595d9a4e67d80933449d1db9f54ec0316eccf87c5d1f4d06cf8b912d02
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1296 RMD160 d6c93ed6c8ba4c4b6c0598a419778cf4054a187f SHA1 16c4880aa1f705801b6be54001915743e8f6fffd SHA256 57326d475c8c692a17013fb03701b9e63c8e0535fc3d838a725431111c0529fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9rRG4ACgkQblQW9DDEZTj3TwCguXmRuNCYIQ5z9j8lAKCP5jD6
-hx0AoIn1WHY0l1PUpfk/egXSfmGGTp7x
-=WynZ
+iEYEARECAAYFAk9rSIIACgkQblQW9DDEZThqXACeKMERaChHpuxK36KjaLqnlkrr
+M1MAn0v7l3DT/9Qri/qzmazgk1bcmYTu
+=wdyg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 89970c098ece..96e65ff421ec 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.89 2012/03/22 15:25:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.90 2012/03/22 15:42:42 williamh Exp $
 
 EAPI=4
 
@@ -10,14 +10,14 @@ udev_rules_md5=ebc2cf422aa9e46cf7d9a555670412ba
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 
-[[ ${PV} == "9999" ]] && vcs="git-2 autotools"
+[[ ${PV} == 9999 ]] && vcs="git-2 autotools"
 inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
 
-if [[ ${PV} != "9999" ]]
+if [[ ${PV} != 9999 ]]
 then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
-	if [[ -n "${patchversion}" ]]
+	if [[ -n ${patchversion} ]]
 	then
 		patchset=${P}-patchset-${patchversion}
 		SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2"
@@ -45,7 +45,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/os-headers
 	!<sys-kernel/linux-headers-2.6.34"
 
-if [[ $PV == "9999" ]]
+if [[ $PV == 9999 ]]
 then
 	RESTRICT="test? ( userpriv )"
 	IUSE="${IUSE} test"
@@ -112,10 +112,10 @@ pkg_setup()
 src_prepare()
 {
 	# backport some patches
-	if [[ -n "${patchset}" ]]
+	if [[ -n ${patchset} ]]
 	then
-		EPATCH_SOURCE="${WORKDIR}/${patchset}" EPATCH_SUFFIX="patch" \
-			EPATCH_FORCE="yes" epatch
+		EPATCH_SOURCE="${WORKDIR}"/${patchset} EPATCH_SUFFIX=patch \
+			EPATCH_FORCE=yes epatch
 	fi
 
 	# change rules back to group uucp instead of dialout for now
@@ -123,7 +123,7 @@ src_prepare()
 		-i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
-	if [ ! -e configure ]
+	if [[ ! -e configure ]]
 	then
 		gtkdocize --copy || die "gtkdocize failed"
 		eautoreconf
@@ -169,14 +169,14 @@ src_install()
 {
 	emake DESTDIR="${D}" install
 
-	find "${ED}" -type f -name '*.la' -exec rm -f {} +
+	find "${D}" -type f -name '*.la' -exec rm -f {} +
 
 	dodoc ChangeLog NEWS README TODO
 	use keymap && dodoc src/keymap/README.keymap.txt
 
 	local htmldir
 	for htmldir in gudev libudev; do
-		[[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]] &&
+		[[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]] &&
 			dosym /usr/share/doc/${PF}/html/${htmldir} \
 				/usr/share/gtk-doc/html/${htmldir}
 	done
@@ -214,7 +214,7 @@ fix_old_persistent_net_rules()
 # See Bug #129204 for a discussion about restarting udevd
 restart_udevd()
 {
-	if [[ ${NO_RESTART} = "1" ]]
+	if [[ ${NO_RESTART} = 1 ]]
 	then
 		ewarn "Not restarting udevd, as your kernel is too old!"
 		return
@@ -256,7 +256,7 @@ restart_udevd()
 ismounted()
 {
 	while read a m a; do
-		[ "$m" = "$1" ] && return 0
+		[[ $m = $1 ]] && return 0
 	done < "${ROOT}"/proc/mounts
 	return 1
 }
@@ -269,7 +269,7 @@ pkg_postinst()
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
 	# So try to remove it here (will only work if empty).
 	rmdir "${ROOT}"/dev/loop 2>/dev/null
-	if [[ -d "${ROOT}"/dev/loop ]]
+	if [[ -d ${ROOT}/dev/loop ]]
 	then
 		ewarn "Please make sure your remove /dev/loop,"
 		ewarn "else losetup may be confused when looking for unused devices."