A few small fixes, as pointed out by drac in #gentoo-alpha

git-svn-id: svn://mattst88.com/svn/compaq-c-overlay@8 8c41e67f-757b-4206-be13-12d8f16ad5be

6 files changed, 16 insertions, 15 deletions

diff --git a/dev-lang/ccc/Manifest b/dev-lang/ccc/Manifest
index 7f874d1..18a8d42 100644
--- a/dev-lang/ccc/Manifest
+++ b/dev-lang/ccc/Manifest
@@ -1,4 +1,4 @@
 AUX create-comp-config.patch 1778 RMD160 d7db830813d2f5cf3df8fbda3329ab0addac54be SHA1 c655f7bb3395a21547ab224fc758118fce623cc7 SHA256 c387e155312f08e82b8c5a75e79cf252d170512d28e07a4cae30a5b2e096d2cb
 AUX probe_linux.patch 1074 RMD160 682b84d3d177a2f9af90ed87e834763a97392de9 SHA1 cade04ece40991bf0698daac857f5e70e2edae33 SHA256 346e16ad5f3819cb810e3ee58c5e075e7ca885ce1feb30d59bcf8267ed9a9560
 DIST ccc-6.5.9.001-6.alpha.rpm 7160915 RMD160 3a03914049ca21f4dc030661eafa28aa6015aa34 SHA1 e8a80726d50477e028a382360311e6f0ac8b4e25 SHA256 019aa8d24cf1d70a63851847824cd6afe7aabfaf8f00daba7ee7eb8645fa6ace
-EBUILD ccc-6.5.9.001.ebuild 3725 RMD160 413913a7d926154cda6505d050444b94aac8f0bb SHA1 afebde5951a509e45622a7f8c3d4367c7a0ab4e6 SHA256 3e41442def3511fbfc5f3c7845ef407643afe5bcc2c3d4bd9906b9ea995dc0b7
+EBUILD ccc-6.5.9.001.ebuild 3727 RMD160 2e67e434eef46e5c0fff7a2b6d50397f77decffa SHA1 be7833c733ffce702dca811437e34d5ffb5edb29 SHA256 c07aa2753041179a40490e7abfe6bd611131e8e382201ed5ae3460ae29fb5137
diff --git a/dev-lang/ccc/ccc-6.5.9.001.ebuild b/dev-lang/ccc/ccc-6.5.9.001.ebuild
index eb53878..218a0d8 100644
--- a/dev-lang/ccc/ccc-6.5.9.001.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}
 LICENSE="PLDSPv2"
 SLOT="0"
 KEYWORDS="-* ~alpha"
-RESTRICT="fetch strip nomirror"
+RESTRICT="fetch strip mirror"
 
 RDEPEND="virtual/libc
 	dev-libs/libots
@@ -40,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	find ${S}/usr -type d -exec chmod a+rx {} \;
+	find "${S}"/usr -type d -exec chmod a+rx {} \;
 
 	# patch up config script to sort gcc-lib paths last.  Thanks to
 	# Marc Giger for sorting this out
@@ -72,7 +72,7 @@ src_compile() {
 
 src_install() {
 	# move files over
-	mv usr ${D} || die "ccc installation failed"
+	mv usr "${D}" || die "ccc installation failed"
 
 	# prep docs
 	prepalldocs
diff --git a/dev-lang/cxx/Manifest b/dev-lang/cxx/Manifest
index 08f5b9f..4810a32 100644
--- a/dev-lang/cxx/Manifest
+++ b/dev-lang/cxx/Manifest
@@ -1,4 +1,4 @@
 AUX create-comp-config.patch 2230 RMD160 044deb23aa2dade591199eab6b5780a60a1a3d78 SHA1 8fd4ba761cb5e6c0032a96524f3d209f3d4c6deb SHA256 1e9d1284a2135d594c1c573b2008c0c341c65f5143991f09735dd46e22c5c252
 AUX probe_linux.patch 1069 RMD160 4c3d4632aa2f673afbad4a8a965d46cba124f201 SHA1 16128168a58169786d0772cba7fd0a6ef6a3eb67 SHA256 df82d7346d05f08a631d87c90f4f0579f435464ba32f25af21559402460b83f8
 DIST cxx-6.5.9.31-1.alpha.rpm 10007070 RMD160 b2e4d19481023ff2898c4fa342d375b07c4052d6 SHA1 85251a735bc4a8cae2583e270de4dad7d999c376 SHA256 43719320e7e4eb09812617428fdbd87cba5614a3d844b8040faa7e75e2b8e6b6
-EBUILD cxx-6.5.9.31.ebuild 3746 RMD160 35460145eebac7416a6066a80b5527bcc44f708a SHA1 223f59f63c6b074ed09f729739d77e286a0da0de SHA256 bf4744638b606c80ba5c138ac3a645fb1fe9b7a2761679854bbb53582b4232c4
+EBUILD cxx-6.5.9.31.ebuild 3748 RMD160 7e9e97c35adc01c9508fd2cac2d0ef223b6ec837 SHA1 3ceb9dac436fbf219e768f5adc94984b51239c04 SHA256 99dd7126da9610126924e735fa25ee0eb2dfcd81c656fa6af8d4a59766274a7c
diff --git a/dev-lang/cxx/cxx-6.5.9.31.ebuild b/dev-lang/cxx/cxx-6.5.9.31.ebuild
index 1ad54d7..42b3769 100644
--- a/dev-lang/cxx/cxx-6.5.9.31.ebuild
+++ b/dev-lang/cxx/cxx-6.5.9.31.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}
 LICENSE="PLDSPv2"
 SLOT="0"
 KEYWORDS="-* ~alpha"
-RESTRICT="fetch strip nomirror"
+RESTRICT="fetch strip mirror"
 
 RDEPEND="virtual/libc
 	dev-libs/libots
@@ -40,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	find ${S}/usr -type d -exec chmod a+rx {} \;
+	find "${S}"/usr -type d -exec chmod a+rx {} \;
 
 	# patch up config script to sort gcc-lib paths last.  Thanks to
 	# Marc Giger for sorting this out
@@ -72,7 +72,7 @@ src_compile() {
 
 src_install() {
 	# move files over
-	mv usr ${D} || die "cxx installation failed"
+	mv usr "${D}" || die "cxx installation failed"
 
 	# prep docs
 	prepalldocs
diff --git a/dev-libs/libcpml/Manifest b/dev-libs/libcpml/Manifest
index 44bb184..059fddf 100644
--- a/dev-libs/libcpml/Manifest
+++ b/dev-libs/libcpml/Manifest
@@ -1,3 +1,4 @@
 DIST cpml_ev5-5.2.0-1.alpha.rpm 323919 RMD160 b4b12e85313519da586efc34a641fce0fa15c136 SHA1 149f6bd927c433eda02d5df67606d390cbd68e4f SHA256 969029723bfe7ebf3092086f24fadca6dc34d54b8f2805c081a9854a70115d1e
 DIST cpml_ev6-5.2.0-1.alpha.rpm 311950 RMD160 477f700db6fa7832a803c1cfc0ac7dccab5f6513 SHA1 616431db54a0acead332af61d8e3600a3ac610d4 SHA256 46eb527079b2b76f6da3aa081342e53db3e8ec8db8a4d3f29499cb7e4b7037f8
-EBUILD libcpml-5.2.01.ebuild 1508 RMD160 3b76a2922b88aba4893ede0615ee70238de8b8ea SHA1 f06472e04de9be41b6c53d2cc4b720a7c27c3470 SHA256 7635e13575f11a9b5bc3a7e69f4b130d4d3be90c6affb7f26af68b1471783abb
+EBUILD libcpml-5.2.01.ebuild 1507 RMD160 24bfcd85c286b96e11dc528d3eda8bfdcf6db2d2 SHA1 815efceec4b1e3817bdd7397bbb5f4dd0c7754c2 SHA256 b73755b49baae3b62a568684c065bd30d13b4a217e79f7ae5074de65fa17bdbd
+MISC libcpml-5.2.01.ebuild~ 1506 RMD160 dfc04d866fb8377a1e7b66179c35f4bbc7498800 SHA1 caeb2cb368fdf02457d8b4b3dad60a8da000b7fe SHA256 a1382adbb467c6f1939e17ed30af328995862ea231d1e6b4a441dd2c9d8d645f
diff --git a/dev-libs/libcpml/libcpml-5.2.01.ebuild b/dev-libs/libcpml/libcpml-5.2.01.ebuild
index 0ff51c6..e651457 100644
--- a/dev-libs/libcpml/libcpml-5.2.01.ebuild
+++ b/dev-libs/libcpml/libcpml-5.2.01.ebuild
@@ -13,7 +13,7 @@ LICENSE="compaq-sdla"
 SLOT="5.2.01"
 KEYWORDS="-* ~alpha"
 IUSE="ev6"
-RESTRICT="fetch strip nomirror"
+RESTRICT="fetch strip mirror"
 
 DEPEND="virtual/libc
 	sys-devel/binutils
@@ -26,27 +26,27 @@ S=${WORKDIR}/usr
 
 src_unpack() {
 	rpm_src_unpack
-	find ${S} -type d -exec chmod a+rx {} \;
+	find "${S}" -type d -exec chmod a+rx {} \;
 }
 
 src_compile () {
 	local EV; use ev6 && EV=ev6 || EV=ev5
-	cd ${S}/lib/compaq/cpml-5.2.0
-	ld ${LDFLAGS} -shared -o libcpml_${EV}.so -soname libcpml.so \
+	cd "${S}"/lib/compaq/cpml-5.2.0
+	ld -shared -o libcpml_${EV}.so -soname libcpml.so \
 		-whole-archive libcpml_${EV}.a -no-whole-archive -lots
 }
 
 src_install() {
 	local EV; use ev6 && EV=ev6 || EV=ev5
 
-	mv ${S} ${D}
+	mv "${S}" "${D}"
 
 	dodir /usr/lib/
 	dosym ./compaq/cpml-5.2.0/libcpml_${EV}.so /usr/lib/libcpml_${EV}.so
 	dosym ./compaq/cpml-5.2.0/libcpml_${EV}.a /usr/lib/libcpml_${EV}.a
 
 	dodir /usr/share
-	mv ${D}/usr/doc ${D}/usr/share
+	mv "${D}"/usr/doc "${D}"/usr/share
 
 	dosym ./compaq/cpml-5.2.0/libcpml_${EV}.so /usr/lib/libcpml.so
 	dosym ./compaq/cpml-5.2.0/libcpml_${EV}.a /usr/lib/libcpml.a