Fix quoting, bug #168723

Package-Manager: portage-2.1.2-r12

3 files changed, 39 insertions, 26 deletions

diff --git a/games-strategy/dominions2/ChangeLog b/games-strategy/dominions2/ChangeLog
index e0e226372ed3..5386da43ad24 100644
--- a/games-strategy/dominions2/ChangeLog
+++ b/games-strategy/dominions2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/dominions2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.5 2007/02/21 23:59:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.6 2007/02/28 14:37:24 nyhm Exp $
+
+  28 Feb 2007; Tristan Heaven <nyhm@gentoo.org> dominions2-2.16.ebuild:
+  Fix quoting, bug #168723
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
index 1245a895a4a3..a04450f1079b 100644
--- a/games-strategy/dominions2/Manifest
+++ b/games-strategy/dominions2/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST DOM2_Walkthrough.pdf 549897 RMD160 2a76908de52bb4bbf579a997af0cdaab6ec2e03c SHA1 f187ce80e31cfb05ce84d401c0b88526e29856e9 SHA256 f6a3400f3fe03b89f23ec8c4492561bd58c684790f99669de0d7f1d08ff31855
 DIST dominions2.png 1135 RMD160 b6c46e74fbe21c915041b725f80fb5b1f3ef2fa3 SHA1 85becfc5cdf4258e531d825611dc9f192b5f0200 SHA256 530479327df7f2940a28eabb09217350fcc6009d0e81a9078d09d6b6515f6dc4
 DIST dompatch216_linux_ppc.tgz 1982323 RMD160 2bfd12c27a6f1811037bd96536ed307b5b0cd590 SHA1 51faa7bf6fb744f570167ea21462f211f50313a8 SHA256 224e1cd46d8078798f185ca956a137fdf3b76b339f49cc5b2f3304d553ea0ad9
 DIST dompatch216_linux_x86.tgz 1892714 RMD160 75b4577dc8e4e8a8314c15f5767f892a423b3da7 SHA1 3ce92e41d71faa59f45b8826a1d3226df7bc873a SHA256 19efb6b3db9fdfdf752ac53dd4352df990b95f84a37cfc61f729ce77ae142dc1
 DIST manual_addenda.pdf 192454 RMD160 fb8e157e0d5099dc4c56b350db4dd22aaf986a85 SHA1 50d4e709f47377575705c6cacab80feb1acce0d1 SHA256 ecbed702d1dae4ef2a08a33d03fb4b92aec8cd39df48ac085ed2748dcd159ab4
-EBUILD dominions2-2.16.ebuild 2865 RMD160 da02d16d425c92c912d684ad785704e8495aaa1e SHA1 446c1aa2149545b6cf06dcfd9532f9daf1b2e19d SHA256 7a28bcc0dcc02b7f9b1afffc4052e7811165170671e9aa7e0bf471ec3c1589bb
-MD5 c39abbd63f902da433b7870bf4286a90 dominions2-2.16.ebuild 2865
-RMD160 da02d16d425c92c912d684ad785704e8495aaa1e dominions2-2.16.ebuild 2865
-SHA256 7a28bcc0dcc02b7f9b1afffc4052e7811165170671e9aa7e0bf471ec3c1589bb dominions2-2.16.ebuild 2865
-MISC ChangeLog 985 RMD160 6a16f94619be56c0f398a47150cb9b08b0630971 SHA1 c058acd7f83a668ca13795439f7b0975b5c400fc SHA256 5f79c00ce71de6dc644b9d6e3e4740486fce145e034125fcb45acc90df7d5d92
-MD5 0a5a47e8e87fd3658851f33d9d3a316e ChangeLog 985
-RMD160 6a16f94619be56c0f398a47150cb9b08b0630971 ChangeLog 985
-SHA256 5f79c00ce71de6dc644b9d6e3e4740486fce145e034125fcb45acc90df7d5d92 ChangeLog 985
+EBUILD dominions2-2.16.ebuild 2883 RMD160 fbd4dc3bde53dda33ca85850b4019e35e90c6ffd SHA1 984893c66a29d3adcaeb62654106f0974c3c2518 SHA256 a522fe6dc3a9d5aedfa4cfcb7ef505b367e605993221a4c70917e1af3ad348ed
+MD5 b6c33a77b9d633f17f0cceb8b493ea08 dominions2-2.16.ebuild 2883
+RMD160 fbd4dc3bde53dda33ca85850b4019e35e90c6ffd dominions2-2.16.ebuild 2883
+SHA256 a522fe6dc3a9d5aedfa4cfcb7ef505b367e605993221a4c70917e1af3ad348ed dominions2-2.16.ebuild 2883
+MISC ChangeLog 1084 RMD160 63e5fb0c60436e83cb40e1088547b33ed9d91a74 SHA1 22bd45a771470a24730cb82aade993ae9eef4917 SHA256 41d891ce096843b5225fce2b93a92eb582971b5666e42c8ddbe78f4154073ded
+MD5 9815a5ee7d0adc3082bc735979adc483 ChangeLog 1084
+RMD160 63e5fb0c60436e83cb40e1088547b33ed9d91a74 ChangeLog 1084
+SHA256 41d891ce096843b5225fce2b93a92eb582971b5666e42c8ddbe78f4154073ded ChangeLog 1084
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -18,3 +21,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 14ee61a233bf724114d9dbd55be857cc files/digest-dominions2-2.16 1211
 RMD160 4350a21a4d9cc10e23cc8526d9be710db467305b files/digest-dominions2-2.16 1211
 SHA256 3eaeaff604e55dc052ce16f543df2a0a608583f9bca25530004660bb12dac749 files/digest-dominions2-2.16 1211
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5ZOrdz7hIScOURERApAmAKDxuGyUJCXk/hepyElWU13qu67YYQCfUN2s
+nL8F5UT1LgMaJoH4YOxQOX8=
+=kcYB
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
index b7b510246708..b0312f866e54 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-2.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.5 2006/03/31 22:09:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.6 2007/02/28 14:37:24 nyhm Exp $
 
 inherit eutils games
 
@@ -32,12 +32,12 @@ DEPEND="virtual/opengl
 	amd64? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl )"
 
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
 
 src_unpack() {
-	mkdir -p ${S}/patch
-	cd ${S}/patch
+	mkdir -p "${S}"/patch
+	cd "${S}"/patch
 	if use x86 || use amd64
 	then
 		unpack dompatch${PV/\./}_linux_x86.tgz
@@ -54,23 +54,23 @@ src_install() {
 	exeinto "${dir}"
 	if use amd64 || use x86
 	then
-		doexe ${CDROM_ROOT}/bin_lin/x86/dom2* || die "doexe failed"
+		doexe "${CDROM_ROOT}"/bin_lin/x86/dom2* || die "doexe failed"
 	elif use ppc
 	then
-		doexe ${CDROM_ROOT}/bin_lin/ppc/dom2* || die "doexe failed"
+		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2* || die "doexe failed"
 	fi
 	insinto "${dir}"
-	doins -r ${CDROM_ROOT}/dominions2.app/Contents/Resources/* || \
+	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/* || \
 		die "doins failed"
-	dodoc ${CDROM_ROOT}/doc/* || die "dodoc failed"
+	dodoc "${CDROM_ROOT}"/doc/* || die "dodoc failed"
 
 	# applying the official patches just means overwriting some important
 	# files with their more recent versions:
 	einfo "Applying patch for version ${PV}..."
-	dodoc ${S}/patch/doc/* || die "dodoc failed"
-	doexe ${S}/patch/dom2 || die "doexe failed"
-	rm -rf ${S}/patch/doc/ ${S}/patch/dom2 || die "rm failed"
-	doins -r ${S}/patch/* || die "doins failed"
+	dodoc "${S}"/patch/doc/* || die "dodoc failed"
+	doexe "${S}"/patch/dom2 || die "doexe failed"
+	rm -rf "${S}"/patch/doc/ "${S}"/patch/dom2 || die "rm failed"
+	doins -r "${S}"/patch/* || die "doins failed"
 
 	if use doc; then
 		einfo ""
@@ -79,13 +79,13 @@ src_install() {
 		einfo "You may want to study 'DOM2_Walkthrough.pdf' carefully if"
 		einfo "you are new to Dominions II."
 		einfo ""
-		dodoc ${DISTDIR}/{DOM2_Walkthrough,manual_addenda}.pdf
+		dodoc "${DISTDIR}"/{DOM2_Walkthrough,manual_addenda}.pdf
 	fi
 
-	doicon ${DISTFILES}/${PN}.png
+	doicon "${DISTDIR}"/${PN}.png
 
 	# update times
-	find ${D} -exec touch '{}' \;
+	find "${D}" -exec touch '{}' \;
 
 	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
 	make_desktop_entry dominions2 "Dominions II" dominions2.png