adjusted patch to make asis build with gnat-3.4x series

(Portage version: 2.0.51.22-r3)

4 files changed, 35 insertions, 23 deletions

diff --git a/dev-ada/asis/ChangeLog b/dev-ada/asis/ChangeLog
index 90f76f6db2f3..25e288ac293b 100644
--- a/dev-ada/asis/ChangeLog
+++ b/dev-ada/asis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ada/asis
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/ChangeLog,v 1.10 2005/05/01 18:21:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/ChangeLog,v 1.11 2005/12/15 12:23:29 george Exp $
+
+  15 Dec 2005; George Shapovalov <george@gentoo.org> asis-3.15p.ebuild:
+  adjusted the patch to make asis build with gnat-3.4x series 
+  (based on gcc-3.4.x, so does stricter checks)
+  also eliminated unnecessary cd ${S} at the end of src_compile
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> asis-3.15p.ebuild:
   Stable on ppc.
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index c9a5a4bef07c..77eb3ec63e29 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,5 +1,5 @@
-MD5 fd7e5cf25ef3dec8ef610126f059f680 metadata.xml 598
+MD5 abbfe38c467adc159a5fb74b9e8f69e1 asis-3.15p.ebuild 2971
 MD5 8b098f12b73fdb0bc32515c0a4908e84 ChangeLog 1259
-MD5 855219e0624d147e6705251bfa2276db asis-3.15p.ebuild 2982
-MD5 69d5c644b8ab42132401a32d66174a32 files/asis-3.15p.diff 1558
+MD5 fd7e5cf25ef3dec8ef610126f059f680 metadata.xml 598
 MD5 0d239a4e8d4fd1134f91a1f28f0bdd47 files/digest-asis-3.15p 64
+MD5 9abbfc8704fca570dddb622f6a85037f files/asis-3.15p.diff 1743
diff --git a/dev-ada/asis/asis-3.15p.ebuild b/dev-ada/asis/asis-3.15p.ebuild
index dea053588c49..6e449d8568b1 100644
--- a/dev-ada/asis/asis-3.15p.ebuild
+++ b/dev-ada/asis/asis-3.15p.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.15p.ebuild,v 1.13 2005/05/01 18:21:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.15p.ebuild,v 1.14 2005/12/15 12:23:29 george Exp $
 
 inherit gnat eutils
 
@@ -37,7 +37,6 @@ src_compile() {
 	${ADAMAKE} gnatelim-driver -o gnatelim ${MAKEFLAGS}
 	cd "${S}/tools/gnatstub"
 	${ADAMAKE} gnatstub-driver -o gnatstub ${MAKEFLAGS}
-	cd "${S}"
 }
 
 src_install () {
diff --git a/dev-ada/asis/files/asis-3.15p.diff b/dev-ada/asis/files/asis-3.15p.diff
index ad0c9f656f4f..791380c9581e 100644
--- a/dev-ada/asis/files/asis-3.15p.diff
+++ b/dev-ada/asis/files/asis-3.15p.diff
@@ -1,18 +1,6 @@
-diff -Naur asis-3.15p-src.orig/asis/a4g-gnat_int.ads asis-3.15p-src/asis/a4g-gnat_int.ads
---- asis-3.15p-src.orig/asis/a4g-gnat_int.ads	2002-10-24 10:13:16.000000000 +0200
-+++ asis-3.15p-src/asis/a4g-gnat_int.ads	2003-06-09 22:34:06.000000000 +0200
-@@ -69,7 +69,7 @@
-    -- Compiler Variables & Routines --
-    -----------------------------------
- 
--   Gcc      : constant String := "gcc";
-+   Gcc      : constant String := "gnatgcc";
- 
-    Nul_Argument_List : constant Argument_List (1 .. 0) := (others => null);
- 
-diff -Naur asis-3.15p-src.orig/Makefile.stub asis-3.15p-src/Makefile.stub
+diff -ru asis-3.15p-src.orig/Makefile.stub asis-3.15p-src/Makefile.stub
 --- asis-3.15p-src.orig/Makefile.stub	2002-10-24 10:13:16.000000000 +0200
-+++ asis-3.15p-src/Makefile.stub	2003-06-09 22:34:06.000000000 +0200
++++ asis-3.15p-src/Makefile.stub	2005-12-15 12:11:19.785794750 +0100
 @@ -1,8 +1,8 @@
  #host system
 -host := $(shell gcc -dumpmachine)
@@ -24,15 +12,35 @@ diff -Naur asis-3.15p-src.orig/Makefile.stub asis-3.15p-src/Makefile.stub
  
  # Asis specific directories
  GNAT_DIR=../gnat
-@@ -55,4 +55,4 @@
+@@ -48,11 +48,11 @@
+ 
+ #  GNAT specific flags
+ ADA_FLAGS_FOR_TOOLS= -gnaty -gnatwu -gnatwe
+-ADA_FLAGS_FOR_ASISLIB= -gnatg -gnatwu -gnatwe
++ADA_FLAGS_FOR_ASISLIB= -gnatwu
+ 
+ # GNATMAKE specific flags
+ GMFLAGS=
  
  # GCC backend specific flags
  CFLAGS= -O2 -g
 -CC=gcc
 +CC=gnatgcc
-diff -Naur asis-3.15p-src.orig/obj/Makefile asis-3.15p-src/obj/Makefile
+diff -ru asis-3.15p-src.orig/asis/a4g-gnat_int.ads asis-3.15p-src/asis/a4g-gnat_int.ads
+--- asis-3.15p-src.orig/asis/a4g-gnat_int.ads	2002-10-24 10:13:16.000000000 +0200
++++ asis-3.15p-src/asis/a4g-gnat_int.ads	2005-12-15 12:11:02.952742750 +0100
+@@ -69,7 +69,7 @@
+    -- Compiler Variables & Routines --
+    -----------------------------------
+ 
+-   Gcc      : constant String := "gcc";
++   Gcc      : constant String := "gnatgcc";
+ 
+    Nul_Argument_List : constant Argument_List (1 .. 0) := (others => null);
+ 
+diff -ru asis-3.15p-src.orig/obj/Makefile asis-3.15p-src/obj/Makefile
 --- asis-3.15p-src.orig/obj/Makefile	2002-10-24 10:13:17.000000000 +0200
-+++ asis-3.15p-src/obj/Makefile	2003-06-09 22:36:00.000000000 +0200
++++ asis-3.15p-src/obj/Makefile	2005-12-15 12:11:02.956743000 +0100
 @@ -1,8 +1,7 @@
  include ../Makefile.stub
 -IDIR=$(INSTALL_DIR)/asis