Cleanup unquoted warnings and drop virtual/baselayout PROVIDE.

Package-Manager: portage-2.2_pre5

5 files changed, 39 insertions, 41 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index d16aa3084310..8453d92ade74 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.463 2008/03/31 00:13:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.464 2008/03/31 00:46:06 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  31 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.15-r3.ebuild, baselayout-1.12.11.1.ebuild,
+  baselayout-1.12.12.ebuild:
+  Cleanup unquoted warnings and drop virtual/baselayout PROVIDE.
+
 *baselayout-1.12.12 (31 Mar 2008)
 
   31 Mar 2008; Mike Frysinger <vapier@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 9c2b57787f03..837a125a6a9e 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -8,16 +8,16 @@ DIST baselayout-1.12.11.1.tar.bz2 222570 RMD160 0e9b6fca3584189f0fe3dcc8a52f0683
 DIST baselayout-1.12.12.tar.bz2 222697 RMD160 1be695c8592e7c3ec3cc061d03b3d9313edd60dd SHA1 f29a041e1a41f8aad4a65d4a67a81351a03b9794 SHA256 4437e46fcc420d5ea1c033cbe5f52766565911b852b94d7c2b78e0553f4bcf19
 DIST baselayout-2.0.0.tar.bz2 23073 RMD160 0ce706d975635dfd3901b2065677013f35f80082 SHA1 5eb389b4ad9be5fa170df243d07b9140de1c8224 SHA256 e976ce2f37f0ee79e7c65eb77e3331d8a369ca5d74003f886c3594c206ce6ca9
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
-EBUILD baselayout-1.11.15-r3.ebuild 18840 RMD160 12e51582b0226ce0ca937ccb5c72df07af089f30 SHA1 4126eeb73b5bb5890a5201c403720f1c63db326d SHA256 072ca0751f3d00cd8ccebe416490eba30017b6b3cf4d585c582219a80a940895
-EBUILD baselayout-1.12.11.1.ebuild 19460 RMD160 a3c7af10ecf98cc308e68e7a3fe13278345bfd4d SHA1 c79b3a6a109c3e48332e103433554f01faec827b SHA256 86a9b52e81c14bf998489edf663b6e4116ea8e6292664a27978bed20d66cc87c
-EBUILD baselayout-1.12.12.ebuild 19469 RMD160 bd07b8056f114f9cf17465bbf0cffebe141d47fa SHA1 c42df7b0c3ab95884a646bc3ad5fb15cf35816f9 SHA256 b999531fa11deab97b044b7af0756f02f53a58d8d2e284067fb6e5b920b5bb86
+EBUILD baselayout-1.11.15-r3.ebuild 18810 RMD160 70a6adf906ecc25c47084b99d10bd2885da5c4fc SHA1 fd25e055fc06493f265f193e92bbcb02c8809f0a SHA256 7121667401fd361ea636880fd3d29dcb876aff313f14f298e1da4bb8d8ff7660
+EBUILD baselayout-1.12.11.1.ebuild 19431 RMD160 f9a9ea6cd713286d16cea13e7a1e43e5b8197026 SHA1 29487a6939425dbc744681b24c0590683ea9267d SHA256 524fced8a4667878dbefa37628b32075623b10cc2f9809dd9b40b8d3cc0e4dff
+EBUILD baselayout-1.12.12.ebuild 19417 RMD160 07c5ad50dc02dde2806f2eeed0c165055ca76048 SHA1 08690a566a6b2e13c05254758d75e24f297d2e0f SHA256 fc74698d50dfd8eb3679137b68bada1d3d9c01acec46473e31f92b4d16e5febe
 EBUILD baselayout-2.0.0.ebuild 4137 RMD160 b7de342723d275aff2261a4080529d82d441b2db SHA1 b3cae515fefa574f97a4fefbf5219fe625023739 SHA256 792353f5dc3e8c749b10d116d8f6e11b0fcf27c4eac36f1765cbd1a85797f799
-MISC ChangeLog 100441 RMD160 471e17e35456a583abc03d9cb8c0c8c445711d22 SHA1 9151e1c05a53423af50a54434f01f6f81379564b SHA256 7526bab6d3bd2ee768110edafb27345a010ddaa34a5d2fbbf688ee3e1fd1fedc
+MISC ChangeLog 100647 RMD160 a8a655123e4b222cda20e0a2d5216fb7006ea826 SHA1 ab9ab15a661b15e028f18d129557710127286705 SHA256 b8e0b16020e36aecf0c6b0fdfa2aa4dda4f440882173bb81f3672e43373b68ee
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH8C1uj9hvisErhMIRAlo3AJwK9GT1BBsDE+/eQmZoZnFewtoOawCeO40U
-3Nyhx6Yo3KvkrCdN2ykdgJc=
-=FXNZ
+iD8DBQFH8DUuj9hvisErhMIRAigHAJ451QpTDitpej3EeVCiF6lOIdPJawCeOXbg
+PamkxGNDuascsJXooGpeNNE=
+=Jsf1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
index 0df4a93a0b98..4be36b69eb27 100644
--- a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.9 2008/03/11 00:00:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.10 2008/03/31 00:46:06 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -31,7 +31,6 @@ RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	) )"
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
 
 S=${WORKDIR}/rc-scripts-${SV}${SVREV}
 
diff --git a/sys-apps/baselayout/baselayout-1.12.11.1.ebuild b/sys-apps/baselayout/baselayout-1.12.11.1.ebuild
index 189bb5b2a422..6912cfa74da8 100644
--- a/sys-apps/baselayout/baselayout-1.12.11.1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild,v 1.12 2008/03/16 08:43:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.11.1.ebuild,v 1.13 2008/03/31 00:46:06 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -33,7 +33,6 @@ RDEPEND="virtual/init
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
 PDEPEND="!build? ( !bootstrap? ( >=sys-apps/module-init-tools-3.2.2-r3 ) )"
-PROVIDE="virtual/baselayout"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/baselayout/baselayout-1.12.12.ebuild b/sys-apps/baselayout/baselayout-1.12.12.ebuild
index 7f8004934ad7..09fbd9710531 100644
--- a/sys-apps/baselayout/baselayout-1.12.12.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild,v 1.1 2008/03/31 00:13:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.12.ebuild,v 1.2 2008/03/31 00:46:06 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -33,7 +33,6 @@ RDEPEND="virtual/init
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
 PDEPEND="!build? ( !bootstrap? ( >=sys-apps/module-init-tools-3.2.2-r3 ) )"
-PROVIDE="virtual/baselayout"
 
 src_unpack() {
 	unpack ${A}
@@ -56,7 +55,7 @@ src_unpack() {
 
 	# Use correct path to filefuncs.so on multilib systems
 	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
-		${S}/src/awk/{cachedepends,genenviron}.awk || die
+		"${S}"/src/awk/{cachedepends,genenviron}.awk || die
 }
 
 src_compile() {
@@ -303,7 +302,7 @@ src_install() {
 	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
 
 	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > ${D}/etc/gentoo-release
+	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
 
 	#
 	# Setup files related to /dev
@@ -363,18 +362,15 @@ src_install() {
 	# Original design had these in /etc/net.modules.d but that is too
 	# problematic with CONFIG_PROTECT
 	dodir ${rcscripts_dir}
-	cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
-	chown -R root:0 ${D}${rcscripts_dir}
+	cp -pPR "${S}"/lib/rcscripts/net "${D}"${rcscripts_dir}
+	chown -R root:0 "${D}"${rcscripts_dir}
 
 	#
 	# Install baselayout documentation
 	#
-	if ! use build ; then
-		doman "${S}"/man/*.*
-		docinto /
-		dodoc ${FILESDIR}/copyright
-		dodoc "${S}"/ChangeLog
-	fi
+	doman "${S}"/man/*.*
+	docinto /
+	dodoc "${S}"/ChangeLog
 
 	#
 	# Install baselayout utilities
@@ -400,7 +396,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
+			"${ROOT}"/etc/conf.d/${f} > "${D}"/etc/conf.d/${f}
 	fi
 }
 
@@ -419,12 +415,11 @@ pkg_preinst() {
 	source "${D}"/usr/share/baselayout/mklinks.sh
 	echo
 
-	if [[ -f ${ROOT}/etc/modules.autoload && \
-			! -d ${ROOT}/etc/modules.autoload.d ]]; then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
+	if [[ -f ${ROOT}/etc/modules.autoload && ! -d ${ROOT}/etc/modules.autoload.d ]]; then
+		mkdir -p "${ROOT}"/etc/modules.autoload.d
+		mv -f "${ROOT}"/etc/modules.autoload \
+			"${ROOT}"/etc/modules.autoload.d/kernel-2.4
+		ln -snf modules.autoload.d/kernel-2.4 "${ROOT}"/etc/modules.autoload
 	fi
 
 	# Change some vars introduced in baselayout-1.11.0 before we go stable
@@ -478,7 +473,7 @@ pkg_postinst() {
 	# Create /etc/hosts in pkg_postinst so we don't overwrite an
 	# existing file during bootstrap
 	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
+		cp "${ROOT}"/usr/share/baselayout/hosts "${ROOT}"/etc
 	fi
 
 	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
@@ -518,14 +513,14 @@ pkg_postinst() {
 		# Regenerate init.d dependency tree
 		/sbin/depscan.sh --update &>/dev/null
 	else
-		rm -f ${ROOT}/etc/modules.conf
+		rm -f "${ROOT}"/etc/modules.conf
 	fi
 
 	# This is also written in src_install (so it's in CONTENTS), but
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
-	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System release ${PV}" > ${ROOT}/etc/gentoo-release
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+	echo "Gentoo Base System release ${PV}" > "${ROOT}"/etc/gentoo-release
 
 	echo
 	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
@@ -535,7 +530,7 @@ pkg_postinst() {
 	einfo "  # etc-update"
 	echo
 
-	for f in ${ROOT}etc/init.d/net.* ; do
+	for f in "${ROOT}"etc/init.d/net.* ; do
 		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue
 		echo
 		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
@@ -543,12 +538,12 @@ pkg_postinst() {
 		einfo "made personal changes to those files, you can update with the"
 		einfo "following command:"
 		einfo
-		einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo"
+		einfo " /bin/ls '${ROOT}'etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo"
 		echo
 		break
 	done
 
-	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \
+	if sed -e 's/#.*//' "${ROOT}"/etc/conf.d/{net,wireless} 2>/dev/null \
 		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
 			echo
 			ewarn "You have deprecated variables in ${ROOT}/etc/conf.d/net"
@@ -563,13 +558,13 @@ pkg_postinst() {
 			echo
 	fi
 
-	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
+	if sed -e 's/#.*//' "${ROOT}"/etc/conf.d/net 2>/dev/null \
 		| egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then
 			echo
 			ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net"
 			ewarn
 			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no"
+			ewarn "found in '${ROOT}'/etc/conf.d/net.example as there is no"
 			ewarn "guarantee that they will work in future versions."
 			echo
 	fi
@@ -582,7 +577,7 @@ pkg_postinst() {
 		rm -f "${ROOT}"/etc/init.d/domainname
 		rm -f "${ROOT}"/etc/runlevels/*/domainname
 		ewarn "The domainname init script has been removed in this version."
-		ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how"
+		ewarn "Consult '${ROOT}'/etc/conf.d/net.example for details about how"
 		ewarn "to apply dns/nis information to the loopback interface."
 	fi