new version

(Portage version: 2.1.3.12)

8 files changed, 82 insertions, 11 deletions

diff --git a/dev-lang/gnat-gcc/ChangeLog b/dev-lang/gnat-gcc/ChangeLog
index 3263c24139d3..e011426847f3 100644
--- a/dev-lang/gnat-gcc/ChangeLog
+++ b/dev-lang/gnat-gcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/gnat-gcc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.14 2007/05/29 17:59:22 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.15 2007/10/10 18:28:19 george Exp $
+
+*gnat-gcc-4.2.1 (10 Oct 2007)
+
+  10 Oct 2007; George Shapovalov <george@gentoo.org>
+  gnat-gcc-3.4.5-r2.ebuild, gnat-gcc-3.4.6.ebuild, gnat-gcc-4.1.1.ebuild,
+  gnat-gcc-4.1.2.ebuild, gnat-gcc-4.2.0.ebuild, +gnat-gcc-4.2.1.ebuild:
+  added new version. Fixed env (no longer) leaking issue in gnatbuild.eclass.
+  Quoted ${S}
 
   29 May 2007; George Shapovalov <george@gentoo.org> gnat-gcc-4.2.0.ebuild:
   QA_EXECSTACK marked
diff --git a/dev-lang/gnat-gcc/files/digest-gnat-gcc-4.2.1 b/dev-lang/gnat-gcc/files/digest-gnat-gcc-4.2.1
new file mode 100644
index 000000000000..731a39b05362
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/digest-gnat-gcc-4.2.1
@@ -0,0 +1,15 @@
+MD5 65f30d003a25564bfed142fb0dd68508 gcc-ada-4.2.1.tar.bz2 4684098
+RMD160 314ed806f724924f520725e1374cb691d89095e8 gcc-ada-4.2.1.tar.bz2 4684098
+SHA256 f262814a98fff90079c0f00feebba1af6405f995f35ef146d963445ba229b21e gcc-ada-4.2.1.tar.bz2 4684098
+MD5 88007169104d247eccb07dc5de2e0137 gcc-core-4.2.1.tar.bz2 19058230
+RMD160 a2fc302a6f2d7a4dfa87688eca380d260c202f9a gcc-core-4.2.1.tar.bz2 19058230
+SHA256 476fe4a6f10493fdb53070aa31515326975d2fdc38f2dce931526a528b9ca453 gcc-core-4.2.1.tar.bz2 19058230
+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
+MD5 c299b0f02b3e5da30edb25a522017fbf gnatboot-4.1-ppc.tar.bz2 13651598
+RMD160 1890d8ae2e744d8a26ac5f9d1cf7c923637fff8b gnatboot-4.1-ppc.tar.bz2 13651598
+SHA256 2c9ed035b964a7dfcc427cb5c16dc30d3b99276fb424d25b0ebfde23a68013eb gnatboot-4.1-ppc.tar.bz2 13651598
diff --git a/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild b/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild
index 69b225b346c7..98061157a1ea 100644
--- a/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.3 2007/05/28 19:21:12 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-3.4.5-r2.ebuild,v 1.4 2007/10/10 18:28:19 george Exp $
 
 inherit gnatbuild
 
@@ -23,7 +23,7 @@ src_unpack() {
 	gnatbuild_src_unpack
 
 	#fixup some hardwired flags
-	cd ${S}/gcc/ada
+	cd "${S}"/gcc/ada
 	sed -i -e "s:CFLAGS = -O2:CFLAGS = ${CFLAGS}:"	\
 		Makefile.adalib || die "patching Makefile.adalib failed"
 }
diff --git a/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild b/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild
index eb08e4acb127..8fbb1f91a179 100644
--- a/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6.ebuild,v 1.5 2007/05/28 19:21:12 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild,v 1.6 2007/10/10 18:28:19 george Exp $
 
 inherit gnatbuild
 
@@ -24,7 +24,7 @@ src_unpack() {
 	gnatbuild_src_unpack
 
 	#fixup some hardwired flags
-	cd ${S}/gcc/ada
+	cd "${S}"/gcc/ada
 	sed -i -e "s:CFLAGS = -O2:CFLAGS = ${CFLAGS}:"	\
 		Makefile.adalib || die "patching Makefile.adalib failed"
 }
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.1.1.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.1.1.ebuild
index 33d38c7ddfc9..0f04ce915365 100644
--- a/dev-lang/gnat-gcc/gnat-gcc-4.1.1.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.ebuild,v 1.7 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.1.1.ebuild,v 1.8 2007/10/10 18:28:19 george Exp $
 
 inherit gnatbuild
 
@@ -25,7 +25,7 @@ src_unpack() {
 	gnatbuild_src_unpack
 
 	#fixup some hardwired flags
-	cd ${S}/gcc/ada
+	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..
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild
index 4a24526c448b..f8412ac5e5bd 100644
--- a/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.ebuild,v 1.4 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild,v 1.5 2007/10/10 18:28:19 george Exp $
 
 inherit gnatbuild
 
@@ -25,7 +25,7 @@ src_unpack() {
 	gnatbuild_src_unpack
 
 	#fixup some hardwired flags
-	cd ${S}/gcc/ada
+	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..
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.2.0.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.2.0.ebuild
index e972582a4b1f..35077905ec34 100644
--- a/dev-lang/gnat-gcc/gnat-gcc-4.2.0.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.0.ebuild,v 1.4 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.2.0.ebuild,v 1.5 2007/10/10 18:28:19 george Exp $
 
 inherit gnatbuild
 
@@ -28,7 +28,7 @@ src_unpack() {
 	gnatbuild_src_unpack
 
 	#fixup some hardwired flags
-	cd ${S}/gcc/ada
+	cd "${S}"/gcc/ada
 
 	# universal gcc -> gnatgcc substitution occasionally produces lines too long
 	# and then build halts on the style check.
diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.2.1.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.2.1.ebuild
new file mode 100644
index 000000000000..046f410a9568
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 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.2.1.ebuild,v 1.1 2007/10/10 18:28:19 george Exp $
+
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="http://gcc.gnu.org/"
+LICENSE="GMGPL"
+
+# overriding the BOOT_SLOT, as 4.1 should do fine, no need for bootstrap duplication
+BOOT_SLOT="4.1"
+
+# 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
+	ppc?   ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
+	x86?   ( mirror://gentoo/gnatboot-${BOOT_SLOT}-i386.tar.bz2 )
+	amd64? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+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.
+	#
+	# 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
+}