4 files changed, 14 insertions, 9 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 757a84b6529f..8697cad62195 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.328 2004/09/19 21:37:15 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.329 2004/09/19 21:51:41 solar Exp $
+
+  19 Sep 2004; <solar@gentoo.org> files/3.3.4/gcc-3.3.4-spec-env.patch,
+  files/3.4.1/gcc-3.4.1-spec-env.patch:
+  update robs patches from GCC_SPEC to GCC_SPECS so names are consistent in all
+  gcc versions
 
   19 Sep 2004; <solar@gentoo.org> :
   restore changelog
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 27496f440561..22667e1b87ba 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -20,7 +20,7 @@ MD5 3f83a8d4f48a08c93928a74922eabaf0 gcc-3.3.2-r4.ebuild 20562
 MD5 2f2650284e244eafc0795b02a1bdadd2 gcc-2.95.3-r8.ebuild 8306
 MD5 192382b893da342324669e153371fd56 gcc-3.3.3-r3.ebuild 23575
 MD5 8dc61d014521e2c7e35e11b147a5be30 gcc-3.3.2-r1.ebuild 17783
-MD5 6b018bef5f26e3138d9700c88d2f1a90 ChangeLog 67734
+MD5 b61be8e0cca6913cb54757af32968bd5 ChangeLog 67942
 MD5 c874c9694587097d692fa64cd46be416 gcc-3.3.2.ebuild 17730
 MD5 c45538377c4cf95b5e05fe3f3eaecc97 gcc-3.3.3_pre20040426.ebuild 22454
 MD5 29101392d0713e27c3186bab17fa17c2 gcc-3.3.4-r2.ebuild 24802
@@ -102,7 +102,7 @@ MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-brand
 MD5 66df5567226338b7504bbd3c25cea92c files/3.3.3/gcc-3.3.3-libiberty-pic.patch 370
 MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653
 MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876
-MD5 bdb8caa319e9be11a73a0fc4f405cfbd files/3.3.4/gcc-3.3.4-spec-env.patch 785
+MD5 8c779f2dca6ab1b5b95e2ee211d26c8c files/3.3.4/gcc-3.3.4-spec-env.patch 786
 MD5 bae93db3186aa0fc25d659b7799ef499 files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch 825
 MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563
 MD5 c919e0a2cd429d0121b6133c1b4e41a6 files/3.4.0/gcc34-ice-hack.patch 8605
@@ -111,7 +111,7 @@ MD5 c7ed491e4bcee6cae89067d4e1c899a8 files/3.4.0/gcc34-ia64-lib64.patch 1395
 MD5 06580106a905e8fa2ff23aa190f9d82c files/3.4.0/gcc-3.4.0-r6-gentoo-branding.patch 781
 MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
 MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894
-MD5 3bc8c78533f4e995671cee8784ea82a6 files/3.4.1/gcc-3.4.1-spec-env.patch 754
+MD5 97d7409ba5038bea85f9cabe023e28a6 files/3.4.1/gcc-3.4.1-spec-env.patch 755
 MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760
 MD5 aa8e15a63d797df37bbd4e489ed0267f files/3.4.1/gcc-3.4.1-mips-n64only.patch 614
 MD5 7cb2138ac2df6f8674d19974e966a45b files/3.4.1/gcc-3.4.1-mips-n32only.patch 614
@@ -123,7 +123,7 @@ MD5 b1a242694f56184cbcdd40ba25800d50 files/2.95.3/gcc-2.95.3-alpha.diff 14345
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBTfvo94CCfB4KcwwRAv/WAJoCwobIW13FKFS9sa7cbnHD/anVHQCgjfdl
-lWctU28RFtvgOozJeFrrQ00=
-=JCFC
+iD8DBQFBTf9L94CCfB4KcwwRAtHKAJ97PHdCmF8Fr/T7IGOUgCkereD7mQCfeqsz
+gqFpGqJK0ui0CM/YEQe/Kfc=
+=wAMN
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/3.3.4/gcc-3.3.4-spec-env.patch b/sys-devel/gcc/files/3.3.4/gcc-3.3.4-spec-env.patch
index e8cbc4659503..3cf3171d54d5 100644
--- a/sys-devel/gcc/files/3.3.4/gcc-3.3.4-spec-env.patch
+++ b/sys-devel/gcc/files/3.3.4/gcc-3.3.4-spec-env.patch
@@ -5,7 +5,7 @@
    /* Process any user specified specs in the order given on the command
       line.  */
 +
-+  GET_ENVIRONMENT (specs_file, "GCC_SPEC");
++  GET_ENVIRONMENT (specs_file, "GCC_SPECS");
 +  if (specs_file)
 +    {
 +      struct user_specs *user = (struct user_specs *)
diff --git a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-spec-env.patch b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-spec-env.patch
index 44d790fc521b..bd1283ce1ca0 100644
--- a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-spec-env.patch
+++ b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-spec-env.patch
@@ -5,7 +5,7 @@
    /* Process any user specified specs in the order given on the command
       line.  */
 +
-+  GET_ENVIRONMENT (specs_file, "GCC_SPEC");
++  GET_ENVIRONMENT (specs_file, "GCC_SPECS");
 +  if (specs_file)
 +    {
 +      struct user_specs *user = xmalloc (sizeof (struct user_specs));