Removed GNAT 5.0 snapshots and added the new GCC 3.4.1-based GNAT

6 files changed, 156 insertions, 15 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index 7776bfbcf98f..cebe0c8ed5ae 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/gnat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.23 2004/06/24 22:49:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.24 2004/08/02 07:46:20 dholm Exp $
+
+*gnat-3.41 (02 Aug 2004)
+
+  02 Aug 2004; David Holm <dholm@gentoo.org> +gnat-3.41.ebuild:
+  Removed GNAT 5.0 snapshots and added the new GCC 3.4.1-based GNAT.
 
   30 Apr 2004; David Holm <dholm@gentoo.org> gnat-3.14p.ebuild:
   Put gnat-3.14p files on Gentoo mirrors.
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index fcd6355f95b7..1e0e920281ca 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,16 +1,16 @@
-MD5 32b4d85a89af99eb39151e029693add0 gnat-5.0_pre20030822.ebuild 4322
+MD5 37bb72a9b03c0a2413febe21c7df154b ChangeLog 4301
 MD5 b8821aa97616ac6b39d3f9287365f676 gnat-3.14p.ebuild 5602
-MD5 d0d1913a7c06379cbeb2f25ae15f706f gnat-5.0_pre20031005.ebuild 4766
-MD5 921f76d3249bf9707e8da41bf1fd1483 ChangeLog 4144
+MD5 a324b57d6b8c671f7b602837987bd7cf gnat-3.15p-r3.ebuild 6091
 MD5 b9333162fb87ac124e1fe5b0e40de968 gnat-3.15p.ebuild 5658
+MD5 32b4d85a89af99eb39151e029693add0 gnat-5.0_pre20030822.ebuild 4322
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
-MD5 a324b57d6b8c671f7b602837987bd7cf gnat-3.15p-r3.ebuild 6091
-MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r3 378
-MD5 6c454f942791a6212d8b5cf5c92aa2d0 files/gnat-3.15p-i686-pc-linux-gnu-bin.patch 605
-MD5 5bb6d44626422164593ee93340e50a8d files/digest-gnat-5.0_pre20030822 232
-MD5 fa1efc205527dc0290e6f232998f3e4f files/digest-gnat-5.0_pre20031005 232
+MD5 27e8d85cb0ed7b2ff0a57db013e308f8 gnat-3.41.ebuild 3785
+MD5 d0d1913a7c06379cbeb2f25ae15f706f gnat-5.0_pre20031005.ebuild 4766
+MD5 f8f626b880eb4ed2985834912d6f8af6 files/digest-gnat-3.41 225
 MD5 59500f81e672cff22232586fc278547b files/digest-gnat-3.14p 213
 MD5 737e39907fb4f28640a1b4cbbc1cdc78 files/digest-gnat-3.15p 216
+MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r3 378
 MD5 6055ef6f0b3cd0df65743bfedb9de925 files/gnat-3.15p-gentoo-nonx86.patch.bz2 2112
 MD5 f2825770e20893d32738f4106cd3d628 files/gnat-3.15p-gentoo.patch.bz2 3754
+MD5 6c454f942791a6212d8b5cf5c92aa2d0 files/gnat-3.15p-i686-pc-linux-gnu-bin.patch 605
 MD5 7fabcf7198fb4001adfba250899e0024 files/gnat-3.15p-noaddr2line.patch.bz2 542
diff --git a/dev-lang/gnat/files/digest-gnat-3.41 b/dev-lang/gnat/files/digest-gnat-3.41
new file mode 100644
index 000000000000..7f9595fe7070
--- /dev/null
+++ b/dev-lang/gnat/files/digest-gnat-3.41
@@ -0,0 +1,3 @@
+MD5 4b05b134baf92457494a0f4a28aa5213 gcc-core-3.4.1.tar.bz2 12862544
+MD5 30128194f14bda7cead8f46d9a62a06e gcc-ada-3.4.1.tar.bz2 3460295
+MD5 57c060cd1ccef8b1ae9165b11d98780a gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz 13482938
diff --git a/dev-lang/gnat/files/digest-gnat-5.0_pre20030822 b/dev-lang/gnat/files/digest-gnat-5.0_pre20030822
deleted file mode 100644
index 684d7996c8fc..000000000000
--- a/dev-lang/gnat/files/digest-gnat-5.0_pre20030822
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b7bfa83ab87f74e8f28d467d4e53c3f gnat-5.0_pre20030822.tar.bz2 3838770
-MD5 57c060cd1ccef8b1ae9165b11d98780a gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz 13482938
-MD5 66664a84b383ba8d68612cd89b9478b2 gcc-core-3.2.3.tar.bz2 10324429
diff --git a/dev-lang/gnat/files/digest-gnat-5.0_pre20031005 b/dev-lang/gnat/files/digest-gnat-5.0_pre20031005
deleted file mode 100644
index d2b117b8b9fd..000000000000
--- a/dev-lang/gnat/files/digest-gnat-5.0_pre20031005
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 faafe03c69523539be10236097f8fd88 gnat-5.0_pre20031005.tar.bz2 3904129
-MD5 57c060cd1ccef8b1ae9165b11d98780a gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz 13482938
-MD5 66664a84b383ba8d68612cd89b9478b2 gcc-core-3.2.3.tar.bz2 10324429
diff --git a/dev-lang/gnat/gnat-3.41.ebuild b/dev-lang/gnat/gnat-3.41.ebuild
new file mode 100644
index 000000000000..21188c6659dd
--- /dev/null
+++ b/dev-lang/gnat/gnat-3.41.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.41.ebuild,v 1.1 2004/08/02 07:46:20 dholm Exp $
+
+inherit gnat
+
+MY_PV=3.4.1
+DESCRIPTION="GNAT Ada Compiler"
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${MY_PV}/gcc-core-${MY_PV}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${MY_PV}/gcc-ada-${MY_PV}.tar.bz2
+	x86? ( http://gd.tuwien.ac.at/languages/ada/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz )"
+HOMEPAGE="http://www.gnat.com/"
+
+DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="GMGPL"
+IUSE=""
+
+S="${WORKDIR}/gcc-${MY_PV}"
+GNATBUILD="${WORKDIR}/build"
+GNATBOOT="${WORKDIR}/boot"
+GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+
+CFLAGS="-O -gnatpgn"
+
+src_unpack() {
+	unpack ${A}
+
+	# Install the bootstrap compiler
+	cd "${GNATBOOTINST}"
+	patch -p1 < ${FILESDIR}/gnat-3.15p-i686-pc-linux-gnu-bin.patch
+	echo $'\n'3$'\n'${GNATBOOT}$'\n' | ./doconfig > doconfig.log 2>&1
+	./doinstall
+
+	# Prepare the gcc source directory
+	cd "${S}"
+	touch gcc/cstamp-h.in
+	touch gcc/ada/[es]info.h
+	touch gcc/ada/nmake.ad[bs]
+	mkdir -p "${GNATBUILD}"
+}
+
+src_compile() {
+	# Set some paths to our bootstrap compiler.
+	local GCC_EXEC_PREFIX="${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/3.2.3"
+	local PATH="${GNATBOOT}/bin:${PATH}"
+	local LDFLAGS="-L${GCC_EXEC_PREFIX} -L${GNATBOOTINST}"
+	local CC="${GNATBOOT}/bin/gcc"
+
+	# Configure gcc
+	cd "${GNATBUILD}"
+	"${S}"/configure --prefix=/usr \
+		--program-prefix=gnat \
+		--enable-languages="c,ada" \
+		--enable-libada \
+		--with-gcc \
+		--with-gnu-ld \
+		--with-gnu-as \
+		--enable-threads=posix \
+		--enable-shared \
+		--with-system-zlib \
+		--disable-nls \
+		--libdir=/usr/lib/ada \
+		--libexecdir=/usr/libexec/ada \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		|| die "configure failed"
+
+	# Compile helper tools
+	cd "${GNATBOOT}"
+	cp ${S}/gcc/ada/xtreeprs.adb .
+	cp ${S}/gcc/ada/xsinfo.adb .
+	cp ${S}/gcc/ada/xeinfo.adb .
+	cp ${S}/gcc/ada/xnmake.adb .
+	gnatmake xtreeprs && \
+		gnatmake xsinfo && \
+		gnatmake xeinfo && \
+		gnatmake xnmake || die "building helper tools"
+
+	for i in `find ${S}/gcc/ada -name '*.ad[sb]'`; do \
+		sed -i -e "s/\"gcc\"/\"gnatgcc\"/g" ${i}; \
+	done
+
+	cd "${GNATBUILD}"
+	emake bootstrap || die "bootstrap failed"
+	cd "${GNATBUILD}"
+	make -C gcc gnatlib_and_tools || die "gnatlib_and_tools failed"
+}
+
+src_install() {
+	# Do not allow symlinks in /usr/lib/gcc/${CHOST}/${MY_PV}/include as
+	# this can break the build.
+	for x in ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+		fi
+	done
+
+	# Install gnatgcc, tools and native threads library
+	cd "${GNATBUILD}"
+	#make prefix="${D}/usr" libdir="${D}/usr/lib/ada" install \
+	#	|| die "installing"
+	make prefix=${D}/usr \
+		libdir=${D}/usr/lib/ada \
+		libexecdir=${D}/usr/libexec/ada \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die "died while installing"
+
+	# These are all provided by gcc
+	rm -rf ${D}/usr/share/info
+	rm -rf ${D}/usr/share/man
+	rm -rf ${D}/usr/share/make
+
+	dodir "/usr/lib/ada/gcc/${CHOST}/${MY_PV}/rts-native"
+
+	# Move the native threads library
+	cd "${D}/usr/lib/ada/gcc/${CHOST}/${MY_PV}"
+	mv adalib adainclude rts-native
+
+	# Make native threads the default
+	ln -s rts-native/adalib adalib
+	ln -s rts-native/adainclude adainclude
+}
+
+pkg_postinst() {
+	# Notify the user what changed
+	einfo ""
+	einfo "The compiler has been installed as gnatgcc, and the coverage testing"
+	einfo "tool as gnatgcov."
+	einfo ""
+	einfo "If you are upgrading from GNAT-3.15p or older you will have to"
+	einfo "reemerge all Ada packages as GNAT-${MY_PV} has updated to a version of"
+	einfo "GCC which is not backwards compatible with 2.8.1."
+	einfo ""
+}