gnat-3.44-r1 ready for unmasking on x86

Package-Manager: portage-2.1_pre2

4 files changed, 20 insertions, 27 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index d76ed52c07dc..de4b16567945 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/gnat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.37 2005/12/19 19:36:28 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.38 2005/12/28 16:45:43 george Exp $
+
+  28 Dec 2005; George Shapovalov <george@gentoo.org> gnat-3.44-r1.ebuild:
+  ready for unmasking on x86, amd64 supported in -r2 and ppc needs testing
 
   19 Dec 2005; George Shapovalov <george@gentoo.org> gnat-3.44-r2.ebuild:
   all of amd64 stuff for gnat-3.44 is set, redady for unmasking. Removed ~x86
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index 6e9f21dc765a..99c6dca5fd3c 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,4 +1,4 @@
-MD5 adf127ca8f49baff4ef20a110a2465df ChangeLog 6237
+MD5 ce544348213d3615b533540d2bc559fc ChangeLog 6387
 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
@@ -7,7 +7,7 @@ MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r5 378
 MD5 ffcd9ae5ebd258ffd9c88fc3cf225bd6 files/digest-gnat-3.41 315
 MD5 119e0c400e71cdafcfb3eeca106c7029 files/digest-gnat-3.43 315
 MD5 24fa8c7547a59391c65d8a1f6e28e0ae files/digest-gnat-3.44 382
-MD5 7bae4a0c63edacc1fd59b6e7b14d86e8 files/digest-gnat-3.44-r1 382
+MD5 c1759c1573408778816003fb5c8c8cc0 files/digest-gnat-3.44-r1 315
 MD5 aa0506e53784085c260dc9001ff1680c files/digest-gnat-3.44-r2 359
 MD5 6055ef6f0b3cd0df65743bfedb9de925 files/gnat-3.15p-gentoo-nonx86.patch.bz2 2112
 MD5 f2825770e20893d32738f4106cd3d628 files/gnat-3.15p-gentoo.patch.bz2 3754
@@ -22,7 +22,7 @@ MD5 9e647fec72de0891860dccad0a12c86a gnat-3.15p-r5.ebuild 5769
 MD5 608766ca2b3f1891c60dc4bf831bf14a gnat-3.15p.ebuild 5655
 MD5 7e1abff13d1add33756c2f586bbb5e63 gnat-3.41.ebuild 4012
 MD5 140f94774ca1df5f61298c4a7982bf3a gnat-3.43.ebuild 4041
-MD5 c94e823262b4cc2aa0495a9d1f97be7b gnat-3.44-r1.ebuild 5301
+MD5 a434a32f31860757df690d7a1ec2a21d gnat-3.44-r1.ebuild 4983
 MD5 7e91bca705a60e00158df0aeacbfd42b gnat-3.44-r2.ebuild 5003
 MD5 f9e686a899e7d173784d4aaee898c0fe gnat-3.44.ebuild 5446
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
diff --git a/dev-lang/gnat/files/digest-gnat-3.44-r1 b/dev-lang/gnat/files/digest-gnat-3.44-r1
index 4b5680dea1cd..2b1de739199f 100644
--- a/dev-lang/gnat/files/digest-gnat-3.44-r1
+++ b/dev-lang/gnat/files/digest-gnat-3.44-r1
@@ -1,5 +1,4 @@
-MD5 9dd911fd9bc136ca42b73c68735d853b gcc-core-3.4.4.tar.bz2 13153342
 MD5 7da97a3f50bfa252d7fbb37ab22053f3 gcc-ada-3.4.4.tar.bz2 3460438
+MD5 9dd911fd9bc136ca42b73c68735d853b gcc-core-3.4.4.tar.bz2 13153342
 MD5 57c060cd1ccef8b1ae9165b11d98780a gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz 13482938
 MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
-MD5 324005671decf8a5e4473e52ce5b5dbc gcc-3.4-amd64.tar.gz 25847787
diff --git a/dev-lang/gnat/gnat-3.44-r1.ebuild b/dev-lang/gnat/gnat-3.44-r1.ebuild
index 7268bf7d2e7f..b76072331029 100644
--- a/dev-lang/gnat/gnat-3.44-r1.ebuild
+++ b/dev-lang/gnat/gnat-3.44-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44-r1.ebuild,v 1.3 2005/12/16 12:00:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44-r1.ebuild,v 1.4 2005/12/28 16:45:43 george Exp $
 
-inherit gnat flag-o-matic
+inherit gnat
 
 MY_PV="3.4.4"
 
@@ -10,15 +10,14 @@ 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 )
-	ppc? ( mirror://gentoo/gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 )
-	amd64? ( http://dev.gentoo.org/~george/src/gcc-3.4-amd64.tar.gz )"
+	ppc? ( mirror://gentoo/gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 )"
 HOMEPAGE="http://www.gnat.com/"
 
 DEPEND="=sys-devel/gcc-3*
 	x86? ( >=app-shells/tcsh-6.0 )"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 -amd64"
 LICENSE="GMGPL"
 IUSE=""
 
@@ -35,11 +34,13 @@ case ${ARCH} in
 		GNATBOOTINST="${GNATBOOT}"
 		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
 		;;
-	amd64)
-		GNATBOOT="${WORKDIR}/usr"
-		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc"
 esac
 
+# gnat is getting bootstrapped off an older backend, set minimal flags
+# use later versions for more modern gcc support
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
 src_unpack() {
 	unpack ${A}
 
@@ -47,11 +48,10 @@ src_unpack() {
 	if [ "${ARCH}" = "x86" ]; then
 		cd "${GNATBOOTINST}"
 		patch -p1 < ${FILESDIR}/gnat-3.15p-i686-pc-linux-gnu-bin.patch
+		# tcsh no longer installs symlink to csh
+		sed -i -e "s:/bin/csh:/bin/tcsh:" doconfig
 		echo $'\n'3$'\n'${GNATBOOT}$'\n' | ./doconfig > doconfig.log 2>&1
 		./doinstall
-	elif [ "${ARCH}" = "amd64" ]; then
-		cd ${S}/gcc/ada/
-		patch Make-lang.in < ${FILESDIR}/gnat-3.44-amd64-Make-lang.in.patch
 	fi
 
 	# Prepare the gcc source directory
@@ -60,10 +60,6 @@ src_unpack() {
 	touch gcc/ada/[es]info.h
 	touch gcc/ada/nmake.ad[bs]
 	mkdir -p "${GNATBUILD}"
-
-	#fixup some hardwired flags
-	sed -i -e "s:CFLAGS = -O2:CFLAGS = ${CFLAGS}:"	\
-		gcc/ada/Makefile.adalib || die "patching Makefile.adalib failed"
 }
 
 src_compile() {
@@ -156,12 +152,7 @@ src_install() {
 	# These are all provided by gcc
 	rm -rf ${D}/usr/share/info/{gcc*,cpp*}
 
-	#on amd64 installer misdetects arch string
-	if [ "${ARCH}" == "amd64" ]; then
-		local myCHOST="x86_64-unknown-linux-gnu"
-	else
-		local myCHOST="${CHOST}"
-	fi
+	local myCHOST="${CHOST}"
 	dodir "/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/rts-native"
 
 	# Move the native threads library