fix quotes on courier (only latest ebuild)

Package-Manager: portage-2.1.5_rc5

3 files changed, 43 insertions, 40 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index c9386cf679b0..56f94c1f9ad3 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.98 2008/02/03 10:51:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.99 2008/04/20 12:11:16 hanno Exp $
+
+  20 Apr 2008; Hanno Boeck <hanno@gentoo.org> courier-0.55.1-r1.ebuild:
+  Fix quoting.
 
   03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> courier-0.53.2.ebuild,
   courier-0.53.2-r1.ebuild, courier-0.55.1.ebuild, courier-0.55.1-r1.ebuild:
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index fdca9091d0ca..7af83f1352b0 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -18,14 +18,14 @@ DIST courier-0.53.2.tar.bz2 6942557 RMD160 a6efce3a8d6572923190ea49ed6085906317e
 DIST courier-0.55.1.tar.bz2 7019376 RMD160 43b4e5868a3e450cbc238cae0ba411011c1fa49f SHA1 a4b83a1fa018abd9d32b946b6407764ad2d98993 SHA256 caec49a2fed5c2048ea69fc290dc01402bf0dfc7852d2e1865e35ae15ce1eea6
 EBUILD courier-0.53.2-r1.ebuild 11567 RMD160 6d0aa51f770a25bc3ed037d92ccad8ed2be56254 SHA1 6aa1721a7b4732c97814479067cb22463172a9ad SHA256 ab406803613dc3cea093ebacf8d3fa7437e4297ddf7ee4f18d01d38e37cccd09
 EBUILD courier-0.53.2.ebuild 11532 RMD160 576ce689a2bc8fb1f6e4518bbddc5bd1a1fcd453 SHA1 40690f3fe06591582b52e0ee29c28c0a0b1e2da7 SHA256 fb00cdf3c88032f267ed838186b0d6e6b7699ad2354906ec8090ca6fd90cb115
-EBUILD courier-0.55.1-r1.ebuild 11574 RMD160 10f8494989c6e3cbf191aee90a1f85c7b9ea9b3d SHA1 4c736ffd0914fb8b25d15e5348ee90a90f26f362 SHA256 80d642b6e32ce96f1fcc51ce2e75dcc376f6fac9f2e545dee0e1af7fa5b84a07
+EBUILD courier-0.55.1-r1.ebuild 11645 RMD160 34b63074e5b99003b0558f29162fbde2abbdd6ab SHA1 549654b9cf13e1a9cb44700f52cdb487698e3180 SHA256 ca309870b086cab8be373ddeef62a3e69a218d65e401a2ca15ca6f90c178acce
 EBUILD courier-0.55.1.ebuild 11538 RMD160 15e23e2c8736ead5b71d502020a266f1712f257e SHA1 5f01c3926aa1fc9d080dd4190c6899c6ed104879 SHA256 253f511eb570d6915fe68c77e55d3ca194e1b4e6ead018dd9c622934ef1f59da
-MISC ChangeLog 27279 RMD160 f86b90f21295d8937e876699d76c595d7ec26b67 SHA1 08ccaeec369c118b4da83d9c683ba46342d0f375 SHA256 4ad3fb711db55f0f3df6561042936f7c9972b586927fa6698ce4e4918009df8d
+MISC ChangeLog 27366 RMD160 370717eaa103588ba34b12d1df1347d037d40ce7 SHA1 7733dea77fd26e2854cf24965a92f2276c9cbb17 SHA256 c021f8d46dac8345451a7a9188849f7ddf880abb546fe83647c1bfa8984360fa
 MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkelnL8ACgkQmPFBzbX68WFCSwCdFBz9HCumsO58kqUS+K6Z14fv
-3WEAnR1QdMyzUPhIym0g35LPWa5lSo2g
-=ToLs
+iEYEARECAAYFAkgLMu0ACgkQr2QksT29OyBCLwCdFIjrEUuSWRlQkpUraN7OGisA
+JM4An2q9F4oX66OPKa0639fu+JQhap8S
+=gS3A
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.55.1-r1.ebuild b/mail-mta/courier/courier-0.55.1-r1.ebuild
index 7681f63f20cc..5072b2335b64 100644
--- a/mail-mta/courier/courier-0.55.1-r1.ebuild
+++ b/mail-mta/courier/courier-0.55.1-r1.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/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.4 2008/02/03 10:51:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.5 2008/04/20 12:11:16 hanno Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -59,15 +59,15 @@ src_unpack() {
 		ebeep 4
 		epause 4 )
 	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
+	cd "${S}"
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
 	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 
 	epatch "${FILESDIR}/pam-include.patch"
 
 	# disable link to fam.
-	epatch ${FILESDIR}/fam-disable-check.patch
-	cd ${S}/maildir
+	epatch "${FILESDIR}/fam-disable-check.patch"
+	cd "${S}/maildir"
 	eautoreconf
 }
 
@@ -101,7 +101,7 @@ src_compile() {
 		--with-paranoid-smtpext \
 		--with-db=gdbm \
 		--disable-autorenamesent \
-		--cache-file=${S}/configuring.cache \
+		--cache-file="${S}/configuring.cache" \
 		--host=${CHOST} ${myconf} debug=true || die "./configure"
 	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile
 	emake || die "Compile problem"
@@ -140,26 +140,26 @@ src_install() {
 	einfo "Setting up maildirs in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
+	"${S}/maildir/maildirmake" "${D}/etc/skel/.maildir"
 	keepdir /etc/skel/.maildir
 
 	diropts -o mail -g mail
 	keepdir /var/run/courier
 	keepdir /var/lib/courier/tmp
 	keepdir /var/lib/courier/msgs
-	make install DESTDIR=${D} || die "install"
+	make install DESTDIR="${D}" || die "install"
 	make install-configure || die "install-configure"
 
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
+	for dir2keep in `(cd "${D}" && find ./var/lib/courier -type d)` ; do
 		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
 	done
 
-	newinitd ${FILESDIR}/courier-init-r1 courier
-	use fam || sed -i -e's|^.*use famd$||g' ${D}/etc/init.d/courier
+	newinitd "${FILESDIR}/courier-init-r1" courier
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
 
-	cd ${D}/etc/courier
+	cd "${D}/etc/courier"
 	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
+	newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
 
 	if use pam ; then
 		dodir /etc/pam.d
@@ -172,7 +172,7 @@ src_install() {
 	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
 
 	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> ${D}/etc/courier/sizelimit
+		> "${D}/etc/courier/sizelimit"
 	etc_courier maildroprc ""
 	etc_courier esmtproutes ""
 	etc_courier backuprelay ""
@@ -207,53 +207,53 @@ src_install() {
 
 	# Fix for a sandbox violation on subsequential merges
 	# - ticho@gentoo.org, 2005-07-10
-	rm ${D}/usr/sbin/{pop3d,imapd}{,-ssl}
+	rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl}
 	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
 	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
 	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
 	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
 
-	cd ${S}
+	cd "${S}"
 	cp imap/README README.imap
 	use nls && cp unicode/README README.unicode
 	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
 	dodoc tcpd/README.couriertls
 	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
+		>> "${D}/usr/share/doc/${P}/README.htmldocs"
 
 	insinto /usr/$(get_libdir)/courier/courier
 	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
+	doins "${S}/courier/webmaild"
 	insinto /etc/courier/webadmin
 	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
+	doins "${FILESDIR}/password.dist"
 
 	# avoid name collisions in /usr/sbin, make webadmin match
-	cd ${D}/usr/sbin
+	cd "${D}/usr/sbin"
 	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
 	sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
 		-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-		${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
+		"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
 		|| ewarn "failed to fix webadmin"
 	sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
 		-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-		${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
+		"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
 		|| ewarn "failed to fix webadmin"
 
 	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
+		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
+		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
+		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
 
-		mv ${D}/usr/share/man/man1/sendmail.1 \
-			${D}/usr/share/man/man1/sendmail-courier.1
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-courier.1
-		mv ${D}/usr/share/man/man1/rmail.1 \
-			${D}/usr/share/man/man1/rmail-courier.1
+		mv "${D}/usr/share/man/man1/sendmail.1" \
+			"${D}/usr/share/man/man1/sendmail-courier.1"
+		mv "${D}/usr/share/man/man1/mailq.1" \
+			"${D}/usr/share/man/man1/mailq-courier.1"
+		mv "${D}/usr/share/man/man1/rmail.1" \
+			"${D}/usr/share/man/man1/rmail-courier.1"
 
 		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
+		doins "${FILESDIR}/mailer.conf"
 	else
 		dosym /usr/bin/sendmail /usr/sbin/sendmail
 	fi
@@ -293,7 +293,7 @@ pkg_config() {
 	fi
 	export domainname
 
-	if [ ${ROOT} = "/" ] ; then
+	if [ "${ROOT}" = "/" ] ; then
 		file=${ROOT}/etc/courier/locals
 		if [ ! -f ${file} ] ; then
 			echo "localhost" > ${file};