Fixed so that it compiles with GNAT-3.41

6 files changed, 180 insertions, 13 deletions

diff --git a/dev-ada/gtkada/ChangeLog b/dev-ada/gtkada/ChangeLog
index a54cbca4ed90..d3a7b6ff5d5f 100644
--- a/dev-ada/gtkada/ChangeLog
+++ b/dev-ada/gtkada/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ada/gtkada
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/ChangeLog,v 1.9 2004/06/29 14:55:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/ChangeLog,v 1.10 2004/08/02 11:17:17 dholm Exp $
+
+*gtkada-2.2.1-r1 (02 Aug 2004)
+
+  02 Aug 2004; David Holm <dholm@gentoo.org> +files/gtkada-2.2.1-gentoo.patch,
+  +gtkada-2.2.1-r1.ebuild:
+  Fixed so that it compiles with GNAT-3.41.
 
   29 Jun 2004; Aron Griffis <agriffis@gentoo.org> gtkada-2.2.0-r1.ebuild,
   gtkada-2.2.1.ebuild, gtkada-2.2.1_pre20031005.ebuild:
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index af71dcc49874..3d5bbf29b1fb 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,9 +1,10 @@
+MD5 ec33b5470c72b1c8e66989d350f58c3e ChangeLog 1872
 MD5 9fa5ea904a2f93fece0f5166bf0874b2 gtkada-2.2.0-r1.ebuild 2468
-MD5 5cca27b3dcd8d956dcff7a4d14e61801 gtkada-2.2.1_pre20031005.ebuild 2324
 MD5 874d6338e3f00e72c0b3cff0a31898a4 gtkada-2.2.1.ebuild 2472
-MD5 74bbe19a9feddc812bdca3fcd229dc1b ChangeLog 1691
 MD5 406df42dba8304e0bfa98dd1a79452b7 metadata.xml 556
-MD5 3272d807414b7bee90c1c4dc64971103 files/gtkada-2.2.0-gentoo.patch 541
-MD5 67a1b0d6cd1202e37a89427fbdecb948 files/digest-gtkada-2.2.1 62
+MD5 da754101a0ea8a2b3c40d32de6b776f4 gtkada-2.2.1-r1.ebuild 2463
 MD5 27c6dd96e1ff25f77f4f3a50b4961a24 files/digest-gtkada-2.2.0-r1 62
-MD5 f6dd28048026dfc33cdadfa70e75217e files/digest-gtkada-2.2.1_pre20031005 78
+MD5 67a1b0d6cd1202e37a89427fbdecb948 files/digest-gtkada-2.2.1 62
+MD5 3272d807414b7bee90c1c4dc64971103 files/gtkada-2.2.0-gentoo.patch 541
+MD5 19a7546682940bfcc7e516a523963a1a files/gtkada-2.2.1-gentoo.patch 5568
+MD5 67a1b0d6cd1202e37a89427fbdecb948 files/digest-gtkada-2.2.1-r1 62
diff --git a/dev-ada/gtkada/files/digest-gtkada-2.2.1-r1 b/dev-ada/gtkada/files/digest-gtkada-2.2.1-r1
new file mode 100644
index 000000000000..092d5b7107f4
--- /dev/null
+++ b/dev-ada/gtkada/files/digest-gtkada-2.2.1-r1
@@ -0,0 +1 @@
+MD5 2c22a6de79bfc948a1e2c4a6f73ab5c0 GtkAda-2.2.1.tgz 3183988
diff --git a/dev-ada/gtkada/files/digest-gtkada-2.2.1_pre20031005 b/dev-ada/gtkada/files/digest-gtkada-2.2.1_pre20031005
deleted file mode 100644
index c4ab274da0e6..000000000000
--- a/dev-ada/gtkada/files/digest-gtkada-2.2.1_pre20031005
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d638b5531e716698423f2098c447ebd gtkada-2.2.1_pre20031005.tar.bz2 1435418
diff --git a/dev-ada/gtkada/files/gtkada-2.2.1-gentoo.patch b/dev-ada/gtkada/files/gtkada-2.2.1-gentoo.patch
new file mode 100644
index 000000000000..7a926d93abd3
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-2.2.1-gentoo.patch
@@ -0,0 +1,152 @@
+diff -Naur GtkAda-2.2.1.orig/src/gtk-extra-combo_box.adb GtkAda-2.2.1/src/gtk-extra-combo_box.adb
+--- GtkAda-2.2.1.orig/src/gtk-extra-combo_box.adb	2004-08-02 10:45:17.027334488 +0200
++++ GtkAda-2.2.1/src/gtk-extra-combo_box.adb	2004-08-02 10:46:14.512595400 +0200
+@@ -66,52 +66,4 @@
+       Internal (Get_Object (Combobox));
+    end Hide_Popdown_Window;
+ 
+-   ----------------
+-   -- Get_Button --
+-   ----------------
+-
+-   function Get_Button (Combobox : access Gtk_Combo_Box_Record)
+-                       return Gtk.Button.Gtk_Button
+-   is
+-      function Internal (Combobox : System.Address)
+-                        return System.Address;
+-      pragma Import (C, Internal, "ada_gtk_combo_box_get_button");
+-      Stub : Gtk.Button.Gtk_Button_Record;
+-   begin
+-      return Gtk.Button.Gtk_Button
+-        (Get_User_Data (Internal (Get_Object (Combobox)), Stub));
+-   end Get_Button;
+-
+-   ---------------
+-   -- Get_Arrow --
+-   ---------------
+-
+-   function Get_Arrow (Combobox : access Gtk_Combo_Box_Record)
+-                      return Gtk.Arrow.Gtk_Arrow
+-   is
+-      function Internal (Combobox : System.Address)
+-                        return System.Address;
+-      pragma Import (C, Internal, "ada_gtk_combo_box_get_arrow");
+-      Stub : Gtk.Arrow.Gtk_Arrow_Record;
+-   begin
+-      return Gtk.Arrow.Gtk_Arrow
+-        (Get_User_Data (Internal (Get_Object (Combobox)), Stub));
+-   end Get_Arrow;
+-
+-   ---------------
+-   -- Get_Frame --
+-   ---------------
+-
+-   function Get_Frame (Combobox : access Gtk_Combo_Box_Record)
+-                      return Gtk.Frame.Gtk_Frame
+-   is
+-      function Internal (Combobox : System.Address)
+-                        return System.Address;
+-      pragma Import (C, Internal, "ada_gtk_combo_box_get_frame");
+-      Stub : Gtk.Frame.Gtk_Frame_Record;
+-   begin
+-      return Gtk.Frame.Gtk_Frame
+-        (Get_User_Data (Internal (Get_Object (Combobox)), Stub));
+-   end Get_Frame;
+-
+ end Gtk.Extra.Combo_Box;
+diff -Naur GtkAda-2.2.1.orig/src/gtk-extra-combo_box.ads GtkAda-2.2.1/src/gtk-extra-combo_box.ads
+--- GtkAda-2.2.1.orig/src/gtk-extra-combo_box.ads	2004-08-02 10:45:17.028334336 +0200
++++ GtkAda-2.2.1/src/gtk-extra-combo_box.ads	2004-08-02 10:46:40.092706632 +0200
+@@ -62,20 +62,6 @@
+    --  Hide the popup window, release the mouse grabs, and restore the
+    --  default aspect for the arrow.
+ 
+-   function Get_Button (Combobox : access Gtk_Combo_Box_Record)
+-                       return Gtk.Button.Gtk_Button;
+-   --  Return the button that shows the value of the combo.
+-
+-   function Get_Arrow (Combobox : access Gtk_Combo_Box_Record)
+-                      return Gtk.Arrow.Gtk_Arrow;
+-   --  Return the arrow button.
+-   --  The user has to click on it to open the popup window.
+-
+-   function Get_Frame (Combobox : access Gtk_Combo_Box_Record)
+-                      return Gtk.Frame.Gtk_Frame;
+-   --  The frame displayed in the popup window.
+-   --  You should add whatever value the popup window should display in it.
+-
+    -------------
+    -- Signals --
+    -------------
+diff -Naur GtkAda-2.2.1.orig/src/gtkada-config.in GtkAda-2.2.1/src/gtkada-config.in
+--- GtkAda-2.2.1.orig/src/gtkada-config.in	2004-08-02 10:45:17.503262136 +0200
++++ GtkAda-2.2.1/src/gtkada-config.in	2004-08-02 10:48:26.000000000 +0200
+@@ -4,8 +4,8 @@
+ prefix=@prefix@
+ 
+ gtk_libs="@GTK_LIBS@"
+-gtkada_libs="-L$prefix/include/gtkada -L$prefix/lib"
+-gtkada_cflags="-I$prefix/include/gtkada"
++gtkada_libs="-L$prefix/lib/ada/adalib/gtkada -L$prefix/lib"
++gtkada_cflags="-I$prefix/lib/ada/adainclude/gtkada"
+ gtkada_lflags="-lgtkada"
+ 
+ usage()
+diff -Naur GtkAda-2.2.1.orig/src/misc_extra.c GtkAda-2.2.1/src/misc_extra.c
+--- GtkAda-2.2.1.orig/src/misc_extra.c	2004-08-02 10:45:17.000000000 +0200
++++ GtkAda-2.2.1/src/misc_extra.c	2004-08-02 10:45:30.899225640 +0200
+@@ -156,27 +156,6 @@
+ 
+ /********************************************************************
+  **
+- **  Gtk_Combo_Box widget
+- **
+- ********************************************************************/
+-
+-GtkWidget*
+-ada_gtk_combo_box_get_button (GtkComboBox* combo) {
+-  return combo->button;
+-}
+-
+-GtkWidget*
+-ada_gtk_combo_box_get_arrow (GtkComboBox* combo) {
+-  return combo->arrow;
+-}
+-
+-GtkWidget*
+-ada_gtk_combo_box_get_frame (GtkComboBox* combo) {
+-  return combo->frame;
+-}
+-
+-/********************************************************************
+- **
+  **  Gtk_Color_Combo widget
+  **
+  ********************************************************************/
+diff -Naur GtkAda-2.2.1.orig/testgtk/create_sheet.adb GtkAda-2.2.1/testgtk/create_sheet.adb
+--- GtkAda-2.2.1.orig/testgtk/create_sheet.adb	2004-08-02 10:45:17.634242224 +0200
++++ GtkAda-2.2.1/testgtk/create_sheet.adb	2004-08-02 11:29:58.335713656 +0200
+@@ -1362,7 +1362,6 @@
+ 
+       Gtk_New (Border_Combo);
+       Append_Widget (Toolbar, Border_Combo, "border", "border");
+-      Set_Usize (Get_Button (Border_Combo), 32, 32);
+       Widget_Handler.Connect
+         (Border_Combo, "changed",
+          Widget_Handler.To_Marshaller (Change_Border'Access));
+@@ -1478,7 +1477,6 @@
+                          Gdk.Color.Null_Color,
+                          Paint);
+       Gtk_New (Bg_Pixmap, Pixmap, Mask);
+-      Add (Get_Button (Bg_Color_Combo), Bg_Pixmap);
+ 
+       Create_From_Xpm_D (Pixmap,
+                          Gdk.Window.Null_Window,
+@@ -1487,7 +1485,6 @@
+                          Gdk.Color.Null_Color,
+                          Font);
+       Gtk_New (Fg_Pixmap, Pixmap, Mask);
+-      Add (Get_Button (Fg_Color_Combo), Fg_Pixmap);
+ 
+       Show_All (Frame);
+    end Run;
diff --git a/dev-ada/gtkada/gtkada-2.2.1_pre20031005.ebuild b/dev-ada/gtkada/gtkada-2.2.1-r1.ebuild
index 22c419847ccc..cdaea5408bab 100644
--- a/dev-ada/gtkada/gtkada-2.2.1_pre20031005.ebuild
+++ b/dev-ada/gtkada/gtkada-2.2.1-r1.ebuild
@@ -1,23 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.1_pre20031005.ebuild,v 1.4 2004/06/29 14:55:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.1-r1.ebuild,v 1.1 2004/08/02 11:17:17 dholm Exp $
 
-inherit gnat
+inherit gnat eutils
 
+Name="GtkAda"
 DESCRIPTION="Gtk+ bindings to the Ada language"
 HOMEPAGE="http://libre.act-europe.fr/GtkAda"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://libre.act-europe.fr/${Name}/${Name}-${PV}.tgz"
 
 LICENSE="GMGPL"
 SLOT="1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="nls opengl"
 
-DEPEND=">=dev-lang/gnat-3.14p
+DEPEND=">=dev-lang/gnat-3.4
 	>=x11-libs/gtk+-2.2.0
 	>=sys-apps/sed-4"
 RDEPEND=""
 
+S="${WORKDIR}/${Name}-${PV}"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
 src_compile() {
 	local myconf
 	myconf=""
@@ -45,8 +53,8 @@ src_install() {
 	dosym /usr/lib/ada/adalib/gtkada/libgtkada_glade-2.2.so.1 /usr/lib
 	dosym /usr/lib/ada/adalib/gtkada/libgtkada_gl-2.2.so.1 /usr/lib
 	dosym /usr/lib/ada/adalib/gtkada/libgnomeada-2.2.so.1 /usr/lib
-	dosym /usr/lib/ada/adalib/gtkada/libgtkada_glade.so /usr/lib
 	dosym /usr/lib/ada/adalib/gtkada/libgtkada-2.2.so.1 /usr/lib
+	dosym /usr/lib/ada/adalib/gtkada/libgtkada_glade.so /usr/lib
 	dosym /usr/lib/ada/adalib/gtkada/libgtkada_gl.so /usr/lib
 	dosym /usr/lib/ada/adalib/gtkada/libgnomeada.so /usr/lib
 	dosym /usr/lib/ada/adalib/gtkada/libgtkada.so /usr/lib