new revision and version. Match the much revorked eclass. Multilib is handled better, use i386 bootstraps on x86, misc fixes..

(Portage version: 2.1_pre6-r5)

10 files changed, 185 insertions, 11 deletions

diff --git a/dev-lang/gnat-gcc/ChangeLog b/dev-lang/gnat-gcc/ChangeLog
index 13e235fb8920..9ca1925ee533 100644
--- a/dev-lang/gnat-gcc/ChangeLog
+++ b/dev-lang/gnat-gcc/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-lang/gnat-gcc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.2 2006/01/23 23:44:17 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.3 2006/03/26 17:52:06 george Exp $
+
+  26 Mar 2006; George Shapovalov <george@gentoo.org> -gnat-gcc-3.4.5.ebuild:
+  removed stale and (any more) nonworking version
+
+*gnat-gcc-4.1.0 (26 Mar 2006)
+*gnat-gcc-3.4.5-r2 (26 Mar 2006)
+
+  26 Mar 2006; George Shapovalov <george@gentoo.org>
+  +files/patches/74_all_sh-pr24836.patch,
+  +files/patches/51_all_gcc-3.4-libiberty-pic.patch,
+  +files/gcc-configure-LANG.patch, +gnat-gcc-3.4.5-r2.ebuild,
+  +gnat-gcc-4.1.0.ebuild:
+  added new versions to accompany a much revorked gnatbuild.eclass. Now
+  handles multilib better, uses i386 bootstraps on x86 and fixes some misc
+  stuff. 4.1.0 has been added too..
 
 *gnat-gcc-3.4.5-r1 (23 Jan 2006)
 
diff --git a/dev-lang/gnat-gcc/Manifest b/dev-lang/gnat-gcc/Manifest
index 1c540cbda2fa..599aa363f828 100644
--- a/dev-lang/gnat-gcc/Manifest
+++ b/dev-lang/gnat-gcc/Manifest
@@ -1,7 +1,33 @@
 MD5 8ccfa9c4d157ca8f8b9cb96578a74ae2 ChangeLog 629
+RMD160 29f0e7462230fa9310df97fb7bc8f268c544722a ChangeLog 629
+SHA256 c14d0596ba8b55b8b5a8d4182d9bd7cc1a4cc160cc60a6edaa6071454051dcc9 ChangeLog 629
 MD5 19ea138e67bb27f5f3fe7966d006f179 files/digest-gnat-gcc-3.4.5 281
+RMD160 6a472593cd50d12f41411938c9a6c7ee7d7fee5a files/digest-gnat-gcc-3.4.5 281
+SHA256 4b2d7fc5c83537dcaf2fb2c4c2345769e77b70b59de3a86515468a9ee30ddcd6 files/digest-gnat-gcc-3.4.5 281
 MD5 7881be961a54359e5f490debcbdb5c06 files/digest-gnat-gcc-3.4.5-r1 287
+RMD160 334acb8ecaed76107608af6cd822465daca99c96 files/digest-gnat-gcc-3.4.5-r1 287
+SHA256 07b106125b38b7b02797e7377256961d99d954cf5939c54c3059482f6f092c43 files/digest-gnat-gcc-3.4.5-r1 287
+MD5 fe1a225862660edbe92190a0e6c8ac51 files/digest-gnat-gcc-3.4.5-r2 1036
+RMD160 1645498ee80188e739f2074ab306428815bd29f9 files/digest-gnat-gcc-3.4.5-r2 1036
+SHA256 eadf618d13f6585de3018701b96884e122c176321b2943b13a06dff2cb2b7ebf files/digest-gnat-gcc-3.4.5-r2 1036
+MD5 fc7aec331c8ff71668cb7642e852fd79 files/digest-gnat-gcc-4.1.0 1027
+RMD160 41f25915bf5f80903ecfd5a1a08a3bd7078ee86c files/digest-gnat-gcc-4.1.0 1027
+SHA256 30b9729767eda31949c490d5a739780d83969df71f5b40719e1c2de84cbb17e6 files/digest-gnat-gcc-4.1.0 1027
 MD5 c370fea9c771c16d066a4c661e93edc7 files/gnat-Make-lang.in.patch 555
+RMD160 110c659ce235926a488eb6382bc380de7195cb13 files/gnat-Make-lang.in.patch 555
+SHA256 e213feb0c5676dac56af0d9f8d4112cfaae6bfff1e29f18fee81f4e23634e698 files/gnat-Make-lang.in.patch 555
 MD5 d0ffc75fe68d08777a9a47355d9d5c9b gnat-gcc-3.4.5-r1.ebuild 868
+RMD160 f7582bce72d2e1f8639ac16217149b602f25712c gnat-gcc-3.4.5-r1.ebuild 868
+SHA256 29f609fb061a8b9ba18dc1c7f2189ac8620cb72bc99e1efcd88b63c106359c95 gnat-gcc-3.4.5-r1.ebuild 868
+MD5 15606a7f6ab770460c812c6a19b68566 gnat-gcc-3.4.5-r2.ebuild 833
+RMD160 02f8b193b4842bd859153b1ce0963c64a2a805bd gnat-gcc-3.4.5-r2.ebuild 833
+SHA256 8dee0d2e46d6df8891edcfe0ba8c560b079d01dc12bf1e7c63d42e407c00e206 gnat-gcc-3.4.5-r2.ebuild 833
 MD5 7a46795740c682f2766f1c6c34a5a5b8 gnat-gcc-3.4.5.ebuild 997
+RMD160 b361515287173fb544cc129092194130b3e8c2cb gnat-gcc-3.4.5.ebuild 997
+SHA256 51d56335e4d8a046caa4be54d86e3b19edc44e1fd0a4319358298c9b20899cbb gnat-gcc-3.4.5.ebuild 997
+MD5 bf96eaefc7aa763a181767c993952a9a gnat-gcc-4.1.0.ebuild 1266
+RMD160 ba2c99afda540cb8db8c3d7f226fca17a69b85ab gnat-gcc-4.1.0.ebuild 1266
+SHA256 e6bb45cb7ed0036f6a01fbbfae7054679bd69a094ec8457a2b8f1c0531c2074a gnat-gcc-4.1.0.ebuild 1266
 MD5 f8daaafdf0b4310ad64741b70cb917d0 metadata.xml 486
+RMD160 a26b50e63ac849ba139fca465a52c8dd508b3e4d metadata.xml 486
+SHA256 c842cca66a73967cb7f205eff6cf4095fe360739b332cdb5b58b23d38e1e0960 metadata.xml 486
diff --git a/dev-lang/gnat-gcc/files/digest-gnat-gcc-3.4.5 b/dev-lang/gnat-gcc/files/digest-gnat-gcc-3.4.5
deleted file mode 100644
index 349d4f2ff7af..000000000000
--- a/dev-lang/gnat-gcc/files/digest-gnat-gcc-3.4.5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 797afd0098e6b29ff85a2a8158d23f32 gcc-ada-3.4.5.tar.bz2 3784842
-MD5 0114ba67f9aabad91d96797d0b6017c4 gcc-core-3.4.5.tar.bz2 13397308
-MD5 57a47a08504a2bc06fb1b24925aab918 gnatboot-3.4-amd64.tar.bz2 12043726
-MD5 1c846f5ef514714baa1e0f70c0c3df9e gnatboot-3.4-i686.tar.bz2 10608480
diff --git a/dev-lang/gnat-gcc/files/digest-gnat-gcc-3.4.5-r2 b/dev-lang/gnat-gcc/files/digest-gnat-gcc-3.4.5-r2
new file mode 100644
index 000000000000..831ea19b1fc3
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/digest-gnat-gcc-3.4.5-r2
@@ -0,0 +1,12 @@
+MD5 797afd0098e6b29ff85a2a8158d23f32 gcc-ada-3.4.5.tar.bz2 3784842
+RMD160 a18bf6a63b4720fdd688f39ece0292d3353da77d gcc-ada-3.4.5.tar.bz2 3784842
+SHA256 289c9cd4a7e7c89735cef530666e962438b5057aa9e02d94d2f068238dfcb996 gcc-ada-3.4.5.tar.bz2 3784842
+MD5 0114ba67f9aabad91d96797d0b6017c4 gcc-core-3.4.5.tar.bz2 13397308
+RMD160 d0b1f2748929d319b68e80542edfe1251a867c81 gcc-core-3.4.5.tar.bz2 13397308
+SHA256 8a2824b12a1cae8b68de3be0a8fd2da14918462e6afa27c3578ccfc8ab10d0fc gcc-core-3.4.5.tar.bz2 13397308
+MD5 1c6a132642a5d9b2712b62b5e52e593b gnatboot-3.4-amd64-r2.tar.bz2 12063245
+RMD160 6be578cb8938e872b39d2420c2151d4b8b574f20 gnatboot-3.4-amd64-r2.tar.bz2 12063245
+SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d gnatboot-3.4-amd64-r2.tar.bz2 12063245
+MD5 cf7184e3f90a9fbbcc552257d8408337 gnatboot-3.4-i386.tar.bz2 10629373
+RMD160 27a3189be4a1f699b438f777679890b93a51eb1e gnatboot-3.4-i386.tar.bz2 10629373
+SHA256 7b4300e72b7f00d2fd9d0dad6940c3e6b4e19eeaf4696e92d7c92e2a38e8b049 gnatboot-3.4-i386.tar.bz2 10629373
diff --git a/dev-lang/gnat-gcc/files/digest-gnat-gcc-4.1.0 b/dev-lang/gnat-gcc/files/digest-gnat-gcc-4.1.0
new file mode 100644
index 000000000000..b1de7f272452
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/digest-gnat-gcc-4.1.0
@@ -0,0 +1,12 @@
+MD5 f0c40df7f87560e51ae0437e45357bb0 gcc-ada-4.1.0.tar.bz2 4588237
+RMD160 0a49a4c86961cb1e18cb3f7a675d01338df2affd gcc-ada-4.1.0.tar.bz2 4588237
+SHA256 213a00d36e85ffcd7f86340999f7f9ae3b8bccd00cf81f228ef205d9059f2d0a gcc-ada-4.1.0.tar.bz2 4588237
+MD5 15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 16634582
+RMD160 e07f8d43d767bc644164aa90ccc9ffb3b9526d3a gcc-core-4.1.0.tar.bz2 16634582
+SHA256 14d3056034cc7e7f2627f9b911e57041d135fe75b54aa20f9ab40737d5f13f21 gcc-core-4.1.0.tar.bz2 16634582
+MD5 89cb31ac0e755045e0ded755899062fb gnatboot-4.1-amd64.tar.bz2 15314736
+RMD160 d3042072827d66dff67e57559613f7d4136c8443 gnatboot-4.1-amd64.tar.bz2 15314736
+SHA256 a4016920b84f5934ec7120c7bb17c1028b193d5e146a46a9d1ceae4a456924d2 gnatboot-4.1-amd64.tar.bz2 15314736
+MD5 cee3c35f79a8d88a25d61d5f18ae5167 gnatboot-4.1-i386.tar.bz2 15367514
+RMD160 3a5dcd646a9abe75a62410a9daaf749171bf5aad gnatboot-4.1-i386.tar.bz2 15367514
+SHA256 597b4a16f38fb173b1eecc259c1566ccf81291e13b88e2160102a512cefcc518 gnatboot-4.1-i386.tar.bz2 15367514
diff --git a/dev-lang/gnat-gcc/files/gcc-configure-LANG.patch b/dev-lang/gnat-gcc/files/gcc-configure-LANG.patch
new file mode 100644
index 000000000000..3ef76ef911c0
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/gcc-configure-LANG.patch
@@ -0,0 +1,41 @@
+The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
+option parsing, it may break.
+
+http://bugs.gentoo.org/103483
+
+--- configure
++++ configure
+@@ -54,6 +54,16 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+@@ -452,16 +463,6 @@
+   esac
+ done
+ 
+-# NLS nuisances.
+-# Only set these to C if already set.  These must not be set unconditionally
+-# because not all systems understand e.g. LANG=C (notably SCO).
+-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+-# Non-C LC_CTYPE values break the ctype check.
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+-
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/dev-lang/gnat-gcc/files/patches/51_all_gcc-3.4-libiberty-pic.patch b/dev-lang/gnat-gcc/files/patches/51_all_gcc-3.4-libiberty-pic.patch
new file mode 100644
index 000000000000..d9a95a21b10f
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/patches/51_all_gcc-3.4-libiberty-pic.patch
@@ -0,0 +1,10 @@
+--- gcc-4.1.0-orig/libiberty/Makefile.in	2006-03-01 15:49:14.000000000 -0500
++++ gcc-4.1.0/libiberty/Makefile.in	2006-03-01 18:10:46.000000000 -0500
+@@ -232,6 +232,7 @@
+ 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
+ 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+ 	  $(RANLIB) $(TARGETLIB); \
++	  cp $(TARGETLIB) ../ ; \
+ 	  cd ..; \
+ 	else true; fi
+ 
diff --git a/dev-lang/gnat-gcc/files/patches/74_all_sh-pr24836.patch b/dev-lang/gnat-gcc/files/patches/74_all_sh-pr24836.patch
new file mode 100644
index 000000000000..9bad985a2647
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/patches/74_all_sh-pr24836.patch
@@ -0,0 +1,25 @@
+http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
+
+--- gcc/configure.ac	(revision 106699)
++++ gcc/configure.ac	(working copy)
+@@ -2446,7 +2446,7 @@
+ 	tls_first_minor=14
+ 	tls_as_opt="-m64 -Aesame --fatal-warnings"
+ 	;;
+-  sh-*-* | sh[34]-*-*)
++  sh-*-* | sh[34]*-*-*)
+     conftest_s='
+ 	.section ".tdata","awT",@progbits
+ foo:	.long	25
+--- gcc/configure
++++ gcc/configure
+@@ -14846,7 +14846,7 @@
+ 	tls_first_minor=14
+ 	tls_as_opt="-m64 -Aesame --fatal-warnings"
+ 	;;
+-  sh-*-* | sh[34]-*-*)
++  sh-*-* | sh[34]*-*-*)
+     conftest_s='
+ 	.section ".tdata","awT",@progbits
+ foo:	.long	25
diff --git a/dev-lang/gnat-gcc/gnat-gcc-3.4.5.ebuild b/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild
index a06d9c95d347..897c584241c9 100644
--- a/dev-lang/gnat-gcc/gnat-gcc-3.4.5.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-3.4.5.ebuild,v 1.1 2006/01/17 20:12:10 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild,v 1.1 2006/03/26 17:52:06 george Exp $
 
-inherit gnatbuild flag-o-matic
+inherit gnatbuild
 
 DESCRIPTION="GNAT Ada Compiler - gcc version"
 HOMEPAGE="http://gcc.gnu.org/"
 LICENSE="GMGPL"
 
+# BOOT_SLOT is defined in gnatbuild.eclass and depends only on $PV
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
-	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${GNATBRANCH}-i686.tar.bz2 )
-	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${GNATBRANCH}-amd64.tar.bz2 )"
-# ${GNATBRANCH} is defined in gnatbuild.eclass and depends 
-# only on $PV, so should be safe to use in DEPEND/SRC_URI
+	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i386.tar.bz2 )
+	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64-r2.tar.bz2 )"
 
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.1.0.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.1.0.ebuild
new file mode 100644
index 000000000000..5ea2d9d8d5be
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.1.0.ebuild,v 1.1 2006/03/26 17:52:06 george Exp $
+
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="http://gcc.gnu.org/"
+LICENSE="GMGPL"
+
+# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH)
+# so the URI's are static.
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
+	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i386.tar.bz2 )
+	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 )"
+
+KEYWORDS="~amd64 ~x86"
+
+src_unpack() {
+	gnatbuild_src_unpack
+
+	#fixup some hardwired flags
+	cd ${S}/gcc/ada
+
+	# universal gcc -> gnatgcc substitution occasionally produces lines too long
+	# and then build halts on the style check or even produces wrong code..
+	sed -i -e 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):' makegpr.adb &&
+	sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads ||
+		die	"reversing [gnat]gcc substitution in comments failed"
+}
+
+
+src_compile() {
+	# looks like gnatlib_and_tools and gnatlib_shared have become part of
+	# bootstrap
+	gnatbuild_src_compile configure make-tools bootstrap
+}