an overdue major bump. Finally got 4.4 working. Homefully more to follow soon..

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 163 insertions, 3 deletions

diff --git a/dev-lang/gnat-gcc/ChangeLog b/dev-lang/gnat-gcc/ChangeLog
index 73711da76f2a..a74017bb3ae8 100644
--- a/dev-lang/gnat-gcc/ChangeLog
+++ b/dev-lang/gnat-gcc/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/gnat-gcc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.38 2010/04/12 08:25:44 george Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.39 2011/03/10 19:59:39 george Exp $
+
+*gnat-gcc-4.4.3 (10 Mar 2011)
+
+  10 Mar 2011; <portage-cvs@gentoo.org> +gnat-gcc-4.3.5.ebuild,
+  +gnat-gcc-4.4.3.ebuild:
+  an overdue major bump. Finally got 4.4 working. Homefully more to follow
+  soon..
+
+*gnat-gcc-4.3.5 (04 Jan 2011)
+
+  04 Jan 2011; George Shapovalov <george-cvs@gentoo.org> +gnat-gcc-4.3.5.ebuild:
+  a quick bump, finally coming through buiild failure in new (yet uncommitted)
+  versions
 
   12 Apr 2010; George Shapovalov <george@gentoo.org> gnat-gcc-4.3.4.ebuild:
   updated the bootstrap
diff --git a/dev-lang/gnat-gcc/Manifest b/dev-lang/gnat-gcc/Manifest
index 34a70f4ba545..0531e9acd473 100644
--- a/dev-lang/gnat-gcc/Manifest
+++ b/dev-lang/gnat-gcc/Manifest
@@ -8,12 +8,16 @@ DIST gcc-ada-4.2.3.tar.bz2 4740243 RMD160 dd3dc58d87a24fef7f33a0a04e13de30d7cc67
 DIST gcc-ada-4.3.2.tar.bz2 5291314 RMD160 65f045756bb215186fcbb646a13743e146ebc8bc SHA1 f5c4b2d7a35e55ee801ec1915a824d403f2367fd SHA256 98d112e1e0bdea5f520b08ea352931fd353085628d12cb9553d5794cb43e8c26
 DIST gcc-ada-4.3.3.tar.bz2 5236690 RMD160 53699ae21041d185a2b91678ad098aa6be9de5b7 SHA1 5111d261d8d7254305831e8577eb5eb7d9cf33fb SHA256 d49eb8d58b23a39149f10f55a7cc60f77e73d1bed88659e5cc5226ddd0a8ffda
 DIST gcc-ada-4.3.4.tar.bz2 5232696 RMD160 5c7ceab1acd52519f4d6a59d766a974b426dadc6 SHA1 0f7044c162e078e770c0ec1cbc9f9ba31a2c03b5 SHA256 a79913eababb2626dc24972c9d8d651fe4c97e69ad1e1426dfc0f79513f95c37
+DIST gcc-ada-4.3.5.tar.bz2 5231691 RMD160 f4d667913e1157c0010fb496206e7f9be9d25209 SHA1 887d7a8af8ab2d990d1991a229bcbf662c790a04 SHA256 e3e4a0836820e8b1b7b4b00b529568a2d51ed9ec3933fbd44c7b1c04ad3076de
+DIST gcc-ada-4.4.3.tar.bz2 5470203 RMD160 f908c510ae7768c4037990009160b1040da255c4 SHA1 f4ec5d0238a6c2fd5049ef0ee22df509c349f7b7 SHA256 67cec15254922d71790e80f150f24e13cdaac60804d46cb17bed9df7f874d290
 DIST gcc-core-3.4.6.tar.bz2 13366790 RMD160 510f512c1de3e0b67c68aeaf9933a547f500b6d9 SHA1 5f41c5e31fdc04e83fa16b07729866d53ffaadce SHA256 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
 DIST gcc-core-4.1.2.tar.bz2 17485561 RMD160 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 SHA1 d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
 DIST gcc-core-4.2.3.tar.bz2 19319213 RMD160 1ced09156d8444bba7eb2550a969f72b788d4bc5 SHA1 0896a32b36f2fcd3dd39c8424b548fab87b33873 SHA256 99ec052e13e8c2bc7d1db86d1c98fb651d45fd3e8ea90b0981c47f6e8826c813
 DIST gcc-core-4.3.2.tar.bz2 23830073 RMD160 96f5c9eeed2bd489ea6422908635c0aa93013e52 SHA1 8137e6f12fea6730873ab6230e6f6a768443de83 SHA256 0687e7279d78eb963ac34a3b06a0a6a1d1e9a26807ef4939cf4a2ad5f062e75a
 DIST gcc-core-4.3.3.tar.bz2 24355225 RMD160 2aa8c759f153d033449ce2b735a13c374d17564f SHA1 b907061e5788d7060bfb94396152ba9fc0786f91 SHA256 4690f4ef0218ed9795509ca05cbccaa6023fde943c83e1625db8627be3d6d323
 DIST gcc-core-4.3.4.tar.bz2 24329359 RMD160 0ed558bd465fcfa6ad123daa4b85aa7c498dc80f SHA1 5aae071fc542ee17dadfd8f22eaf79611fd175ba SHA256 3189838f5047be4ff54711c84db17c76ecfcc79bf4f4d110bf7323eeb90568fa
+DIST gcc-core-4.3.5.tar.bz2 24828441 RMD160 b365da063ead1d851432e6d8b076580da544e092 SHA1 87b1fef7009b7cf42f9a9df9c8d4609bc8dda9c5 SHA256 ca57b06732a9a4123d6685fe58f3550afadf063107016e3f15c2b32447612711
+DIST gcc-core-4.4.3.tar.bz2 26336901 RMD160 28b61b91dfca8632c327205226434736c2662223 SHA1 039f19e642d0967af7772b26d42fd0c25bf62edc SHA256 92f311e6be22a2096c765bc8be72bd7fef56bba73f053b3de025b9c92d308356
 DIST gnatboot-3.4-amd64-r2.tar.bz2 12063245 RMD160 6be578cb8938e872b39d2420c2151d4b8b574f20 SHA1 ce67f3147a5d009ffe5d92cc5ef116f32e772bb0 SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d
 DIST gnatboot-3.4-i386.tar.bz2 10629373 RMD160 27a3189be4a1f699b438f777679890b93a51eb1e SHA1 78d5aa6c9800ab978db1fbf93255ed70fe188dbc SHA256 7b4300e72b7f00d2fd9d0dad6940c3e6b4e19eeaf4696e92d7c92e2a38e8b049
 DIST gnatboot-3.4-ppc.tar.bz2 10996302 RMD160 de56dbb14346f41023ae06445d830c6bd9bbf50a SHA1 87c068ddb7bb14b87e04765e2c3c2997064e8770 SHA256 1f164834e377604a943b230196d9f2a40e8e6753bac4c980d5ca2c00c7674363
@@ -31,5 +35,7 @@ EBUILD gnat-gcc-4.3.2.ebuild 2186 RMD160 cb5a3059ebaefbcb9ec9b829131a83c92251920
 EBUILD gnat-gcc-4.3.3-r2.ebuild 2296 RMD160 03b87da786d7645ee2712e2949bf2fce4117b2c2 SHA1 79c666eb7b8ca66f6a5e00f316fe81d7561656fb SHA256 1271217761aeba4e598bb9f6aed5d6c161013a64ec8ebd91c1d308e260d9c172
 EBUILD gnat-gcc-4.3.3.ebuild 2291 RMD160 ead96755edadbce67582d65b78d7ac76c2561af4 SHA1 d2427e826782ef97d2cbc0c2ff286f2a9b0c8a26 SHA256 4a979caa9c54b1a76daa141cd6cb234197915513ca1e3fbcf406bdf069cc0e48
 EBUILD gnat-gcc-4.3.4.ebuild 2311 RMD160 ab089f5e4a4cb20fdb49730d4a2e77d6528388ad SHA1 f0f9eb46155473d4ec156736d9c4cf8363a8aa7c SHA256 514233261af019e76c668a435ad06f75f25f0fb41b4c89670efac8fd29cba988
-MISC ChangeLog 6094 RMD160 2bac69a24256a7d45f0e0a9e410e1fc00ed0123b SHA1 b5a956f27d51146596b5363ff9823cc48e1a83aa SHA256 daf580743c4436d0289759bf2ac010defa44a695c8489d6645133afde3addc18
+EBUILD gnat-gcc-4.3.5.ebuild 2451 RMD160 fff8568ad561c6055d47790bb096c8f93f684c2f SHA1 a35e2a3dd3ea5efd471eff1f179451d56ba4e944 SHA256 cfc6c65026c0506fbdd2df5d8617898656447bc9b9e894c07465037c80b959e4
+EBUILD gnat-gcc-4.4.3.ebuild 2497 RMD160 ddbd4b3a52bca57b31d33fd9f93c922774a0452d SHA1 06a84534726473c52983b04a3be5d28555e5d395 SHA256 79c594f0abdbd635626993cf1e370c2e80b616f1ef42f93e42618b6dc90ae214
+MISC ChangeLog 6503 RMD160 a56b4fa43f10c8b4579e333752e9f8729cb953bb SHA1 980aa7bd5b6b48879f856ec419ace759528916c4 SHA256 2178ca178db963e3b09224c6e077db9d6e1d1756cfb928e990078e0898bdc687
 MISC metadata.xml 486 RMD160 a26b50e63ac849ba139fca465a52c8dd508b3e4d SHA1 0d1a097a395d7c1454472b598f04aea8b590c16d SHA256 c842cca66a73967cb7f205eff6cf4095fe360739b332cdb5b58b23d38e1e0960
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild
new file mode 100644
index 000000000000..90cd8ee6e4cc
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 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.3.5.ebuild,v 1.1 2011/03/10 19:59:39 george Exp $
+
+# Need to let configure know where to find stddef.h
+#EXTRA_CONFGCC="${WORKDIR}/usr/lib/include/"
+
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="http://gcc.gnu.org/"
+LICENSE="GMGPL"
+
+IUSE=""
+
+# using new bootstrap
+BOOT_SLOT="4.3"
+
+# 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
+	amd64? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 )
+	sparc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 )
+	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 )"
+#	ppc?   ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
+
+KEYWORDS="~amd64 ~x86 ~sparc"
+
+# starting with 4.3.0 gnat needs these libs
+DEPEND=">=dev-libs/mpfr-2.3.1
+	>=dev-libs/gmp-4.2.2"
+RDEPEND="${DEPEND}"
+
+#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
+#	${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
+
+src_unpack() {
+	gnatbuild_src_unpack
+
+	# newly added zlib dir is processed by configure even with
+	# --with-systtem-zlib passed, causing toruble on multilib
+	rm -rf "${S}"/zlib
+
+	#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.
+	#
+	# The sed in makegpr.adb is actually not for the line length but rather to
+	# "undo" the fixing, Last3 is matching just that - the last three characters
+	# of the compiler name.
+	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"
+
+	# looks like wrapper has problems with all the quotation
+	sed -i -e "/-DREVISION/d" -e "/-DDEVPHASE/d" \
+		-e "s: -DDATESTAMP=\$(DATESTAMP_s)::" "${S}"/gcc/Makefile.in
+	sed -i -e "s: DATESTAMP DEVPHASE REVISION::" \
+		-e "s:PKGVERSION:\"\":" "${S}"/gcc/version.c
+}
+
+src_compile() {
+	# looks like gnatlib_and_tools and gnatlib_shared have become part of
+	# bootstrap
+	gnatbuild_src_compile configure make-tools bootstrap
+}
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.4.3.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.4.3.ebuild
new file mode 100644
index 000000000000..cf7d042c5a0a
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.4.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 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.4.3.ebuild,v 1.1 2011/03/10 19:59:39 george Exp $
+
+# Need to let configure know where to find stddef.h
+#EXTRA_CONFGCC="${WORKDIR}/usr/lib/include/"
+
+inherit gnatbuild autotools
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="http://gcc.gnu.org/"
+LICENSE="GMGPL"
+
+IUSE=""
+
+# using new bootstrap
+BOOT_SLOT="4.3"
+
+# 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
+	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 )
+	sparc? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 )
+	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 )"
+#	ppc?   ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
+
+KEYWORDS="~amd64 ~x86 ~sparc"
+
+# starting with 4.3.0 gnat needs these libs
+RDEPEND=">=dev-libs/mpfr-2.3.1
+	>=dev-libs/gmp-4.2.2
+	>=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.875
+	>=sys-libs/glibc-2.8
+	>=sys-devel/binutils-2.15.94"
+
+#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
+#	${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
+
+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.
+	#
+	sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads ||
+		die	"reversing [gnat]gcc substitution in comments failed"
+
+	# gcc pretty much ignores --with-system-zlib. At least it still descends
+	# into zlib and does configure and build there (gcc bug@7125?). For whatever
+	# reason this conflicts with multilib in gcc-4.4..
+	sed -i -e "s:libgui zlib:libgui:" "${S}"/configure
+
+	# looks like wrapper has problems with all the quotation
+	sed -i -e "/-DREVISION/d" -e "/-DDEVPHASE/d" \
+		-e "s: -DDATESTAMP=\$(DATESTAMP_s)::" "${S}"/gcc/Makefile.in
+	sed -i -e "s: DATESTAMP DEVPHASE REVISION::" \
+		-e "s:PKGVERSION:\"\":" "${S}"/gcc/version.c
+}
+
+src_compile() {
+	# looks like gnatlib_and_tools and gnatlib_shared have become part of
+	# bootstrap
+	gnatbuild_src_compile configure make-tools bootstrap
+}