new revision to match updated eclass. Fixes to build issues, better multilib, new bootstrap, misc..

(Portage version: 2.1_pre6-r5)

7 files changed, 188 insertions, 11 deletions

diff --git a/dev-lang/gnat-gpl/ChangeLog b/dev-lang/gnat-gpl/ChangeLog
index 9affd692fda0..cc8184ccf7d7 100644
--- a/dev-lang/gnat-gpl/ChangeLog
+++ b/dev-lang/gnat-gpl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/gnat-gpl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/ChangeLog,v 1.3 2006/03/19 22:20:51 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/ChangeLog,v 1.4 2006/03/27 10:28:07 george Exp $
+
+*gnat-gpl-3.4.5.1-r2 (27 Mar 2006)
+
+  27 Mar 2006; George Shapovalov <george@gentoo.org>
+  +files/patches/51_all_gcc-3.4-libiberty-pic.patch,
+  +files/gcc-configure-LANG.patch, +files/patches/74_all_sh-pr24836.patch,
+  +gnat-gpl-3.4.5.1-r2.ebuild:
+  new revision to match updated gnatbuild.eclass. Misc fixes, better multilib..
 
   19 Mar 2006; Mark Loeser <halcy0n@gentoo.org> gnat-gpl-3.4.5.1.ebuild,
   gnat-gpl-3.4.5.1-r1.ebuild:
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index bcb85242495a..16ed6f9f3816 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 29127f0ca5f8fb3ea798ac1b93515954 ChangeLog 777
 RMD160 2b5640b6916c675963a1ccaf8ba056cd0473f415 ChangeLog 777
 SHA256 14498e22f4c84ad9f9b2e3fcf998497a1be9dc7245b983c8570e4fb8681f3ebd ChangeLog 777
@@ -10,22 +7,30 @@ SHA256 2b52d2b859d61be62cf3723bfe1f1d287fcd4baf785d07d93efe7505cdae93d8 files/di
 MD5 f28d95fa6e19dc594ed1bfafe4795b3c files/digest-gnat-gpl-3.4.5.1-r1 354
 RMD160 d6584f35c0fc6096f934211f94d79a5ce9e32dcc files/digest-gnat-gpl-3.4.5.1-r1 354
 SHA256 e1742c6bfd303ef996228a99bea9b31908e113e3517cc1303575a497b9091590 files/digest-gnat-gpl-3.4.5.1-r1 354
+MD5 78531aa1e410b379a63633ea46d6dfaf files/digest-gnat-gpl-3.4.5.1-r2 1283
+RMD160 3bd4b25c8aa4cc87281a7173675fb9eaeba14033 files/digest-gnat-gpl-3.4.5.1-r2 1283
+SHA256 258b5ce48de1e17ecdbb5829325b8425f791c13a6c73b4b5bf8b518088cbdad3 files/digest-gnat-gpl-3.4.5.1-r2 1283
+MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/gcc-configure-LANG.patch 1686
+RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/gcc-configure-LANG.patch 1686
+SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/gcc-configure-LANG.patch 1686
 MD5 c370fea9c771c16d066a4c661e93edc7 files/gnat-Make-lang.in.patch 555
 RMD160 110c659ce235926a488eb6382bc380de7195cb13 files/gnat-Make-lang.in.patch 555
 SHA256 e213feb0c5676dac56af0d9f8d4112cfaae6bfff1e29f18fee81f4e23634e698 files/gnat-Make-lang.in.patch 555
+MD5 45951dd3bbc979c9e043c7203745cf31 files/patches/51_all_gcc-3.4-libiberty-pic.patch 350
+RMD160 4460024bbeae0a723df57657524cbdcb087f269d files/patches/51_all_gcc-3.4-libiberty-pic.patch 350
+SHA256 c67824f20231181cd351dab085d861c6d97100b22ee913c5610b160aae5f4a0d files/patches/51_all_gcc-3.4-libiberty-pic.patch 350
+MD5 48af48b8e7f8e6db47a2d7a019aeaae4 files/patches/74_all_sh-pr24836.patch 663
+RMD160 674e395da770cac6e5ac66f53553acd2612d5011 files/patches/74_all_sh-pr24836.patch 663
+SHA256 64772b8d84f82194bd8be91f6cf73d868b6ac24c41a5eddd238d559dbe109362 files/patches/74_all_sh-pr24836.patch 663
 MD5 101628a2171a4c650021c6e2c50e5886 gnat-gpl-3.4.5.1-r1.ebuild 2418
 RMD160 ccd981a95e2de9ddf9b8f258fc41d8820dba94b4 gnat-gpl-3.4.5.1-r1.ebuild 2418
 SHA256 d70d6189c70c392a8cd0ffd547a8d746e7c567014bd1285c4309245192a1c968 gnat-gpl-3.4.5.1-r1.ebuild 2418
+MD5 b10db681b488a5373b31082fdb77b443 gnat-gpl-3.4.5.1-r2.ebuild 2312
+RMD160 f88ead82483dab401dca9d4c4042e5b6c0b56ccf gnat-gpl-3.4.5.1-r2.ebuild 2312
+SHA256 f193a70df9a42270f7d8a356ef16e854cec1f22ad55bd3fd3eb7c61cf96c337f gnat-gpl-3.4.5.1-r2.ebuild 2312
 MD5 95fe10419e38a8790cffb719372b855d gnat-gpl-3.4.5.1.ebuild 2409
 RMD160 b1ff15174782a971225bc7731bfd3978c4ece228 gnat-gpl-3.4.5.1.ebuild 2409
 SHA256 3a09f9d81fdec2337dd5a336d259f6e2602bf40f16b25935cb6efef044a1410b gnat-gpl-3.4.5.1.ebuild 2409
 MD5 63fe50d3f9c3d288e7c1d1ac98eac6d7 metadata.xml 552
 RMD160 9524b8f235d2e96967b1414cf0dfb81e7b4d7d41 metadata.xml 552
 SHA256 e90469f4de062e9432e406f068db899fec34efa03c8c505d605bab800cb54107 metadata.xml 552
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHdlNCRZPokWLroQRAkQrAKCxH7B1yPJ2oHOBwnEiwVumjrHMmwCggIPb
-lQ0TlxM5YSQQ7qQb0B2/2Ks=
-=Uoph
------END PGP SIGNATURE-----
diff --git a/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2 b/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2
new file mode 100644
index 000000000000..6dfd1efc2212
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2
@@ -0,0 +1,15 @@
+MD5 91f813b5dcd60289587092f552b6a037 RM-05-Html.zip 1506487
+RMD160 ec1ff61f887d964256f8242bd2be6c285b512963 RM-05-Html.zip 1506487
+SHA256 2271de789bf545b0983ada767a72c8026adba50d9c5f58a26e2f3e49392cf548 RM-05-Html.zip 1506487
+MD5 0114ba67f9aabad91d96797d0b6017c4 gcc-core-3.4.5.tar.bz2 13397308
+RMD160 d0b1f2748929d319b68e80542edfe1251a867c81 gcc-core-3.4.5.tar.bz2 13397308
+SHA256 8a2824b12a1cae8b68de3be0a8fd2da14918462e6afa27c3578ccfc8ab10d0fc gcc-core-3.4.5.tar.bz2 13397308
+MD5 003b8f14eeacad4e6977043232b249f9 gnat-gpl-3.4.5.1-src.tar.bz2 5057268
+RMD160 b1ff9411eb1fe3e27a4900c1e61140f81a1bc4bc gnat-gpl-3.4.5.1-src.tar.bz2 5057268
+SHA256 b831f83c879b22da735b1c759db1d576aaaf3547771d560f1cf8ed24e0284242 gnat-gpl-3.4.5.1-src.tar.bz2 5057268
+MD5 1c6a132642a5d9b2712b62b5e52e593b gnatboot-3.4-amd64-r2.tar.bz2 12063245
+RMD160 6be578cb8938e872b39d2420c2151d4b8b574f20 gnatboot-3.4-amd64-r2.tar.bz2 12063245
+SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d gnatboot-3.4-amd64-r2.tar.bz2 12063245
+MD5 cf7184e3f90a9fbbcc552257d8408337 gnatboot-3.4-i386.tar.bz2 10629373
+RMD160 27a3189be4a1f699b438f777679890b93a51eb1e gnatboot-3.4-i386.tar.bz2 10629373
+SHA256 7b4300e72b7f00d2fd9d0dad6940c3e6b4e19eeaf4696e92d7c92e2a38e8b049 gnatboot-3.4-i386.tar.bz2 10629373
diff --git a/dev-lang/gnat-gpl/files/gcc-configure-LANG.patch b/dev-lang/gnat-gpl/files/gcc-configure-LANG.patch
new file mode 100644
index 000000000000..3ef76ef911c0
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gcc-configure-LANG.patch
@@ -0,0 +1,41 @@
+The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
+option parsing, it may break.
+
+http://bugs.gentoo.org/103483
+
+--- configure
++++ configure
+@@ -54,6 +54,16 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+@@ -452,16 +463,6 @@
+   esac
+ done
+ 
+-# NLS nuisances.
+-# Only set these to C if already set.  These must not be set unconditionally
+-# because not all systems understand e.g. LANG=C (notably SCO).
+-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+-# Non-C LC_CTYPE values break the ctype check.
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+-
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/dev-lang/gnat-gpl/files/patches/51_all_gcc-3.4-libiberty-pic.patch b/dev-lang/gnat-gpl/files/patches/51_all_gcc-3.4-libiberty-pic.patch
new file mode 100644
index 000000000000..d9a95a21b10f
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/patches/51_all_gcc-3.4-libiberty-pic.patch
@@ -0,0 +1,10 @@
+--- gcc-4.1.0-orig/libiberty/Makefile.in	2006-03-01 15:49:14.000000000 -0500
++++ gcc-4.1.0/libiberty/Makefile.in	2006-03-01 18:10:46.000000000 -0500
+@@ -232,6 +232,7 @@
+ 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
+ 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+ 	  $(RANLIB) $(TARGETLIB); \
++	  cp $(TARGETLIB) ../ ; \
+ 	  cd ..; \
+ 	else true; fi
+ 
diff --git a/dev-lang/gnat-gpl/files/patches/74_all_sh-pr24836.patch b/dev-lang/gnat-gpl/files/patches/74_all_sh-pr24836.patch
new file mode 100644
index 000000000000..9bad985a2647
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/patches/74_all_sh-pr24836.patch
@@ -0,0 +1,25 @@
+http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
+
+--- gcc/configure.ac	(revision 106699)
++++ gcc/configure.ac	(working copy)
+@@ -2446,7 +2446,7 @@
+ 	tls_first_minor=14
+ 	tls_as_opt="-m64 -Aesame --fatal-warnings"
+ 	;;
+-  sh-*-* | sh[34]-*-*)
++  sh-*-* | sh[34]*-*-*)
+     conftest_s='
+ 	.section ".tdata","awT",@progbits
+ foo:	.long	25
+--- gcc/configure
++++ gcc/configure
+@@ -14846,7 +14846,7 @@
+ 	tls_first_minor=14
+ 	tls_as_opt="-m64 -Aesame --fatal-warnings"
+ 	;;
+-  sh-*-* | sh[34]-*-*)
++  sh-*-* | sh[34]*-*-*)
+     conftest_s='
+ 	.section ".tdata","awT",@progbits
+ foo:	.long	25
diff --git a/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild
new file mode 100644
index 000000000000..a8076959f708
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild,v 1.1 2006/03/27 10:28:07 george Exp $
+
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - AdaCore GPL version"
+HOMEPAGE="https://libre2.adacore.com/"
+LICENSE="GPL-2"
+
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${GCCVER}/gcc-core-${GCCVER}.tar.bz2
+	http://www.adaic.org/standards/05rm/RM-05-Html.zip
+	http://dev.gentoo.org/~george/src/${P}-src.tar.bz2
+	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i386.tar.bz2 )
+	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64-r2.tar.bz2 )"
+# ${BOOT_SLOT} and ${GCCVER} are defined in gnatbuild.eclass and depend 
+# only on $PV, so should be safe to use in DEPEND/SRC_URI
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+GNATSOURCE="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	gnatbuild_src_unpack base_unpack
+
+	# prep gcc sources for Ada
+	mv "${GNATSOURCE}/src/ada" "${S}/gcc"
+	cd "${S}"
+	patch -p0 < "${GNATSOURCE}/src/gcc-34.dif"
+
+	gnatbuild_src_unpack common_prep
+
+	# one of the converted gcc->gnatgcc in common_prep needs to stay gcc in
+	# fact in this version
+	sed -i -e 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):' "${S}/gcc/ada/makegpr.adb"
+}
+
+src_install() {
+	gnatbuild_src_install install
+
+	# there is something strange with provided Makefiles, causing an
+	# access violation on gprmake. Have to do funny things..
+	make DESTDIR=${D} bindir="${D}${BINPATH}"  install || die
+	mv "${D}${D}${PREFIX}/${CTARGET}" "${D}${PREFIX}"
+	rm -rf "${D}var"
+
+	gnatbuild_src_install move_libs cleanup prep_env
+
+	# docs have to be fetched from 3rd place, quite messy package
+	dodir /usr/share/doc/${PF}/html
+	dohtml "${WORKDIR}"/*.html
+
+	# misc notes and examples
+	cd ${GNATSOURCE}
+	dodoc COPYING README features-503 features-ada0y known-problems-503a
+	cp -pPR examples/ "${D}/usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+	gnatbuild_pkg_postinst
+
+	einfo
+	einfo "This is an experimental issue of the gnat-gpl compiler, supporting"
+	einfo "some of the new features of Ada2005. You may consider registering with"
+	einfo "AdaCore at https://libre2.adacore.com/."
+	einfo
+	ewarn "Please note!!!"
+	ewarn "gnat-gpl is distributed under the GPL-2 license, without the GMGPL provision!!"
+	einfo "For the GMGPL version you may look at the gnat-gcc compiler."
+	einfo
+}