overdue update to 4.3 using new bootstrap; ref bug #372179

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

3 files changed, 78 insertions, 25 deletions

diff --git a/dev-lang/gnat-gcc/ChangeLog b/dev-lang/gnat-gcc/ChangeLog
index 6028415c6b1a..90ee4eab4b20 100644
--- a/dev-lang/gnat-gcc/ChangeLog
+++ b/dev-lang/gnat-gcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/gnat-gcc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.44 2011/08/26 15:40:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.45 2011/09/14 09:28:13 george Exp $
+
+*gnat-gcc-4.3.6 (14 Sep 2011)
+
+  14 Sep 2011; George Shapovalov <george@gentoo.org> +gnat-gcc-4.3.6.ebuild:
+  overdue update to 4.3 using new bootstrap; ref bug #372179
+  amd64 only atm. x86 is coming up next. Can't simply change 4.3.5, as 
+  some changes to ebuild are needed to match a new bootstrap.
 
   26 Aug 2011; Markos Chandras <hwoarang@gentoo.org> gnat-gcc-4.3.5.ebuild:
   Stable on amd64 wrt bug #317971
@@ -8,10 +15,10 @@
   20 Aug 2011; Thomas Kahle <tomka@gentoo.org> gnat-gcc-4.3.5.ebuild:
   x86 stable per bug 379983
 
-  19 Jun 2011; <george@gentoo.org> gnat-gcc-4.4.5.ebuild:
+  19 Jun 2011; George Shapovalov <george@gentoo.org> gnat-gcc-4.4.5.ebuild:
   new bootstrap for x86
 
-  24 May 2011; <george@gentoo.org> gnat-gcc-4.4.5.ebuild:
+  24 May 2011; George Shapovalov <george@gentoo.org> gnat-gcc-4.4.5.ebuild:
   new bootstrap for sparc
 
 *gnat-gcc-4.4.5 (23 May 2011)
diff --git a/dev-lang/gnat-gcc/Manifest b/dev-lang/gnat-gcc/Manifest
index a43a93231a32..5d9ddedd822a 100644
--- a/dev-lang/gnat-gcc/Manifest
+++ b/dev-lang/gnat-gcc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX gcc-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 AUX gnat-Make-lang.in.patch 555 RMD160 110c659ce235926a488eb6382bc380de7195cb13 SHA1 45bd989629fcf8c889759238dfbf37ddb3ee8a3b SHA256 e213feb0c5676dac56af0d9f8d4112cfaae6bfff1e29f18fee81f4e23634e698
 AUX patches/51_all_gcc-3.4-libiberty-pic.patch 350 RMD160 4460024bbeae0a723df57657524cbdcb087f269d SHA1 3f755ad571623b2c6481c763d55a1eeaf8d44c28 SHA256 c67824f20231181cd351dab085d861c6d97100b22ee913c5610b160aae5f4a0d
@@ -12,6 +9,7 @@ DIST gcc-ada-4.3.2.tar.bz2 5291314 RMD160 65f045756bb215186fcbb646a13743e146ebc8
 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.3.6.tar.bz2 5309618 RMD160 5394146041721369bf9d912bd2430095e5ec5e16 SHA1 d121d7c7fff9bef6f43d0797238fefc91a7b82f8 SHA256 a2721a41965f361938bc9d86e3cc7ba12dc6b7efa24cbe5d9f9c84882b9caf31
 DIST gcc-ada-4.4.3.tar.bz2 5470203 RMD160 f908c510ae7768c4037990009160b1040da255c4 SHA1 f4ec5d0238a6c2fd5049ef0ee22df509c349f7b7 SHA256 67cec15254922d71790e80f150f24e13cdaac60804d46cb17bed9df7f874d290
 DIST gcc-ada-4.4.5.tar.bz2 5470412 RMD160 dd9720b8c2f70e76b48e9e875880d6887360f8f6 SHA1 f65acd7003d6dc5305571941a706502a134cc8c2 SHA256 0fdfd6318faba7bd39dde6fdc78c8334636be1e9fdcf4bd84f39372882abd177
 DIST gcc-core-3.4.6.tar.bz2 13366790 RMD160 510f512c1de3e0b67c68aeaf9933a547f500b6d9 SHA1 5f41c5e31fdc04e83fa16b07729866d53ffaadce SHA256 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
@@ -21,6 +19,7 @@ DIST gcc-core-4.3.2.tar.bz2 23830073 RMD160 96f5c9eeed2bd489ea6422908635c0aa9301
 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.3.6.tar.bz2 24448503 RMD160 d4bed0820d5eae5072e30fa66167fda4fc2f0bbc SHA1 d9dc274ad558194e7d9bacc49c333a4870d7e613 SHA256 86af1703be5cc7f40270a66ac15ebcf6088706a789ae1bf18488dc070777f979
 DIST gcc-core-4.4.3.tar.bz2 26336901 RMD160 28b61b91dfca8632c327205226434736c2662223 SHA1 039f19e642d0967af7772b26d42fd0c25bf62edc SHA256 92f311e6be22a2096c765bc8be72bd7fef56bba73f053b3de025b9c92d308356
 DIST gcc-core-4.4.5.tar.bz2 26356188 RMD160 0a8819dd97fa616944e546df8fed24a8f0ca9b29 SHA1 8e2202cde3be496f0452219c60311f8fe36f87f6 SHA256 dbf012d5616b51d072383a32f71d4217239e7f0096acb07bbf266529a347ab4b
 DIST gnatboot-3.4-amd64-r2.tar.bz2 12063245 RMD160 6be578cb8938e872b39d2420c2151d4b8b574f20 SHA1 ce67f3147a5d009ffe5d92cc5ef116f32e772bb0 SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d
@@ -29,7 +28,7 @@ DIST gnatboot-3.4-ppc.tar.bz2 10996302 RMD160 de56dbb14346f41023ae06445d830c6bd9
 DIST gnatboot-4.1-amd64.tar.bz2 15314736 RMD160 d3042072827d66dff67e57559613f7d4136c8443 SHA1 c6a3b213209019579da7660147211c2bc9e6a348 SHA256 a4016920b84f5934ec7120c7bb17c1028b193d5e146a46a9d1ceae4a456924d2
 DIST gnatboot-4.1-i386.tar.bz2 15367514 RMD160 3a5dcd646a9abe75a62410a9daaf749171bf5aad SHA1 a7229124084a9e842686eb3c255e42bf432d7b3b SHA256 597b4a16f38fb173b1eecc259c1566ccf81291e13b88e2160102a512cefcc518
 DIST gnatboot-4.1-ppc.tar.bz2 13651598 RMD160 1890d8ae2e744d8a26ac5f9d1cf7c923637fff8b SHA1 017efeb76d9283bd90c431b06ddcb7dc91055e07 SHA256 2c9ed035b964a7dfcc427cb5c16dc30d3b99276fb424d25b0ebfde23a68013eb
-DIST gnatboot-4.3-amd64.tar.bz2 20325898 RMD160 347aab7ac56bf92edcea4d2f82e1eaef876d5f4f SHA1 48d3df3665c728e12a26899131e6d5e31068c2a2 SHA256 276b07c422ce102a160199aaa697152b2dcd4ebea194c75e8aa5453645d4e5e3
+DIST gnatboot-4.3-amd64.tar.bz2 20294401 RMD160 6c5ea6c183ffb6323e9eaf89ccd2b5f85640b2ae SHA1 43e450a9c38d90460a493d26b716ee4af642a19b SHA256 3506500b4cda06eaaf9bb70ec26fbe9be2a05b1f8edf0b2f7aeceb451a558333
 DIST gnatboot-4.3-i586.tar.bz2 16339727 RMD160 312acb6acb4491e2c581fba6481657a5aa25f803 SHA1 792903509e738e3f97eeccfef2653796f1fba372 SHA256 5754db5e623709b3b9a3bf98cb7d0884bae4ddc3bfcef6c81a5d70c90ea94172
 DIST gnatboot-4.3-i686.tar.bz2 16009514 RMD160 8c19481832b29213b3bbc21488ecf6368337c6e0 SHA1 7448f89590d56ccb49d55ee57c08f594563a1526 SHA256 33236c69f8d3d8e14e99314c013f1f3d61a7afdb19ac92641530f2e9999a0426
 DIST gnatboot-4.3-sparc.tar.bz2 13065130 RMD160 fd80c9fc8a3930e884daa0b86147871a1ee58b87 SHA1 fdf3b93414b050e552ee999ab50329580e1a0bf8 SHA256 e234336123fd65c0f73cd25af99dbb439ea08f0286fe7f5b1e05dd414b9878e7
@@ -44,24 +43,8 @@ EBUILD gnat-gcc-4.3.3-r2.ebuild 2296 RMD160 03b87da786d7645ee2712e2949bf2fce4117
 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
 EBUILD gnat-gcc-4.3.5.ebuild 2451 RMD160 5cc11b6f864c3e786d054f33843343538f47df8c SHA1 a7fefd8848bf37f6bd5b6f032730d157fd3cf5b5 SHA256 b67437b8e43dcd9d70ccbf7b2e2b49b9c72842b0c1d16d6b6ad85ca5ec358528
+EBUILD gnat-gcc-4.3.6.ebuild 2169 RMD160 5d94a71bbc1a2579b2a3be605f9eabf1ac3f9ba3 SHA1 878a2250df552b8e04081dce5c8912348cc4921d SHA256 add053b9e3f51a83daece84ca525e24c5e1427b1aa56e3c9301282c4d7efbad5
 EBUILD gnat-gcc-4.4.3.ebuild 2497 RMD160 ddbd4b3a52bca57b31d33fd9f93c922774a0452d SHA1 06a84534726473c52983b04a3be5d28555e5d395 SHA256 79c594f0abdbd635626993cf1e370c2e80b616f1ef42f93e42618b6dc90ae214
 EBUILD gnat-gcc-4.4.5.ebuild 2087 RMD160 1ebf76513f3df8a0d5493e19e225a4bba47b651f SHA1 aec5899d402d89101453d564e55479c9b762bfb9 SHA256 e11cf6b682e43466c7c0345187c59e43d6ac2b9cdde4806fcfd4270fb2925579
-MISC ChangeLog 7061 RMD160 e808c7460ada64f5c402aebc4be9ad28bc313f3b SHA1 d27eaf93c80eb3d8c52bd045a55206de497d23d9 SHA256 06b13932a453a50b61ca2e84efb00bc66b6fa4a18525ee28b59d0bc5e88accd3
+MISC ChangeLog 7399 RMD160 5f3f4082392f276de2ff48d080297a69282ab680 SHA1 0dc7406bfec5b028167c155ae3a29c0762b12dbb SHA256 b2dcd54c0a6f59ca4fd6b5e8064b7a5da1c33634816a43950f59fcf74744b9cf
 MISC metadata.xml 486 RMD160 a26b50e63ac849ba139fca465a52c8dd508b3e4d SHA1 0d1a097a395d7c1454472b598f04aea8b590c16d SHA256 c842cca66a73967cb7f205eff6cf4095fe360739b332cdb5b58b23d38e1e0960
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOV75jAAoJEPqDWhW0r/LCwF8P/2bp6VgGSvhBTBUfslm8nLT5
-uIxDDDxe2ZaDD3aV1Yr0yb9dCYPoYyNeC0rwM+hSRsO7G1E5k+Zffj9ewlX8Jegk
-+HOqubP7zdmcL535UBOHBPmT5PJ41J0fuwCIx1KVibxVSfPo0uRjAqB3auWPLwNa
-WsiTJrtS7ZkJ6zMdXwKWgaDYDpxxw/d5k8GkHUhbQjix2qCJe1GDkUNDTZbv2LtR
-GvKOXaR4DiFklfhY5gngM6h7KUBsW0yIWiji1o9kEYwrSn7CBUlorqUeZrN1JWiI
-iYSlq0F5uyiK2nQp/+XuUPNn77PDkdpPrRn0iPSb9K3mA3V/deDEkSSG/raj5yjm
-qNEhjQyQfMyyuq2+N3pfmREaTZZJpD4nAgTh/2fMpS1HYhb7x1YWKMvj/RdzgkjP
-Kw4IrWeUriFHIITDOI6xGZ/fZFz6sGRLDDtvralUwm7YllBIJPGztaBeea1FAwo3
-IuSPE+EfH2rvgFh1/+PJhairCu1gdMrcowqtZcE3NGPpWxO2KCmPBkRlD/RjnN5v
-wnbmiNDStTIiKypI4r1dBeUxcjPg/Zv7ONJAL0rLR68276oy9AiSHmIGm+tFV7s1
-MyLyCJ/jsh//uIQgJ9fpdKZmU/r4LJjib6algLKYok9FutLMvWQdgjZa5RcTYtvf
-iOXwXDUJt03328QyTC89
-=Ympe
------END PGP SIGNATURE-----
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild
new file mode 100644
index 000000000000..0f67011eaab4
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild
@@ -0,0 +1,63 @@
+# 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.6.ebuild,v 1.1 2011/09/14 09:28:13 george Exp $
+
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="http://gcc.gnu.org/"
+LICENSE="GMGPL"
+
+IUSE=""
+
+# 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"
+
+# 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
+
+	# 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"
+}
+
+src_compile() {
+	# looks like gnatlib_and_tools and gnatlib_shared have become part of
+	# bootstrap
+	gnatbuild_src_compile configure make-tools bootstrap
+}