Trim fortran patch such that it at least applies to the latest ebuild. The removed part is for the build_gcc script that we don't use anyway.

Package-Manager: portage-2.2.00.14200-prefix/cvs/Darwin powerpc

3 files changed, 8 insertions, 90 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index 4d568076b46c..d0e4d377e566 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.7 2009/09/05 16:46:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.8 2009/09/06 09:36:37 grobian Exp $
+
+  06 Sep 2009; Fabian Groffen <grobian@gentoo.org>
+  files/gcc-apple-4.2.1-gfortran.patch:
+  Trim fortran patch such that it at least applies to the latest ebuild. The
+  removed part is for the build_gcc script that we don't use anyway.
 
 *gcc-apple-4.2.1_p5646 (05 Sep 2009)
 
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 21348a2c5bb5..3652695bbb83 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,6 +1,6 @@
 AUX gcc-apple-4.0.1_p5465-default-altivec.patch 1381 RMD160 e2c62e9cd060538f1ec03cef6487031e7ac88607 SHA1 01131175af3ca748494057f3660947e1d969149f SHA256 699dfea402a5a2d80f8374254a36fc7552f32b5fc25c1d15d9b88b7742874f09
 AUX gcc-apple-4.2.1-dsymutil.patch 853 RMD160 3e86edb057bb5a6248706a031afa56a599d4d6ef SHA1 3a2b844d68074c7c0e582eb51ddb9c5a6889a8bc SHA256 bba3d9d406afe12f1fd55f7b91ab65c07d4a1b37401d711a0ea287104aa07040
-AUX gcc-apple-4.2.1-gfortran.patch 6232 RMD160 b33ef002e54f82ede677fc5274e1433122834b53 SHA1 298b5f42932698b81840221c507447a319c5f055 SHA256 8d5abc70e4ec3c361c39b8dfced5729ab4279ca1743047a965c625dde03089db
+AUX gcc-apple-4.2.1-gfortran.patch 1745 RMD160 d0adb5edc1a6805a915c36e3ae89d61f57c49a97 SHA1 e831cd60aec04c5e27752b9522df584e11da8463 SHA256 aaaaa9f95e8d9c100298ddff6b64480c73cd8463c32ab7b748780036ad508011
 AUX gcc-apple-4.2.1-inline-asm.patch 955 RMD160 5991da80a5b1c8757cff3be8fc04949e795f2787 SHA1 5fbb63447594b04c16e12085cd72002657aecc85 SHA256 abd3e20f84bd15585350d034883fa9728691c33164b55370a8d3b984de910e1f
 AUX gcc-apple-4.2.1-prefix-search-dirs.patch 1053 RMD160 0b723b244efe7a46967dbd16a73df8b621582ecc SHA1 52b6a60095287b49252b986938192420fe982f2d SHA256 8f71661b144df92cd9a924b54cbd11a28de0b7ddc258a489bd1e1913e7d4a208
 AUX gcc-apple-4.2.1-texinfo.patch 1110 RMD160 98030bc2d0d561a4f077b15d9eec8c9386e7d8bb SHA1 88b484beec786625ad4b159169c17531ed86e9e1 SHA256 1efd6ac46557feb01b7c28b214209ed3eab4714d91b6cbdf8701801ff53d545d
@@ -21,5 +21,5 @@ EBUILD gcc-apple-4.0.1_p5493.ebuild 8481 RMD160 c1ee2845c6f094b0be6c017c0e13f825
 EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10691 RMD160 0312905efd338cca36ec2f10371577ee4c3e14ad SHA1 f7013918fe5dd651108106be5588cc838b159476 SHA256 9fc40554742e3f90ce2ac200312250a3a3d41412d288b1397caa109cfd16bc79
 EBUILD gcc-apple-4.2.1_p5574.ebuild 10705 RMD160 16a1b94434583b8f2041a496ed5ff9a7096f04b9 SHA1 0503dd7b33cb61939a928d85308febf400ffc529 SHA256 a462c507e8227b3a1587c1eb38c83c4ba424e9066b727d470be0a0f6dcc2effd
 EBUILD gcc-apple-4.2.1_p5646.ebuild 10568 RMD160 b27d6bfbc26ca20738e3ecd184092f7b5929a002 SHA1 f0f7d6ff64f1e3f09c77733b09f6f3d3502084fc SHA256 738f9d4a232a6ee64c07ea4b499b1bb36ee5dd07b7cd43d8524c6314778e9d32
-MISC ChangeLog 9130 RMD160 6925dbff6383215da48574bbca05777d146d04e3 SHA1 7aec5c21aab2819a104fc295cdd1a8b6a72471a4 SHA256 637f34d65d018a46b81ad4df2398c9dae55c21cdc2f25ffecf60f6e502ad521f
+MISC ChangeLog 9368 RMD160 cd1d2926dc404221e34ef297245898e6221b844d SHA1 4d854597ea5446e86852d47aed12af3d39ceabec SHA256 092240396799f2ecf6bc4c16c712da7f90d6f7c10becaa6b790a369d52b57fa9
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-gfortran.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-gfortran.patch
index b5f2cc544c96..80b8761f658e 100644
--- a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-gfortran.patch
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-gfortran.patch
@@ -1,89 +1,3 @@
-diff -Nru gcc_42-5564/build_gcc gcc_42-5564.mod/build_gcc
---- gcc_42-5564/build_gcc	2008-04-15 20:25:12.000000000 -0400
-+++ gcc_42-5564.mod/build_gcc	2008-08-29 17:25:03.000000000 -0400
-@@ -112,7 +112,7 @@
- CONFIGFLAGS="--disable-checking --enable-werror \
-   --prefix=$DEST_ROOT \
-   --mandir=\${prefix}/share/man \
--  --enable-languages=c,objc,c++,obj-c++ \
-+  --enable-languages=c,objc,c++,obj-c++,fortran \
-   --program-transform-name=/^[cg][^.-]*$/s/$/-$MAJ_VERS/ \
-   --with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION \
-   --with-slibdir=/usr/lib \
-@@ -326,6 +326,8 @@
-     $DIR/dst-*-$t$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gcc-$VERS || exit 1
-   lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-g++-$VERS -create \
-     $DIR/dst-*-$t$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-g++* || exit 1
-+  lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gfortran-$VERS -create \
-+    $DIR/dst-*-$t$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gfortran* || exit 1
- done
- 
- # lib
-@@ -348,16 +350,22 @@
- 		.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
- 	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgomp.spec \
- 		.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
-+	    cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgfortran.a \
-+		.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ || exit 1
- 	    if [ $h = 'powerpc' ] ; then
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.a \
- 		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.spec \
- 		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
-+		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgfortran.a \
-+		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ || exit 1
- 	    elif [ $h = 'i686' ] ; then
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.a \
- 		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
- 		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.spec \
- 		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
-+		cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgfortran.a \
-+		    .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ || exit 1
- 	    fi
- 	fi
-     done
-@@ -432,6 +440,16 @@
- 	-L$DIR/dst-$BUILD-$h$DEST_ROOT/$h-apple-darwin$DARWIN_VERS/lib/                    \
-         -L$DIR/obj-$h-$BUILD/libiberty/                                        \
- 	-o $DEST_DIR/$DEST_ROOT/bin/tmp-$h-g++-$MAJ_VERS || exit 1
-+
-+    $DEST_DIR$DEST_ROOT/bin/$h-apple-darwin$DARWIN_VERS-gcc-$VERS                          \
-+	$ORIG_SRC_DIR/driverdriver.c                               \
-+	-DPDN="\"-apple-darwin$DARWIN_VERS-gfortran-$VERS\""                                    \
-+	-DIL="\"$DEST_ROOT/bin/\"" -I  $ORIG_SRC_DIR/include                   \
-+	-I  $ORIG_SRC_DIR/gcc -I  $ORIG_SRC_DIR/gcc/config                     \
-+	-liberty -L$DIR/dst-$BUILD-$h$DEST_ROOT/lib/                           \
-+	-L$DIR/dst-$BUILD-$h$DEST_ROOT/$h-apple-darwin$DARWIN_VERS/lib/                    \
-+        -L$DIR/obj-$h-$BUILD/libiberty/                                        \
-+	-o $DEST_DIR/$DEST_ROOT/bin/tmp-$h-gfortran-$MAJ_VERS || exit 1
- done
- 
- lipo -output $DEST_DIR/$DEST_ROOT/bin/gcc-$MAJ_VERS -create \
-@@ -440,10 +458,14 @@
- lipo -output $DEST_DIR/$DEST_ROOT/bin/g++-$MAJ_VERS -create \
-   $DEST_DIR/$DEST_ROOT/bin/tmp-*-g++-$MAJ_VERS || exit 1
- 
-+lipo -output $DEST_DIR/$DEST_ROOT/bin/gfortran-$MAJ_VERS -create \
-+  $DEST_DIR/$DEST_ROOT/bin/tmp-*-gfortran-$MAJ_VERS || exit 1
-+
- ln -f $DEST_DIR/$DEST_ROOT/bin/g++-$MAJ_VERS $DEST_DIR/$DEST_ROOT/bin/c++-$MAJ_VERS || exit 1
- 
- rm $DEST_DIR/$DEST_ROOT/bin/tmp-*-gcc-$MAJ_VERS || exit 1
- rm $DEST_DIR/$DEST_ROOT/bin/tmp-*-g++-$MAJ_VERS || exit 1
-+rm $DEST_DIR/$DEST_ROOT/bin/tmp-*-gfortran-$MAJ_VERS || exit 1
- 
- # Remove extraneous stuff
- rm -rf $DEST_DIR/$DEST_ROOT/lib/gcc/*/*/include/c++
-@@ -472,7 +494,7 @@
- ########################################
- # Remove debugging information from DEST_DIR.
- 
--find $DEST_DIR -perm -0111 \! -name fixinc.sh \
-+find $DEST_DIR -perm -0111 \! -name fixinc.sh \! -name libgfortran\* \
-     \! -name mkheaders \! -name libstdc++.dylib -type f -print \
-   | xargs strip || exit 1
- find $DEST_DIR -name \*.a -print | xargs strip -SX || exit 1
-diff -Nru gcc_42-5564/gcc/fortran/Make-lang.in gcc_42-5564.mod/gcc/fortran/Make-lang.in
 --- gcc_42-5564/gcc/fortran/Make-lang.in	2008-04-01 17:26:19.000000000 -0400
 +++ gcc_42-5564.mod/gcc/fortran/Make-lang.in	2008-08-29 17:25:03.000000000 -0400
 @@ -73,7 +73,7 @@
@@ -104,7 +18,6 @@ diff -Nru gcc_42-5564/gcc/fortran/Make-lang.in gcc_42-5564.mod/gcc/fortran/Make-
  
  gt-fortran-trans.h    : s-gtype; @true
  #
-diff -Nru gcc_42-5564/gcc/fortran/fake.c gcc_42-5564.mod/gcc/fortran/fake.c
 --- gcc_42-5564/gcc/fortran/fake.c	1969-12-31 19:00:00.000000000 -0500
 +++ gcc_42-5564.mod/gcc/fortran/fake.c	2008-08-29 17:42:58.000000000 -0400
 @@ -0,0 +1,27 @@