Sync with portage, pulling in fix for bug #153995

svn path=/; revision=37

2 files changed, 41 insertions, 41 deletions

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 180d74e..dd8d5bc 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -116,14 +116,14 @@ EBUILD bacula-1.38.5.ebuild 8021 RMD160 25166fd5aaa8f9c5e37ef043ec885c553ce05d7f
 MD5 798fea8f94992e01ff9e5d91f1a60929 bacula-1.38.5.ebuild 8021
 RMD160 25166fd5aaa8f9c5e37ef043ec885c553ce05d7f bacula-1.38.5.ebuild 8021
 SHA256 67963a5737f6c8de27d6c3fa209d9a1901e47b688b05e917d4454033a44dab04 bacula-1.38.5.ebuild 8021
-EBUILD bacula-1.38.9.ebuild 8779 RMD160 2b9205a8df0c9caf839af84ec725abc87ad73507 SHA1 7a1f762d829d0c5b873c159ef99de3874cc53bd6 SHA256 16a33c90a5804e73c4069e8ff4c41fca45336f093a33cae98d726843bcea2840
-MD5 b315bcb4386c94751e3c21d26f4c5aed bacula-1.38.9.ebuild 8779
-RMD160 2b9205a8df0c9caf839af84ec725abc87ad73507 bacula-1.38.9.ebuild 8779
-SHA256 16a33c90a5804e73c4069e8ff4c41fca45336f093a33cae98d726843bcea2840 bacula-1.38.9.ebuild 8779
-MISC ChangeLog 11751 RMD160 a196d71c0f157d1a16c9f48ec0e087ea1565e138 SHA1 5911530022dedae95bc2fc45a40dc55821f302e7 SHA256 7aea6de043d39450011f2c921c0919ac310d3c62eba4f73e453a0d6398353077
-MD5 8618ac573afc0ae2ac2e04c11f8d487f ChangeLog 11751
-RMD160 a196d71c0f157d1a16c9f48ec0e087ea1565e138 ChangeLog 11751
-SHA256 7aea6de043d39450011f2c921c0919ac310d3c62eba4f73e453a0d6398353077 ChangeLog 11751
+EBUILD bacula-1.38.9.ebuild 8844 RMD160 909f62406ff855cd65715f92a2fc1e7ec5526f11 SHA1 5ae2c89aca0087a842e257775aa5f3d9a309931b SHA256 ec5eb46e8264245fa1f0a4eac358cf257935b827427e86245e4823cb810d07b9
+MD5 a4d5c99991d23ff64b3f74a5295b76ac bacula-1.38.9.ebuild 8844
+RMD160 909f62406ff855cd65715f92a2fc1e7ec5526f11 bacula-1.38.9.ebuild 8844
+SHA256 ec5eb46e8264245fa1f0a4eac358cf257935b827427e86245e4823cb810d07b9 bacula-1.38.9.ebuild 8844
+MISC ChangeLog 11896 RMD160 96d6c8d43cbfda7b9afe7a9d9323b3c7dc8d8dcd SHA1 b36b6fca1fd716074d3e44fa249d5db08e64a11e SHA256 8a5dd7fe72c3fa49fd189277d17cf8e447cf4e042bc58944e3fc8296e3865ecd
+MD5 bd083f7b2397822ebc9d13fbfd0d91a0 ChangeLog 11896
+RMD160 96d6c8d43cbfda7b9afe7a9d9323b3c7dc8d8dcd ChangeLog 11896
+SHA256 8a5dd7fe72c3fa49fd189277d17cf8e447cf4e042bc58944e3fc8296e3865ecd ChangeLog 11896
 MISC metadata.xml 231 RMD160 19e976de9dd6edf79a58e350be4c2dea93dd5509 SHA1 3c484b1dfbc392364a06ef0be12ea19758456ea8 SHA256 adbdfd485ca752584b38e864d1e153ab40f2254b239c384c96519156133ac699
 MD5 60588f35f6dd9ba53f0b06f43e6a069b metadata.xml 231
 RMD160 19e976de9dd6edf79a58e350be4c2dea93dd5509 metadata.xml 231
diff --git a/app-backup/bacula/bacula-1.38.9.ebuild b/app-backup/bacula/bacula-1.38.9.ebuild
index 818501a..167c37c 100644
--- a/app-backup/bacula/bacula-1.38.9.ebuild
+++ b/app-backup/bacula/bacula-1.38.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.38.9.ebuild,v 1.2 2006/09/21 22:22:11 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.38.9.ebuild,v 1.3 2006/11/04 09:17:14 grobian Exp $
 
 inherit eutils
 
@@ -104,10 +104,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# adjusts default configuration files for several binaries
 	# to /etc/bacula/<config> instead of ./<config>
-	epatch ${FILESDIR}/${P}-default-configs.patch
+	epatch "${FILESDIR}/${P}"-default-configs.patch
 }
 
 src_compile() {
@@ -174,10 +174,10 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Failed install to ${D} !"
+	emake DESTDIR="${D}" install || die "Failed install to ${D} !"
 
 	if use static ; then
-		cd ${D}/usr/sbin
+		cd "${D}"/usr/sbin
 		mv static-bacula-fd bacula-fd
 		mv static-bconsole bconsole
 		if ! use bacula-clientonly ; then
@@ -187,12 +187,12 @@ src_install() {
 		if use gnome ; then
 			mv static-gnome-console gnome-console
 		fi
-		cd ${S}
+		cd "${S}"
 	fi
 
 	if use bacula-console ; then
 		if use gnome ; then
-			emake DESTDIR=${D} \
+			emake DESTDIR="${D}" \
 				install-menu \
 				install-menu-xsu || die "Failed to install gnome menu files to ${D}" \
 			make_desktop_entry \
@@ -209,7 +209,7 @@ src_install() {
 		dodir /usr/libexec/bacula/updatedb
 		insinto /usr/libexec/bacula/updatedb/
 		insopts -m0754
-		doins ${S}/updatedb/*
+		doins "${S}"/updatedb/*
 		fperms 0640 /usr/libexec/bacula/updatedb/README
 
 		# the logrotate configuration
@@ -218,7 +218,7 @@ src_install() {
 			dodir /etc/logrotate.d
 			insinto /etc/logrotate.d
 			insopts -m0644
-			newins ${S}/scripts/logrotate bacula
+			newins "${S}"/scripts/logrotate bacula
 		fi
 
 		# the logwatch scripts
@@ -227,41 +227,41 @@ src_install() {
 			dodir /etc/log.d/scripts/services
 			dodir /etc/log.d/conf/logfiles
 			dodir /etc/log.d/conf/services
-			cd ${S}/scripts/logwatch
-			emake DESTDIR=${D} install || die "Failed to install logwatch scripts to ${D} !"
-			cd ${S}
+			cd "${S}"/scripts/logwatch
+			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts to ${D} !"
+			cd "${S}"
 		fi
 	fi
 
 	# documentation
-	for my_doc in ${S}/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
+	for my_doc in "${S}"/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
 	do
-		dodoc ${my_doc}
+		dodoc "${my_doc}"
 	done
 	if use doc ; then
-		dodoc ${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers.pdf
-		dodoc ${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula.pdf
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers.pdf
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula.pdf
 		diropts -m0755
-		dodir /usr/share/doc/${PF}/developers
-		dodir /usr/share/doc/${PF}/manual
+		dodir /usr/share/doc/"${PF}"/developers
+		dodir /usr/share/doc/"${PF}"/manual
 		insopts -m0644
-		insinto /usr/share/doc/${PF}/developers
-		doins ${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers/*
-		insinto /usr/share/doc/${PF}/manual
-		doins ${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula/*
+		insinto /usr/share/doc/"${PF}"/developers
+		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers/*
+		insinto /usr/share/doc/"${PF}"/manual
+		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula/*
 	fi
 
 	# clean up permissions left broken by install
-	fperms 0644 ${D}/usr/libexec/bacula/query.sql
+	fperms 0644 "${D}"/usr/libexec/bacula/query.sql
 	prepall
 
 	# setup init scripts
 	my_services="fd"
 	if ! use bacula-clientonly ; then
-		if ! use bacula-no-dir ; then
+		if ! use bacula-nodir ; then
 			my_services="${my_services} dir"
 		fi
-		if ! use bacula-no-sd ; then
+		if ! use bacula-nosd ; then
 			my_services="${my_services} sd"
 		fi
 	fi
@@ -276,16 +276,16 @@ src_install() {
 		my_scripts="bacula-all"
 	fi
 	for script in ${my_scripts}; do
-		cp ${FILESDIR}/${PV}/${script}-conf ${T}/${script}.conf
-		cp ${FILESDIR}/${PV}/${script}-init ${T}/${script}.init
+		cp "${FILESDIR}/${PV}/${script}"-conf "${T}/${script}".conf
+		cp "${FILESDIR}/${PV}/${script}"-init "${T}/${script}".init
 		if [ "${mydb}" == "sqlite" ]; then
-			sed -i -e "s:%database%::" ${T}/${script}.init
+			sed -i -e "s:%database%::" "${T}/${script}".init
 		else
-			sed -i -e "s:%database%:${mydb}:" ${T}/${script}.init
+			sed -i -e "s:%database%:${mydb}:" "${T}/${script}".init
 		fi
-		sed -i -e "s:%services%:${my_services}:" ${T}/${script}.conf
-		newexe ${T}/${script}.init ${script}
-		newins ${T}/${script}.conf ${script}
+		sed -i -e "s:%services%:${my_services}:" "${T}/${script}".conf
+		newexe "${T}/${script}".init "${script}"
+		newins "${T}/${script}".conf "${script}"
 	done
 
 	# make sure the working directory exists
@@ -300,7 +300,7 @@ pkg_postinst() {
 		fowners bacula:bacula /var/lib/bacula
 	fi
 
-	if ! use bacula-clientonly && ! use bacula-no-dir ; then
+	if ! use bacula-clientonly && ! use bacula-nodir ; then
 		einfo "If this is a new install, you must create the ${mydb} databases with:"
 		einfo " /usr/libexec/bacula/create_${mydb}_database"
 		einfo " /usr/libexec/bacula/make_${mydb}_tables"