Stable for HPPA (maybe bug #216855). Many quoting issues fixed.

Package-Manager: portage-2.1.5_rc2

3 files changed, 28 insertions, 25 deletions

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index db502074514d..cdd9caa478a2 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/mpich
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.38 2008/02/07 10:58:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.39 2008/04/09 00:54:10 jer Exp $
+
+  09 Apr 2008; Jeroen Roovers <jer@gentoo.org> mpich-1.2.7_p1.ebuild:
+  Stable for HPPA (maybe bug #216855). Many quoting issues fixed.
 
   07 Feb 2008; Raúl Porcel <armin76@gentoo.org> mpich-1.2.7_p1.ebuild:
   Add ~alpha wrt #209024
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index adac2c8498b3..54b0331a47b7 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,6 +1,6 @@
 AUX 1.2.7_p1-allow-fhs-afs.patch 1180 RMD160 b11d1acb71c6b419155396e17791824ffea69123 SHA1 dfb74d9b5c697e714874aef131d0ff4e06e175f2 SHA256 fac4371a555b3b1c94ae5f7196fcc13294772abd8456c1c146a01e65df982d9c
 AUX 1.2.7_p1-fix-romio-sandbox-breakage.patch 698 RMD160 1340bb61b3778f2309b49de85c2814fcd67a639e SHA1 30b473368a58802cc0d1cb2e2f883d1428641e8f SHA256 6ac74ea6bd141657fde78c93be79618d9c34f84e55b068a98f348ee52e308927
 DIST mpich-1.2.7p1.tar.gz 15978525 RMD160 1f42f10c0942f3a20fc2a3853ce825ba0885bb87 SHA1 7668b71c604f00aadc2db7d10f8fc031b3def9e1 SHA256 6deb6b3b0815d4874a39878f136cbcddbdb57fd57ff7ef3df6e3414a397f6171
-EBUILD mpich-1.2.7_p1.ebuild 4090 RMD160 45bbbcf9a13edf77c6fab3112d8e23b0288c1c0b SHA1 3220bc14d87e5a37480ade9b498ba6f77497bf73 SHA256 43c8ea3e10f1fa92327ad6887de87f5d154d0d75b4cdbcb0547a3374afed368c
-MISC ChangeLog 5639 RMD160 69ccd7f8e685a83031f86071f7ad85a292b7fab7 SHA1 17ec257e631758fc8a11c50ca9a2838fe9e7292e SHA256 d82e8a6a4e1199f0e4af4dc6bbf750d199e21e0f7179f92486ea316effce55a6
+EBUILD mpich-1.2.7_p1.ebuild 4145 RMD160 bab0356328b1506dbe305458d2d0246365eccb6a SHA1 8dbd54b3bf9c76438a4edf4aee7a39c2330f3164 SHA256 45471998c2aa03b5a3628515bab992b4dadcb672da2236af67836191cdcb9f1d
+MISC ChangeLog 5772 RMD160 471ee3949b5aebfce63e9b78dfa89db89a075bcf SHA1 76e3d56b3b73e010643b6321b83db23dd4feaed2 SHA256 f9c2060d95419b77456f2cfd1b3d7b3650278b2ad6f59ff7dc0bbfe99283aed0
 MISC metadata.xml 315 RMD160 12fe02dce4baa2046922f5865314c98555bd4132 SHA1 14bfa132c839c12f26e4ac1106227d2303c69e43 SHA256 d95f6835d819d4bf1bb74ac46c8259d1db23b0cfb8cd49a2a436b601f8953bd5
diff --git a/sys-cluster/mpich/mpich-1.2.7_p1.ebuild b/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
index eae801c25278..a041c712b993 100644
--- a/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
+++ b/sys-cluster/mpich/mpich-1.2.7_p1.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-cluster/mpich/mpich-1.2.7_p1.ebuild,v 1.14 2008/02/07 10:58:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.7_p1.ebuild,v 1.15 2008/04/09 00:54:10 jer Exp $
 
 inherit autotools eutils
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 hppa ppc ppc64 x86"
 IUSE="doc crypt"
 
 RDEPEND="${DEPEND}
@@ -39,18 +39,18 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	grep -FrlZ '$(P) ' . | xargs -0 sed -i -e 's/\$(P)//'
 
 	# Fix broken romio
-	epatch ${FILESDIR}/${PV}-fix-romio-sandbox-breakage.patch
-	pushd ${S}/romio
+	epatch "${FILESDIR}"/${PV}-fix-romio-sandbox-breakage.patch
+	pushd "${S}"/romio
 	rm configure
 	eautoreconf
 	popd
 
-	epatch ${FILESDIR}/${PV}-allow-fhs-afs.patch
-	pushd ${S}/mpid/server
+	epatch "${FILESDIR}"/${PV}-allow-fhs-afs.patch
+	pushd "${S}"/mpid/server
 	rm configure
 	eautoreconf
 	popd
@@ -85,34 +85,34 @@ src_install() {
 	# to skip installation of man pages, uncomment following line
 	# export MPIINSTALL_OPTS=-noman
 
-	./bin/mpiinstall -echo -prefix=${D}/usr || die
+	./bin/mpiinstall -echo -prefix="${D}"/usr || die
 
 	if use doc; then
 		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
+		mv "${D}"/usr/doc/* "${D}"/usr/share/doc/${PF}
 	fi
-	rm -rf ${D}/usr/doc/
+	rm -rf "${D}"/usr/doc/
 
 	dodir /etc/mpich
-	mv ${D}/usr/etc/* ${D}/etc/mpich/
-	rmdir ${D}/usr/etc/
+	mv "${D}"/usr/etc/* "${D}"/etc/mpich/
+	rmdir "${D}"/usr/etc/
 
 	dodir /usr/share/${PN}
-	mv ${D}/usr/examples ${D}/usr/share/${PN}/examples1
-	mv ${D}/usr/share/examples ${D}/usr/share/${PN}/examples2
+	mv "${D}"/usr/examples "${D}"/usr/share/${PN}/examples1
+	mv "${D}"/usr/share/examples "${D}"/usr/share/${PN}/examples2
 
 	# rm -rf ${D}/usr/local
-	rm -f ${D}/usr/man/mandesc
+	rm -f "${D}"/usr/man/mandesc
 
-	mv ${D}/usr/share/{machines*,Makefile.sample} ${D}/usr/share/${PN}
+	mv "${D}"/usr/share/{machines*,Makefile.sample} "${D}"/usr/share/${PN}
 
 	dodoc COPYRIGHT README
 	use doc && \
-		mv ${D}/usr/www ${D}/usr/share/doc/${PF}/html || \
-			rm -rf ${D}/usr/www
+		mv "${D}"/usr/www "${D}"/usr/share/doc/${PF}/html || \
+			rm -rf "${D}"/usr/www
 
 	# Dont let users deinstall without portage
-	rm ${D}/usr/sbin/mpiuninstall
+	rm "${D}"/usr/sbin/mpiuninstall
 
 	# We dont have a real DESTDIR, so we have to fix all the files
 	dosed /usr/bin/mpirun /usr/bin/mpiman /usr/sbin/tstmachines
@@ -135,13 +135,13 @@ src_install() {
 	dosed /usr/share/mpich/upshot/bin/upshot
 
 	# Fix datadir; mpich's build system screws it up even though we pass it
-	grep -rl 'datadir=.*' ${D} \
+	grep -rl 'datadir=.*' "${D}" \
 		| xargs sed -i -e "s:datadir=.*:datadir=/usr/share/mpich:g"
 
 	# those are dangling symlinks
-	rm -f ${D}/usr/share/mpich/examples2/mpirun
+	rm -f "${D}"/usr/share/mpich/examples2/mpirun
 
-	mv ${D}/usr/man ${D}/usr/share/man
+	mv "${D}"/usr/man "${D}"/usr/share/man
 
 	#FIXME: Here, we should either clean the empty directories
 	# or use keepdir to make sure they stick around.