Added 2.2.0-r1 to stable on x86. Added 2.2.1 snapshot build.

6 files changed, 33 insertions, 23 deletions

diff --git a/dev-ada/gtkada/ChangeLog b/dev-ada/gtkada/ChangeLog
index c717ff7ee3be..36404e80d2aa 100644
--- a/dev-ada/gtkada/ChangeLog
+++ b/dev-ada/gtkada/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ada/gtkada
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/ChangeLog,v 1.4 2003/10/05 22:05:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/ChangeLog,v 1.5 2003/10/06 00:29:19 dholm Exp $
+
+*gtkada-2.2.1_pre20031005 (06 Oct 2003)
+
+  06 Oct 2003; David Holm <dholm@gentoo.org> gtkada-2.2.0-r1.ebuild,
+  gtkada-2.2.0.ebuild, gtkada-2.2.1_pre20031005.ebuild:
+  Added 2.2.0-r1 to stable on x86. Added a snapshot of the coming GtkAda-2.2.1.
 
   06 Oct 2003; David Holm <dholm@gentoo.org> gtkada-2.2.0-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index c56966466a4a..cbcaba2fc7cb 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,7 @@
-MD5 57b1a00f7c636ec805c2e238ef4a43cf ChangeLog 1267
-MD5 df6fe0fb6da9e107ae77edea3faadbf9 gtkada-2.2.0-r1.ebuild 1898
+MD5 8a58ac19c43a8aefbec53f05e15b3b6c ChangeLog 1267
+MD5 abd9cf38f887aea97595ac7bd6eee2b3 gtkada-2.2.0-r1.ebuild 1898
 MD5 406df42dba8304e0bfa98dd1a79452b7 metadata.xml 556
-MD5 e90ab4cdce0bc82551c9ba42b28a77fd gtkada-2.2.1_pre20031005.ebuild 1788
+MD5 3c8d5d924a792281a778b7199fed3432 gtkada-2.2.1_pre20031005.ebuild 1797
 MD5 f6dd28048026dfc33cdadfa70e75217e files/digest-gtkada-2.2.1_pre20031005 78
 MD5 27c6dd96e1ff25f77f4f3a50b4961a24 files/digest-gtkada-2.2.0-r1 62
 MD5 3272d807414b7bee90c1c4dc64971103 files/gtkada-2.2.0-gentoo.patch 541
diff --git a/dev-ada/gtkada/files/digest-gtkada-2.2.0 b/dev-ada/gtkada/files/digest-gtkada-2.2.0
deleted file mode 100644
index 3d84836a3479..000000000000
--- a/dev-ada/gtkada/files/digest-gtkada-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e409953a080e677f78518a61aacced25 GtkAda-2.2.0.tgz 3186068
diff --git a/dev-ada/gtkada/files/digest-gtkada-2.2.1_pre20031005 b/dev-ada/gtkada/files/digest-gtkada-2.2.1_pre20031005
new file mode 100644
index 000000000000..c4ab274da0e6
--- /dev/null
+++ b/dev-ada/gtkada/files/digest-gtkada-2.2.1_pre20031005
@@ -0,0 +1 @@
+MD5 0d638b5531e716698423f2098c447ebd gtkada-2.2.1_pre20031005.tar.bz2 1435418
diff --git a/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild b/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild
index 5ceb501928b0..49c308ca9ec8 100644
--- a/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild,v 1.2 2003/10/05 22:05:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild,v 1.3 2003/10/06 00:29:20 dholm Exp $
+
+inherit gnat
 
 Name="GtkAda"
 DESCRIPTION="Gtk+ bindings to the Ada language"
@@ -9,7 +11,7 @@ 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
@@ -18,8 +20,6 @@ RDEPEND=""
 
 S="${WORKDIR}/${Name}-${PV}"
 
-inherit gnat
-
 src_compile() {
 	local myconf
 	myconf=""
diff --git a/dev-ada/gtkada/gtkada-2.2.0.ebuild b/dev-ada/gtkada/gtkada-2.2.1_pre20031005.ebuild
index 173a4037e582..6162e8b512a2 100644
--- a/dev-ada/gtkada/gtkada-2.2.0.ebuild
+++ b/dev-ada/gtkada/gtkada-2.2.1_pre20031005.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.0.ebuild,v 1.1 2003/07/14 23:13:21 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.1_pre20031005.ebuild,v 1.1 2003/10/06 00:29:20 dholm Exp $
+
+inherit gnat
 
-Name="GtkAda"
 DESCRIPTION="Gtk+ bindings to the Ada language"
 HOMEPAGE="http://libre.act-europe.fr/GtkAda"
-SRC_URI="http://libre.act-europe.fr/${Name}/${Name}-${PV}.tgz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GMGPL"
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="nls opengl"
 
 DEPEND="dev-lang/gnat
 	>=x11-libs/gtk+-2.2.0"
 RDEPEND=""
 
-S="${WORKDIR}/${Name}-${PV}"
-
-inherit gnat
-
 src_compile() {
 	local myconf
 	myconf=""
@@ -27,13 +24,11 @@ src_compile() {
 	use nls    || myconf="${myconf} --disable-nls"
 	use opengl && myconf="${myconf} --with-GL=auto"
 
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
+	sed -i -e "s|-I\$prefix/include|-I/usr/lib/ada/adainclude|" \
+		src/gtkada-config.in
+	sed -i -e "s|-L\$prefix/include|-L/usr/lib/ada/adalib|" \
+		src/gtkada-config.in
 
-#	./configure \
-#		--host=${CHOST} \
-#		--prefix=/usr \
-#		--infodir=/usr/share/info \
-#		--mandir=/usr/share/man \
 	econf ${myconf} || die "./configure failed"
 
 	make GNATFLAGS="${ADACFLAGS}" || die
@@ -46,6 +41,15 @@ src_install() {
 		alidir=${D}/usr/lib/ada/adalib/gtkada install \
 		|| die
 
+	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_gl.so /usr/lib
+	dosym /usr/lib/ada/adalib/gtkada/libgnomeada.so /usr/lib
+	dosym /usr/lib/ada/adalib/gtkada/libgtkada.so /usr/lib
+
 	#arrange docs properly
 	dodoc ANNOUNCE AUTHORS COPYING README
 	cd ${D}/usr