removed all traces of ada from older versions and the gcc32-ada-make.patch

6 files changed, 15 insertions, 44 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index a9e0212931c3..783c39093dbc 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.121 2003/09/08 22:31:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.122 2003/09/08 22:39:07 george Exp $
 
-  09 Sep 2003; George Shapovalov <george@gentoo.org> gcc-3.3.1.ebuild, gcc-3.3.1-r1.ebuild :
+  09 Sep 2003; George Shapovalov <george@gentoo.org> gcc-3.3.1.ebuild, gcc-3.3.1-r1.ebuild, gcc-3.2.1-r7.ebuild, gcc-3.2.2.ebuild, gcc-3.2.2-r2.ebuild: :
   Removed "ada" from gcc_lang as month ago for previous versions.
+  Also removed gcc32-ada-make.patch and corresponding epatch invocations
 
 *gcc-3.3.1-r1 (07 Sep 2003)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index bc55b0a186eb..43635882e59c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,18 +1,18 @@
 MD5 a31b5542d6f3ce470c84523579051a8b gcc-3.3.1-r1.ebuild 15982
 MD5 4e0f0058ffaa6fb901f384422b79857b gcc-3.3-r1.ebuild 16467
 MD5 6d0d6b9214ecb88e26a54b70901c50b4 gcc-2.95.3-r7.ebuild 5436
-MD5 b7e10c34f96b547e8bd79d95c532c5f0 gcc-3.2.2-r2.ebuild 15849
+MD5 77dabd76c2610078ebdb9566f8b54503 gcc-3.2.2-r2.ebuild 15843
 MD5 25a95ad59dc52c9ec23faf193ea4f168 gcc-3.3.ebuild 16642
 MD5 b1942bef92d0072bde9df09c667e8d22 gcc-3.3.1.ebuild 15904
 MD5 63fa17fd1bd1beece95b2d0fa9f34ca0 gcc-3.2.3-r1.ebuild 17312
-MD5 cdd4137c0fcbc4c227f5ee69cbd0a5f2 gcc-3.2.1-r7.ebuild 14779
+MD5 d25ffc7e82003a26e025471ca8df299c gcc-3.2.1-r7.ebuild 14774
 MD5 459fe070924cbfd485139f84f2dd47ff gcc-3.0.4-r6.ebuild 8738
 MD5 3f796d926d7c63b50910a657cb67a358 gcc-3.1.1-r1.ebuild 9595
-MD5 ef5803da7b93347bd5434f364f6e0c1e gcc-3.2.2.ebuild 16058
+MD5 9120d543f8b966ed6a5a2d32902fd5cf gcc-3.2.2.ebuild 16053
 MD5 079abbc45c914fdad6c90540fe82302c gcc-2.95.3-r8.ebuild 9213
 MD5 89c5294c24b323cf6c28e507fef6d59d gcc-3.2-r5.ebuild 12876
 MD5 c44c493b629be3a1abbc1eb4d3cb00d1 gcc-3.1-r8.ebuild 9776
-MD5 7635ee28a42e684ea3f4db41bcae73b8 ChangeLog 27346
+MD5 876ef5d839ca252219ddd0fb73dccc57 ChangeLog 27480
 MD5 5a2ec15a8852442c904eabf9eb2570fe gcc-3.2.3-r2.ebuild 17306
 MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
 MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
@@ -82,7 +82,6 @@ MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
 MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
 MD5 7e8381ddac68428122ee2b186e3e7c5b files/3.2.1/gcc-3.2.1-bug-url.patch 537
 MD5 62e1cc1d310d74e97080b10802263791 files/3.2.1/gcc32-pr8988.patch 2070
-MD5 f0261a99a420d6b533014b95c0a7d00c files/3.2.1/gcc32-ada-make.patch 957
 MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.1/gcc32-pr8213.patch 2036
 MD5 444d0885eecc638ed3ca644d96323422 files/3.2.1/gcc32-tls-reload-fix.patch 6660
 MD5 f8505ae264a0fe9557382b7c96a13461 files/3.2.1/gcc32-shared-pthread.patch 3637
diff --git a/sys-devel/gcc/files/3.2.1/gcc32-ada-make.patch b/sys-devel/gcc/files/3.2.1/gcc32-ada-make.patch
deleted file mode 100644
index 6e7ea8dc3393..000000000000
--- a/sys-devel/gcc/files/3.2.1/gcc32-ada-make.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-2002-05-14  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* Make-lang.in (gnat1$(exeext), gnatbind$(exeext), gnattools):
-	Restore $(CONFIG_H) and prefix.o dependencies.
-	(ada.stage[1-4]): Depend on stage?-start.
-
---- gcc/ada/Make-lang.in.jj	2002-05-02 12:13:22.000000000 +0200
-+++ gcc/ada/Make-lang.in	2002-12-09 17:45:36.000000000 +0100
-@@ -595,16 +595,16 @@ ada.maintainer-clean:
- # Stage hooks:
- # The main makefile has already created stage?/ada
- 
--ada.stage1:
-+ada.stage1: stage1-start
- 	-$(MV) ada/*$(objext) ada/*.ali ada/b_*.c stage1/ada
- 	-$(MV) ada/stamp-* stage1/ada
--ada.stage2:
-+ada.stage2: stage2-start
- 	-$(MV) ada/*$(objext) ada/*.ali ada/b_*.c stage2/ada
- 	-$(MV) ada/stamp-* stage2/ada
--ada.stage3:
-+ada.stage3: stage3-start
- 	-$(MV) ada/*$(objext) ada/*.ali ada/b_*.c stage3/ada
- 	-$(MV) ada/stamp-* stage3/ada
--ada.stage4:
-+ada.stage4: stage4-start
- 	-$(MV) ada/*$(objext) ada/*.ali ada/b_*.c stage4/ada
- 	-$(MV) ada/stamp-* stage4/ada
- 
diff --git a/sys-devel/gcc/gcc-3.2.1-r7.ebuild b/sys-devel/gcc/gcc-3.2.1-r7.ebuild
index 7f5136d6d0e8..0c674bcb1a16 100644
--- a/sys-devel/gcc/gcc-3.2.1-r7.ebuild
+++ b/sys-devel/gcc/gcc-3.2.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.1-r7.ebuild,v 1.7 2003/09/06 08:06:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.1-r7.ebuild,v 1.8 2003/09/08 22:39:07 george Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -150,7 +150,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${P}-bug-url.patch
 
 	# Patches from Redhat ...
-	epatch ${FILESDIR}/${PV}/gcc32-ada-make.patch
+	#epatch ${FILESDIR}/${PV}/gcc32-ada-make.patch
 	epatch ${FILESDIR}/${PV}/gcc32-shared-pthread.patch
 	use sparc && epatch ${FILESDIR}/${PV}/gcc32-sparc32-hack.patch
 	epatch ${FILESDIR}/${PV}/gcc32-testsuite.patch
@@ -224,7 +224,7 @@ src_compile() {
 	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++,ada,f77,objc"
+		gcc_lang="c,c++,f77,objc"
 	else
 		gcc_lang="c"
 	fi
diff --git a/sys-devel/gcc/gcc-3.2.2-r2.ebuild b/sys-devel/gcc/gcc-3.2.2-r2.ebuild
index a830d58410b6..a31496563a05 100644
--- a/sys-devel/gcc/gcc-3.2.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2-r2.ebuild,v 1.7 2003/09/05 02:01:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2-r2.ebuild,v 1.8 2003/09/08 22:39:07 george Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -252,7 +252,7 @@ src_compile() {
 	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++,ada,f77,objc"
+		gcc_lang="c,c++,f77,objc"
 	else
 		gcc_lang="c"
 	fi
diff --git a/sys-devel/gcc/gcc-3.2.2.ebuild b/sys-devel/gcc/gcc-3.2.2.ebuild
index 6e9db8b8963f..8f5a91517185 100644
--- a/sys-devel/gcc/gcc-3.2.2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.19 2003/09/05 02:01:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.20 2003/09/08 22:39:07 george Exp $
 
 IUSE="static nls bootstrap java build"
 
@@ -171,7 +171,7 @@ src_unpack() {
 	fi
 
 	# Patches from Redhat ...
-	epatch ${FILESDIR}/3.2.1/gcc32-ada-make.patch
+	#epatch ${FILESDIR}/3.2.1/gcc32-ada-make.patch
 	epatch ${FILESDIR}/3.2.1/gcc32-shared-pthread.patch
 	use sparc && epatch ${FILESDIR}/3.2.1/gcc32-sparc32-hack.patch
 
@@ -238,7 +238,7 @@ src_compile() {
 	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++,ada,f77,objc"
+		gcc_lang="c,c++,f77,objc"
 	else
 		gcc_lang="c"
 	fi