backported patches and install fixes, added thread support

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 44 insertions, 19 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 8a5890f8e819..adc897632787 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.9 2006/07/12 04:59:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.10 2006/07/12 07:31:22 nerdboy Exp $
+
+  12 Jul 2006; Steve Arnold <nerdboy@gentoo.org> mpich2-1.0.3.ebuild:
+  Backported patches and install fixes to 1.0.3, but no other changes,
+  since something rather subtle broke the hdf5 configure against 1.0.3-r1
+  (but 1.0.3 relies heavily on configure detection for things like fortran
+  support and doesn't yet have a test section).  Also added thread support.
 
   12 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
   files/mpich2-1.0.3-soname.patch, mpich2-1.0.3-r1.ebuild:
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 0aa9600be549..2111837fdb8c 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -28,14 +28,14 @@ EBUILD mpich2-1.0.3-r1.ebuild 6119 RMD160 a7a29c12c4c021cf1271e88000dd1140e0a34b
 MD5 cbab8afab7b60d2db093a0bff6f0eea6 mpich2-1.0.3-r1.ebuild 6119
 RMD160 a7a29c12c4c021cf1271e88000dd1140e0a34beb mpich2-1.0.3-r1.ebuild 6119
 SHA256 d8ea8311661d23561266dcbc900fab87635e46d6d21840b20ca25fcf191c13d6 mpich2-1.0.3-r1.ebuild 6119
-EBUILD mpich2-1.0.3.ebuild 2279 RMD160 1d892c7220acd4070eec18e3df02ecad73e73a66 SHA1 26eccb977c91f4305a9518ba9e03d403c7af6f8e SHA256 c4cf2761822360502c2d61613ac83f984dd98e0c129785d339ed3ca76941a4c9
-MD5 ae9b4916057da52de4e2b4242d795ec3 mpich2-1.0.3.ebuild 2279
-RMD160 1d892c7220acd4070eec18e3df02ecad73e73a66 mpich2-1.0.3.ebuild 2279
-SHA256 c4cf2761822360502c2d61613ac83f984dd98e0c129785d339ed3ca76941a4c9 mpich2-1.0.3.ebuild 2279
-MISC ChangeLog 2036 RMD160 84fba09d6b43dfcd0e6adb3b73d269011098660b SHA1 e9e379c30dfc97918dbf4232939ef6e1297a73cf SHA256 c06331aeaf4c47488f67e9a729ac7712d4a025cc878f54cae4d4f145f7d2286b
-MD5 b64aa7fe14d72b188e9423cf91dacb3d ChangeLog 2036
-RMD160 84fba09d6b43dfcd0e6adb3b73d269011098660b ChangeLog 2036
-SHA256 c06331aeaf4c47488f67e9a729ac7712d4a025cc878f54cae4d4f145f7d2286b ChangeLog 2036
+EBUILD mpich2-1.0.3.ebuild 2819 RMD160 2a526acde2572c9c2cf522f8ccbc0811d4d3ad6e SHA1 4199e534e4f2cdf0956c505ba12124d9f7f5390e SHA256 027ee1cdb1fb6376a12848e3cb91bda6e742b85e583c15568448452063d93dc1
+MD5 0b27fdf0840921ad1228943688eb31d1 mpich2-1.0.3.ebuild 2819
+RMD160 2a526acde2572c9c2cf522f8ccbc0811d4d3ad6e mpich2-1.0.3.ebuild 2819
+SHA256 027ee1cdb1fb6376a12848e3cb91bda6e742b85e583c15568448452063d93dc1 mpich2-1.0.3.ebuild 2819
+MISC ChangeLog 2404 RMD160 1e474d0323027685b5f216806770227ecafb5aa3 SHA1 ea0028f0e52679c5bf413d0b8bda74efd5e71d1e SHA256 0f28929de4defb70d79f0b70f80165d16633c7dce839cb20da9ff08a35ef8a89
+MD5 318daa65fc72228b1ec160d47c1e8b9d ChangeLog 2404
+RMD160 1e474d0323027685b5f216806770227ecafb5aa3 ChangeLog 2404
+SHA256 0f28929de4defb70d79f0b70f80165d16633c7dce839cb20da9ff08a35ef8a89 ChangeLog 2404
 MISC metadata.xml 249 RMD160 ba772efa333aad616b4054716659b5e34044f687 SHA1 79e5907109f7f689902f20eb05d91ef83459e4d9 SHA256 a433de87cf1259d53fc0ab354e109539269c46d9260c7d4eef7ce33a735e6c6f
 MD5 8030c8b7656ad8112a5f870431e95932 metadata.xml 249
 RMD160 ba772efa333aad616b4054716659b5e34044f687 metadata.xml 249
diff --git a/sys-cluster/mpich2/mpich2-1.0.3.ebuild b/sys-cluster/mpich2/mpich2-1.0.3.ebuild
index b1da47c5c93f..34ef77cdc1a8 100644
--- a/sys-cluster/mpich2/mpich2-1.0.3.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.3.ebuild,v 1.5 2006/06/25 11:48:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.3.ebuild,v 1.6 2006/07/12 07:31:22 nerdboy Exp $
 
 inherit eutils autotools kde-functions
 
@@ -11,8 +11,8 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-# need more arches in here, like sparc...
-IUSE="crypt cxx doc debug mpe"
+# need more arches in here...
+IUSE="crypt cxx doc debug mpe threads"
 
 PROVIDE="virtual/mpi"
 DEPEND="virtual/libc
@@ -34,11 +34,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	need-autoconf 2.5
-	epatch ${FILESDIR}/${P}-soname.patch
 	ebegin "Reconfiguring"
 	    ./maint/updatefiles
 	eend "Reconfigure failed"
-	epatch ${FILESDIR}/${P}-make.patch
+	epatch ${FILESDIR}/${P}-make.patch || die "make patch failed"
+	# damn, have to patch the createshlib script here...
+	epatch ${FILESDIR}/${P}-soname.patch || die "soname patch failed"
+
 }
 
 src_compile() {
@@ -60,34 +62,51 @@ src_compile() {
 	    myconf="${myconf} --enable-g=dbg --enable-debuginfo"
 	fi
 
+	if use threads ; then
+	    myconf="${myconf} --with-thread-package=pthreads"
+	else
+	    myconf="${myconf} --with-thread-package=none"
+	fi
+
 	./configure --prefix=/usr --enable-sharedlibs=gcc \
-		${myconf} \
+		${myconf} --enable-rlog=no --enable-slog2=no \
 		$(use_enable cxx) \
 		$(use_enable mpe) \
+		$(use_enable threads) \
+		--includedir=/usr/include \
 		--libdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man \
 		--with-docdir=/usr/share/doc/${PF} \
 		--with-htmldir=/usr/share/doc/${PF}/html \
 		--sysconfdir=/etc/mpich2 \
 		--datadir=/usr/share/mpich2 || die "configure failed"
+
+	if use mpe ; then
+	     epatch ${FILESDIR}/${P}-mpe-install.patch || die "install patch failed"
+	fi
+
 	make || die "make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	dodir /etc/${PN}
+	rm -rf src/mpe2/etc/*.in
+	make install DESTDIR=${D} LIBDIR=${D}usr/$(get_libdir) \
+	    || die "make install failed"
 
 	dodir /usr/share/${PN}
 	mv ${D}usr/examples/cpi ${D}usr/share/${PN}/cpi
 	rm -rf ${D}/usr/examples
+	rm -rf ${D}usr/sbin
 
 	dodir /usr/share/doc/${PF}
 	if use doc; then
 		dodoc COPYRIGHT README README.romio README.testing CHANGES
 		dodoc README.developer RELEASE_NOTES
+		newdoc src/pm/mpd/README README.mpd
 	else
-		rm -rf ${D}/usr/share/doc/
-		rm -rf ${D}/usr/share/man/
+		rm -rf ${D}usr/share/doc/
+		rm -rf ${D}usr/share/man/
 		dodoc README CHANGES COPYRIGHT RELEASE_NOTES
-		newdoc src/pm/mpd/README README.mpd
 	fi
 }