fix for libgcc_s problem (#117741) on x86

(Portage version: 2.1_pre3-r1)

6 files changed, 17 insertions, 14 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index c9dd7c254c0f..aa98ba90cf7d 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/gnat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.41 2006/01/03 21:08:55 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.42 2006/01/04 19:49:45 george Exp $
+
+  04 Jan 2006; George Shapovalov <george@gentoo.org> gnat-3.44-r2.ebuild, gnat-3.45.ebuild:
+  fix for libgcc_s problem (#117741) on x86
 
 *gnat-3.45 (03 Jan 2006)
 
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index 4002a0ce6d4c..2a9df955a75a 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -7,8 +7,8 @@ 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 c1759c1573408778816003fb5c8c8cc0 files/digest-gnat-3.44-r1 315
-MD5 37ec829a7146b3a0069b195780d2dc98 files/digest-gnat-3.44-r2 360
-MD5 abed28bb4fc0cce9bb9d260d19e6fe6c files/digest-gnat-3.45 360
+MD5 7cbb180e3b767f2d800242a04555b433 files/digest-gnat-3.44-r2 363
+MD5 e2fa31ceddff6bc6e628c5d7107cf0ec files/digest-gnat-3.45 362
 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
@@ -23,6 +23,6 @@ MD5 608766ca2b3f1891c60dc4bf831bf14a gnat-3.15p.ebuild 5655
 MD5 7e1abff13d1add33756c2f586bbb5e63 gnat-3.41.ebuild 4012
 MD5 140f94774ca1df5f61298c4a7982bf3a gnat-3.43.ebuild 4041
 MD5 a434a32f31860757df690d7a1ec2a21d gnat-3.44-r1.ebuild 4983
-MD5 e708ff7e7db4fd42251423216f2bcd0e gnat-3.44-r2.ebuild 5079
-MD5 8961ae5b9d41713cb8d4bcb2aa8e8ff9 gnat-3.45.ebuild 5500
+MD5 99b9aa2ffed8fa52052de92bd2494086 gnat-3.44-r2.ebuild 5082
+MD5 e5c97ed271afd4988991b0eb3b981822 gnat-3.45.ebuild 5529
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
diff --git a/dev-lang/gnat/files/digest-gnat-3.44-r2 b/dev-lang/gnat/files/digest-gnat-3.44-r2
index 5abed79a4e78..135ae987a528 100644
--- a/dev-lang/gnat/files/digest-gnat-3.44-r2
+++ b/dev-lang/gnat/files/digest-gnat-3.44-r2
@@ -1,5 +1,5 @@
 MD5 c1a2ee0512334a922554e9b6ff0b73cf gcc-3.4-amd64.tar.gz 15097044
-MD5 a656394b22f40aee4db3161b32e1a761 gcc-3.4-i386.tar.bz2 10344150
+MD5 6e279669b26edd36d79f06f27402106c gcc-3.4-i386-r1.tar.bz2 10364595
 MD5 7da97a3f50bfa252d7fbb37ab22053f3 gcc-ada-3.4.4.tar.bz2 3460438
 MD5 9dd911fd9bc136ca42b73c68735d853b gcc-core-3.4.4.tar.bz2 13153342
 MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
diff --git a/dev-lang/gnat/files/digest-gnat-3.45 b/dev-lang/gnat/files/digest-gnat-3.45
index 234d1598679e..de84fa306002 100644
--- a/dev-lang/gnat/files/digest-gnat-3.45
+++ b/dev-lang/gnat/files/digest-gnat-3.45
@@ -1,5 +1,5 @@
 MD5 c1a2ee0512334a922554e9b6ff0b73cf gcc-3.4-amd64.tar.gz 15097044
-MD5 a656394b22f40aee4db3161b32e1a761 gcc-3.4-i386.tar.bz2 10344150
+MD5 6ea8dd7dc49fdb91081c9f4ca9ef3149 gcc-3.4-i386-r1.tar.bz2 1002016
 MD5 797afd0098e6b29ff85a2a8158d23f32 gcc-ada-3.4.5.tar.bz2 3784842
 MD5 0114ba67f9aabad91d96797d0b6017c4 gcc-core-3.4.5.tar.bz2 13397308
 MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
diff --git a/dev-lang/gnat/gnat-3.44-r2.ebuild b/dev-lang/gnat/gnat-3.44-r2.ebuild
index ab2590965d58..93a112b2c45a 100644
--- a/dev-lang/gnat/gnat-3.44-r2.ebuild
+++ b/dev-lang/gnat/gnat-3.44-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44-r2.ebuild,v 1.3 2005/12/28 20:37:56 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44-r2.ebuild,v 1.4 2006/01/04 19:49:45 george Exp $
 
 inherit gnat flag-o-matic
 
@@ -9,7 +9,7 @@ MY_PV="3.4.4"
 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://dev.gentoo.org/~george/src/gcc-3.4-i386.tar.bz2 )
+	x86? ( http://dev.gentoo.org/~george/src/gcc-3.4-i386-r1.tar.bz2 )
 	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 )"
 HOMEPAGE="http://www.gnat.com/"
diff --git a/dev-lang/gnat/gnat-3.45.ebuild b/dev-lang/gnat/gnat-3.45.ebuild
index ac4f8c6859c0..1725bac72830 100644
--- a/dev-lang/gnat/gnat-3.45.ebuild
+++ b/dev-lang/gnat/gnat-3.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.45.ebuild,v 1.2 2006/01/03 21:08:55 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.45.ebuild,v 1.3 2006/01/04 19:49:45 george Exp $
 
 inherit gnat flag-o-matic
 
@@ -9,7 +9,7 @@ MY_PV="3.4.5"
 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://dev.gentoo.org/~george/src/gcc-3.4-i386.tar.bz2 )
+	x86? ( http://dev.gentoo.org/~george/src/gcc-3.4-i386-r1.tar.bz2 )
 	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 )"
 HOMEPAGE="http://www.gnat.com/"
@@ -163,7 +163,7 @@ src_install() {
 		mv ${D}/usr/lib/lib/* ${D}/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/32/
 	else
 		local myCHOST="${CHOST}"
-		mv ${D}/usr/lib/lib/* ${D}/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/
+		mv ${D}/usr/lib/ada/libgcc_s* ${D}/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/
 	fi
 	dodir "/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/rts-native"
 
@@ -176,7 +176,7 @@ src_install() {
 	ln -s rts-native/adainclude adainclude
 
 	# remove uneeded stuff
-	rm -rf ${D}/usr/lib/li{b,b64} ${D}/usr/lib/ada/libiberty.a
+	rm -rf ${D}/usr/lib/li{b,b64} ${D}/usr/lib/ada/libiberty.a ${D}/usr/include/
 }
 
 pkg_postinst() {