(#103430) Make AFS work without requiring /usr/afsws to exist.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 64 insertions, 13 deletions

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index c3fd351bd42c..9aab96f67e42 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpich
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.29 2006/09/25 04:05:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.30 2006/09/25 04:27:29 dberkholz Exp $
+
+  25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.2.7_p1-allow-fhs-afs.patch, mpich-1.2.7_p1.ebuild:
+  (#103430) Make AFS work without requiring /usr/afsws to exist.
 
   25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   mpich-1.2.7_p1.ebuild:
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 7e6f84b60fa2..8ff6fbf78925 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -2,6 +2,10 @@ AUX 1.2.6-fix-romio-sandbox-breakage.patch 690 RMD160 72f4b6bdf21493c31d2ec1c56c
 MD5 e878381a3b6165630ef1a8b3989076c8 files/1.2.6-fix-romio-sandbox-breakage.patch 690
 RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 files/1.2.6-fix-romio-sandbox-breakage.patch 690
 SHA256 a9f3e790f365a8e2d02d1cf7a0e5a4bc662abf5c1780d6b5ad93d57a48a78112 files/1.2.6-fix-romio-sandbox-breakage.patch 690
+AUX 1.2.7_p1-allow-fhs-afs.patch 1180 RMD160 b11d1acb71c6b419155396e17791824ffea69123 SHA1 dfb74d9b5c697e714874aef131d0ff4e06e175f2 SHA256 fac4371a555b3b1c94ae5f7196fcc13294772abd8456c1c146a01e65df982d9c
+MD5 875f85e42a88271f2cb95be9589637cf files/1.2.7_p1-allow-fhs-afs.patch 1180
+RMD160 b11d1acb71c6b419155396e17791824ffea69123 files/1.2.7_p1-allow-fhs-afs.patch 1180
+SHA256 fac4371a555b3b1c94ae5f7196fcc13294772abd8456c1c146a01e65df982d9c files/1.2.7_p1-allow-fhs-afs.patch 1180
 AUX 1.2.7_p1-fix-romio-sandbox-breakage.patch 698 RMD160 1340bb61b3778f2309b49de85c2814fcd67a639e SHA1 30b473368a58802cc0d1cb2e2f883d1428641e8f SHA256 6ac74ea6bd141657fde78c93be79618d9c34f84e55b068a98f348ee52e308927
 MD5 e2c40d21fee1af27db5ad0f7b6d158d5 files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
 RMD160 1340bb61b3778f2309b49de85c2814fcd67a639e files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
@@ -17,14 +21,14 @@ EBUILD mpich-1.2.6-r4.ebuild 4047 RMD160 34352149a4d218ecd48df8adb63ed00d32fb665
 MD5 b5ee11c1c54dc5f309210def20249348 mpich-1.2.6-r4.ebuild 4047
 RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 mpich-1.2.6-r4.ebuild 4047
 SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda mpich-1.2.6-r4.ebuild 4047
-EBUILD mpich-1.2.7_p1.ebuild 4034 RMD160 5e7bf08c71f84ab4bc09fd48ca0197c495b19b73 SHA1 3b5a528cf4045a79c0de289b5dc88273823abef0 SHA256 0af4a1ecae4d8c05f98e307956b85b1f213aeac0700fcc1194b4bb54d9080a51
-MD5 7bb20595d50c13fd2ae1cc95ba25806b mpich-1.2.7_p1.ebuild 4034
-RMD160 5e7bf08c71f84ab4bc09fd48ca0197c495b19b73 mpich-1.2.7_p1.ebuild 4034
-SHA256 0af4a1ecae4d8c05f98e307956b85b1f213aeac0700fcc1194b4bb54d9080a51 mpich-1.2.7_p1.ebuild 4034
-MISC ChangeLog 4491 RMD160 793894be1dd6094803935c730416b02c711a6b39 SHA1 0ac964ed647d767f6936ceb789151b8269622252 SHA256 7ab84c8cec9d198563d61739ffcf779461b7f40594d88e315d351f87968de4d9
-MD5 32887741e8c432c16b469ba3cf85bcde ChangeLog 4491
-RMD160 793894be1dd6094803935c730416b02c711a6b39 ChangeLog 4491
-SHA256 7ab84c8cec9d198563d61739ffcf779461b7f40594d88e315d351f87968de4d9 ChangeLog 4491
+EBUILD mpich-1.2.7_p1.ebuild 4138 RMD160 dd60c06a9a2751fd76afa448de14d5cee31b4b04 SHA1 c3c47d557106b9d6f61a75ad12ff76f2ac5904b9 SHA256 1d1b90dd7f5d008a07a5b936552a07b564312e98e86e3af246d5aa8ba5657319
+MD5 de06b1df4bfd13bcb026b349809107a9 mpich-1.2.7_p1.ebuild 4138
+RMD160 dd60c06a9a2751fd76afa448de14d5cee31b4b04 mpich-1.2.7_p1.ebuild 4138
+SHA256 1d1b90dd7f5d008a07a5b936552a07b564312e98e86e3af246d5aa8ba5657319 mpich-1.2.7_p1.ebuild 4138
+MISC ChangeLog 4674 RMD160 c8b4a9af2e87cc0032c2331d77a2f8d81de27e1c SHA1 2d25db25bf5eb69e6ba9bdff56dd54bc7479960a SHA256 3a9a04ce68c98c13eb2dd1743a5ee6fe623b540a9ad5d10dfd5ee5180339dfa3
+MD5 f41913b28cd593d9b6289732ca36280a ChangeLog 4674
+RMD160 c8b4a9af2e87cc0032c2331d77a2f8d81de27e1c ChangeLog 4674
+SHA256 3a9a04ce68c98c13eb2dd1743a5ee6fe623b540a9ad5d10dfd5ee5180339dfa3 ChangeLog 4674
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
diff --git a/sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch b/sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch
new file mode 100644
index 000000000000..522bae30241b
--- /dev/null
+++ b/sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch
@@ -0,0 +1,36 @@
+diff -urN mpich-1.2.7p1.orig/mpid/server/aclocal.m4 mpich-1.2.7p1/mpid/server/aclocal.m4
+--- mpich-1.2.7p1.orig/mpid/server/aclocal.m4	2006-09-24 21:11:27.000000000 -0700
++++ mpich-1.2.7p1/mpid/server/aclocal.m4	2006-09-24 21:14:26.000000000 -0700
+@@ -27,21 +27,18 @@
+ dnl Just having AFS directories doesn't mean that you can use 
+ dnl AFS headers.
+ AC_DEFUN(AC_CHECK_AFS,
+-[AC_MSG_CHECKING(for AFS (/usr/afsws))
++[AC_MSG_CHECKING(for AFS)
+     AC_CACHE_VAL(ac_cv_sys_afs, [dnl
+-	if test -d /usr/afsws ; then
+-	    afs_avail=1
+-	    AC_CHECK_HEADER(afs/kauth.h,,afs_avail=0)
+-	    AC_CHECK_HEADER(afs/kautils.h,,afs_avail=0)
+-	    AC_CHECK_HEADER(afs/auth.h,,afs_avail=0)
+-	    if test $afs_avail = 1 ; then
+-  	        ac_cv_sys_afs="yes"
+-	    else
+-		ac_cv_sys_afs="no"
+-	    fi
+-	else
+-	    ac_cv_sys_afs="no"
+-	fi
++    afs_avail=1
++    AC_CHECK_HEADER(afs/kauth.h,,afs_avail=0)
++    AC_CHECK_HEADER(afs/kautils.h,,afs_avail=0)
++    AC_CHECK_HEADER(afs/auth.h,,afs_avail=0)
++    if test $afs_avail = 1 ; then
++        ac_cv_sys_afs="yes"
++    else
++	ac_cv_sys_afs="no"
++    fi
++    ac_cv_sys_afs="no"
+     ])
+     if test "$ac_cv_sys_afs" = "yes"; then
+ 	AC_DEFINE(HAVE_AFS)
diff --git a/sys-cluster/mpich/mpich-1.2.7_p1.ebuild b/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
index 6bbb5413e120..f34663b3b623 100644
--- a/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
+++ b/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.7 2006/09/25 04:05:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.7_p1.ebuild,v 1.8 2006/09/25 04:27:29 dberkholz Exp $
 
-inherit eutils
+inherit autotools eutils
 
 # Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
 # mpich listens on or any other custom options (#38207).
@@ -47,9 +47,16 @@ src_unpack() {
 
 	# Fix broken romio
 	epatch ${FILESDIR}/${PV}-fix-romio-sandbox-breakage.patch
-	cd ${S}/romio
+	pushd ${S}/romio
 	rm configure
-	autoreconf --install --verbose
+	eautoreconf
+	popd
+
+	epatch ${FILESDIR}/${PV}-allow-fhs-afs.patch
+	pushd ${S}/mpid/server
+	rm configure
+	eautoreconf
+	popd
 }
 
 src_compile() {