Fixed broken patch (bug #220877).

Package-Manager: portage-2.1.5_rc7

3 files changed, 51 insertions, 45 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index a0854bb28ff6..d4facc2c07cd 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.27 2008/03/22 00:56:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.28 2008/05/09 13:27:27 markusle Exp $
+
+  09 May 2008; Markus Dittrich <markusle@gentoo.org>
+  files/mpich2-1.0.6-fPIC.patch:
+  Fixed broken patch (bug #220877).
 
   22 Mar 2008; Steve Arnold <nerdboy@gentoo.org> mpich2-1.0.3.ebuild:
   fixed QA issues in oldest versions (mostly string quoting)
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index ce33729e6fb3..cdaa9794c972 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -4,7 +4,7 @@ AUX mpich2-1.0.3-make.patch 4524 RMD160 1b4d1aaaafacb688ae0118714a36ec12b60e97b6
 AUX mpich2-1.0.3-mpe-install.patch 428 RMD160 0741898cfbe9b16653d4cf6ed7a04adf16d222b8 SHA1 fe005914d238b295f19242470f1f7c237638964e SHA256 51d6d4a6336dbfb4d316837f3ac3b3ad796a9a9239727bf7cf2b7bfea01c5c62
 AUX mpich2-1.0.3-soname.patch 1201 RMD160 9ff5a58e828f1c51d963002ac14de21e8cff2995 SHA1 361065c50ad001c9b9645643cbd82f853cdb03c0 SHA256 5625f28ac75530099a8230b9b1679f11977079f92e6ddfa75d371e02e3f4b7e3
 AUX mpich2-1.0.6-cxx.patch 800 RMD160 520fb52b2673f2621a608e04cfdba8bde07de9e8 SHA1 c173951896f8f8f9715dea1054a1b1f9d0460a41 SHA256 e1fce30688a0d53ebe2f92f059a9f86af8a713e6492be5f0323b68669da8c7c7
-AUX mpich2-1.0.6-fPIC.patch 4071 RMD160 17f5fefa2f6b32f3ccdd53c82305701b26756f31 SHA1 40d151f8e0a3a713f025c820ec5f0bd689430f2e SHA256 133a7629fd81ba112677ff71a9b8021ed51f4b1c03c567ad03d0ddfc2b7889da
+AUX mpich2-1.0.6-fPIC.patch 4264 RMD160 c4858486a513c86e4737eddea05a79c9c3f084fb SHA1 ad6a391ed3e81e0743813e55eb083bd9a5847b5a SHA256 ced9330a760ff9f9fa21d1a542eac87274d437e71d2969d83c9264a72775e1cc
 AUX mpich2-1.0.6-makefile.patch 1758 RMD160 af1eafc2e65d7ef33206c945c947418920704268 SHA1 c81be875e94a8b298fc10b7b7370393003151fd4 SHA256 4ab34c5dc07322dc71df29d27ae96c9e88f1af444f980547dc5d3a055fdd2577
 AUX mpich2-1.0.6-no-pvfs2.patch 1014 RMD160 627224ce6f4093ef5624107d53211b4de9c43b62 SHA1 846e9fe09153e9a6e6cd87b13b021d176b16631a SHA256 d69529a23626af31143945557a71ad7690169b7db0b8446183b4d8703b220e76
 AUX mpich2-1.0.6-shlib.patch 1576 RMD160 b68da396b97cfce783e5439eb53388c96ee74bef SHA1 0f6f7f929d69ec70c5ec14a785c4388a032166b7 SHA256 32ed3e4fa4048b3efcea3db55326c89ccb50bf86d0928e6fc8b0b3e715702089
@@ -13,5 +13,5 @@ DIST mpich2-1.0.6p1.tar.gz 15437620 RMD160 c3249bec1936bd9f3de9a8bb83f29bd32b06c
 EBUILD mpich2-1.0.3-r1.ebuild 6185 RMD160 b3f956ab1420c0ca8027b32dff253d766e5118f4 SHA1 ce824ee0946e8d8fb45a4dc19dc0ee092670cb9e SHA256 4181045f357f422541ff2146a34e55bfa7a7e9dde8852a1d50bee10a9824496d
 EBUILD mpich2-1.0.3.ebuild 2852 RMD160 c8540446bad033ce1503046f3650d91fe7dc5309 SHA1 9a91a09837cbb18c8842eb963e9c75135d2202aa SHA256 88ba20ada9b09e95e8b321f128114022f2158cfa6865873528075f1c9b05b8f0
 EBUILD mpich2-1.0.6.ebuild 11149 RMD160 0de02d43180caea170075366cbfb712a6893fa24 SHA1 ed0c4e3b3664860ab6ade47c4cf00c933de12e0a SHA256 783fb1eeef095ebaa9de4c484a699585af2ee9977ae76748e718e5fcc307dc62
-MISC ChangeLog 6713 RMD160 ed9aed81b3415a7b4f8a05aa18d340bd85dbf308 SHA1 d212b931b3ea9988c2b3cff3f3ba659aa3a74538 SHA256 29ffc43e64b1871c39540d04faa3987849a3377f4c891a8de297c2e6d01eff56
+MISC ChangeLog 6837 RMD160 f4b4dae67226f940462c34a90f3c858b8cc32f1e SHA1 8c157afc76e30e34555c99fe9de32fec6a9c0988 SHA256 862b83bef84ccc3fbbcec83c4882e2e2bb529707567d037bee38f71948203846
 MISC metadata.xml 252 RMD160 10123b1072a83227cac20dfe2a5065a3a6851563 SHA1 571c3db0391f894cb0bcbda2e3c5bd561482aca6 SHA256 cbf48aa7f9f6669327e88c9825ece05758d93afffa5c30b9b28568131b008367
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch
index 33fee9aa49c5..00b6d6a87acd 100644
--- a/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch
+++ b/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch
@@ -1,13 +1,35 @@
---- configure.orig	2007-10-10 20:59:53.000000000 -0700
-+++ configure	2007-10-10 21:04:17.000000000 -0700
-@@ -8783,24 +8783,24 @@
+diff -Naur mpich2-1.0.6p1/confdb/aclocal_shl.m4 mpich2-1.0.6p1.new/confdb/aclocal_shl.m4
+--- mpich2-1.0.6p1/confdb/aclocal_shl.m4	2007-05-16 09:39:01.000000000 -0400
++++ mpich2-1.0.6p1.new/confdb/aclocal_shl.m4	2008-05-09 09:04:35.000000000 -0400
+@@ -89,7 +89,7 @@
+     # For example, include the libname as ${LIBNAME_SHL}
+     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
+     # May need -fPIC 
+-    CC_SHL='${CC} -fpic'
++    CC_SHL='${CC} -fPIC'
+     #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
+     # More recent versions allow multiple args, separated by commas
+     C_LINKPATH_SHL="-Wl,-rpath,"
+@@ -233,7 +233,7 @@
+     gcc)
+     # For example, include the libname as ${LIBNAME_SHL}
+     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
+-    pac_cc_sharedlibs='gcc -shared -fpic'
++    pac_cc_sharedlibs='gcc -shared -fPIC'
+     pac_clink_sharedlibs='gcc -shared'
+     ;;
+     libtool)
+diff -Naur mpich2-1.0.6p1/configure mpich2-1.0.6p1.new/configure
+--- mpich2-1.0.6p1/configure	2008-05-09 09:08:14.000000000 -0400
++++ mpich2-1.0.6p1.new/configure	2008-05-09 09:06:52.000000000 -0400
+@@ -9061,24 +9061,24 @@
  	 # if the compiler allows it (e.g., building with gcc but
  	 # a different Fortran compiler. Another option is to
  	 # *require* g77.
--	 { echo "$as_me:$LINENO: checking whether $F77 allows -shared -fpic" >&5
--echo $ECHO_N "checking whether $F77 allows -shared -fpic... $ECHO_C" >&6; }
-+	 { echo "$as_me:$LINENO: checking whether $F77 allows -shared -fPIC" >&5
-+echo $ECHO_N "checking whether $F77 allows -shared -fPIC... $ECHO_C" >&6; }
+-	 { $as_echo "$as_me:$LINENO: checking whether $F77 allows -shared -fpic" >&5
+-$as_echo_n "checking whether $F77 allows -shared -fpic... " >&6; }
++	 { $as_echo "$as_me:$LINENO: checking whether $F77 allows -shared -fPIC" >&5
++$as_echo_n "checking whether $F77 allows -shared -fPIC... " >&6; }
  	 rm -f conftest.f
  	 cat > conftest.f <<EOF
         program main
@@ -17,23 +39,23 @@
 -	     FC_SHL="$F77 -shared -fpic"
 +         if $F77 -shared -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
 +	     FC_SHL="$F77 -shared -fPIC"
-              { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
           else
-              { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
--             { echo "$as_me:$LINENO: checking whether $F77 allows -fpic" >&5
--echo $ECHO_N "checking whether $F77 allows -fpic... $ECHO_C" >&6; }
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+-             { $as_echo "$as_me:$LINENO: checking whether $F77 allows -fpic" >&5
+-$as_echo_n "checking whether $F77 allows -fpic... " >&6; }
 -             if $F77 -fpic -o conftest conftest.f >/dev/null 2>&1 ; then
 -	         FC_SHL="$F77 -fpic"
-+             { echo "$as_me:$LINENO: checking whether $F77 allows -fPIC" >&5
-+echo $ECHO_N "checking whether $F77 allows -fPIC... $ECHO_C" >&6; }
++             { $as_echo "$as_me:$LINENO: checking whether $F77 allows -fPIC" >&5
++$as_echo_n "checking whether $F77 allows -fPIC... " >&6; }
 +             if $F77 -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
 +	         FC_SHL="$F77 -fPIC"
-                  { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+                  { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
               else
-@@ -9837,7 +9837,7 @@
+@@ -10118,7 +10118,7 @@
      gcc)
      if test "$pac_cv_f90_vendor" = gnu -o "$F90" = "g95" ; then
          # If we have the GNU Fortran 95 compiler (untested)
@@ -42,7 +64,7 @@
          F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
      else
          case "$pac_cv_f90_vendor" in
-@@ -9848,13 +9848,13 @@
+@@ -10129,13 +10129,13 @@
  
  	    intel)
  	    # Intel implements the GNU options
@@ -58,7 +80,7 @@
              F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
  	    ;;
  
-@@ -10852,7 +10852,7 @@
+@@ -11155,7 +11155,7 @@
  	;;
  	gcc)
          # Assume that the compiler is g++ if gcc style shared libraries chosen
@@ -67,7 +89,7 @@
          CXX_LINKPATH_SHL="-Wl,-rpath -Wl,"
  	;;
  	cygwin|cygwin-gcc)
-@@ -12571,7 +12571,7 @@
+@@ -12906,7 +12906,7 @@
      # For example, include the libname as ${LIBNAME_SHL}
      #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
      # May need -fPIC
@@ -76,27 +98,7 @@
      #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
      # More recent versions allow multiple args, separated by commas
      C_LINKPATH_SHL="-Wl,-rpath,"
-@@ -12839,7 +12839,7 @@
-     gcc)
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
--    pac_cc_sharedlibs='gcc -shared -fpic'
-+    pac_cc_sharedlibs='gcc -shared -fPIC'
-     pac_clink_sharedlibs='gcc -shared'
-     ;;
-     libtool)
---- confdb/aclocal_shl.m4.orig	2007-05-16 06:39:01.000000000 -0700
-+++ confdb/aclocal_shl.m4	2007-10-10 21:05:15.000000000 -0700
-@@ -89,7 +89,7 @@
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
-     # May need -fPIC 
--    CC_SHL='${CC} -fpic'
-+    CC_SHL='${CC} -fPIC'
-     #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
-     # More recent versions allow multiple args, separated by commas
-     C_LINKPATH_SHL="-Wl,-rpath,"
-@@ -233,7 +233,7 @@
+@@ -13174,7 +13174,7 @@
      gcc)
      # For example, include the libname as ${LIBNAME_SHL}
      #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'