Moved to stable on x86

8 files changed, 21 insertions, 72 deletions

diff --git a/dev-ada/asis/ChangeLog b/dev-ada/asis/ChangeLog
index 7abaeef9e1a6..c7713a14b5cd 100644
--- a/dev-ada/asis/ChangeLog
+++ b/dev-ada/asis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ada/asis
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/ChangeLog,v 1.3 2003/09/18 22:11:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/ChangeLog,v 1.4 2003/10/06 00:20:58 dholm Exp $
+
+  06 Oct 2003; David Holm <dholm@gentoo.org> asis-3.15p.ebuild:
+  Moved to stable on x86.
 
   19 Sep 2003; David Holm <dholm@gentoo.org> asis-3.15p.ebuild:
   Added to ~ppc.
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index ac614c86d1f8..c6d6b8a72cbd 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,5 +1,5 @@
-MD5 51a7b0abbdb5f9406277ee70f5d0090a ChangeLog 785
-MD5 497c5e5bceddfd4e60e5ef5eac388027 asis-3.15p.ebuild 2497
+MD5 f6f46d09d0ef5bb44aa99bf0faaaccd5 ChangeLog 876
+MD5 40230efdf4d5e01258c00a3bbba12e61 asis-3.15p.ebuild 2496
 MD5 fd7e5cf25ef3dec8ef610126f059f680 metadata.xml 598
 MD5 69d5c644b8ab42132401a32d66174a32 files/asis-3.15p.diff 1558
 MD5 0d239a4e8d4fd1134f91a1f28f0bdd47 files/digest-asis-3.15p 64
diff --git a/dev-ada/asis/asis-3.15p.ebuild b/dev-ada/asis/asis-3.15p.ebuild
index 72532d974262..26a4c7115f74 100644
--- a/dev-ada/asis/asis-3.15p.ebuild
+++ b/dev-ada/asis/asis-3.15p.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.3 2003/09/18 22:11:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.15p.ebuild,v 1.4 2003/10/06 00:20:58 dholm Exp $
 
 inherit gnat
 
@@ -13,7 +13,7 @@ LICENSE="GMGPL"
 DEPEND="dev-lang/gnat"
 RDEPEND=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 src_unpack() {
diff --git a/dev-ada/garlic/ChangeLog b/dev-ada/garlic/ChangeLog
index 434446b11e1c..5d7c880933ec 100644
--- a/dev-ada/garlic/ChangeLog
+++ b/dev-ada/garlic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ada/garlic
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/garlic/ChangeLog,v 1.2 2003/08/17 21:18:55 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/garlic/ChangeLog,v 1.3 2003/10/06 00:23:44 dholm Exp $
+
+*garlic-3.15p-r1 (06 Oct 2003)
+
+  06 Oct 2003; David Holm <dholm@gentoo.org> garlic-3.15p-r1.ebuild,
+  garlic-3.15p.ebuild:
+  Moved to stable on x86.
 
   17 Aug 2003; David Holm <dholm@gentoo.org> metadata.xml:
   Added <longdescription> to metadata.xml.
diff --git a/dev-ada/garlic/Manifest b/dev-ada/garlic/Manifest
index 6d3e06ec2734..7034aa0f85ae 100644
--- a/dev-ada/garlic/Manifest
+++ b/dev-ada/garlic/Manifest
@@ -1,6 +1,4 @@
-MD5 a4a02621358ebb5a90de180447bf5f7e ChangeLog 591
+MD5 816f288b815cdea6d99ac3d645ef9494 ChangeLog 742
 MD5 9d359eac0028d3eab4c11ab7ad9071ba metadata.xml 505
-MD5 753b2dbe7c18756cda7c95c185d1f47f garlic-3.15p-r1.ebuild 1799
-MD5 37d25e0661c9e22be4ee49dbb61a4f6c garlic-3.15p.ebuild 1612
-MD5 c3d08801b20b2340914aaf73923b6762 files/digest-garlic-3.15p 65
+MD5 a52bbae6d6a1956b11509bd54355e889 garlic-3.15p-r1.ebuild 1798
 MD5 c3d08801b20b2340914aaf73923b6762 files/digest-garlic-3.15p-r1 65
diff --git a/dev-ada/garlic/files/digest-garlic-3.15p b/dev-ada/garlic/files/digest-garlic-3.15p
deleted file mode 100644
index 959a615989f3..000000000000
--- a/dev-ada/garlic/files/digest-garlic-3.15p
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44e478a03eef8d65d597558f826b3128 glade-3.15p-src.tgz 1061859
diff --git a/dev-ada/garlic/garlic-3.15p-r1.ebuild b/dev-ada/garlic/garlic-3.15p-r1.ebuild
index 28f4eaf9df90..b45eef540246 100644
--- a/dev-ada/garlic/garlic-3.15p-r1.ebuild
+++ b/dev-ada/garlic/garlic-3.15p-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/garlic/garlic-3.15p-r1.ebuild,v 1.1 2003/09/18 22:44:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/garlic/garlic-3.15p-r1.ebuild,v 1.2 2003/10/06 00:23:44 dholm Exp $
+
+inherit gnat
 
 S="${WORKDIR}/glade-${PV}-src"
 DESCRIPTION="The GNAT implementation of the ARM Annex for Distributed Systems."
@@ -12,9 +14,7 @@ DEPEND="dev-lang/gnat"
 RDEPEND=""
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
-
-inherit gnat
+KEYWORDS="x86 ~ppc"
 
 src_compile() {
 	local CFLAGS="${ADACFLAGS} -fPIC"
diff --git a/dev-ada/garlic/garlic-3.15p.ebuild b/dev-ada/garlic/garlic-3.15p.ebuild
deleted file mode 100644
index 9a3a6c104537..000000000000
--- a/dev-ada/garlic/garlic-3.15p.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/garlic/garlic-3.15p.ebuild,v 1.3 2003/09/08 07:20:54 msterret Exp $
-
-S="${WORKDIR}/glade-${PV}-src"
-DESCRIPTION="The GNAT implementation of the ARM Annex for Distributed Systems."
-SRC_URI="http://gd.tuwien.ac.at/languages/ada/gnat/3.15p/glade/glade-${PV}-src.tgz"
-
-HOMEPAGE="http://www.gnat.com/"
-LICENSE="GMGPL"
-DEPEND="dev-lang/gnat"
-RDEPEND=""
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-inherit gnat
-
-src_compile() {
-	local CFLAGS="${ADACFLAGS} -fPIC"
-	local ADACFLAGS="${ADACFLAGS} -fPIC"
-
-#	./configure \
-#		--host=${CHOST} \
-#		--prefix=/usr \
-#		--infodir=/usr/share/info \
-#		--mandir=/usr/share/man || die "./configure failed"
-	econf || die "./configure failed"
-	emake || die
-
-	${ADAC} -shared -Wl,-soname,libgarlic-${PV}.so.1 \
-		-o Garlic/libgarlic-${PV}.so.1 Garlic/*.o -lc
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		GARLIC=${D}/usr/lib/ada/adainclude/garlic install || die
-
-	dodoc COPYING INSTALL NEWS README
-
-	insinto /usr/lib/ada/adalib/garlic
-	chmod 0755 Garlic/libgarlic-${PV}.so.1
-	doins Garlic/libgarlic-${PV}.so.1
-	cd ${D}/usr/lib/ada/adalib/garlic/
-	ln -s libgarlic-${PV}.so.1 libgarlic-${PV}.so
-	ln -s libgarlic-${PV}.so libgarlic.so
-	cd ${S}
-
-	# And of course, as usualy make install does not conform to GNAE
-	mv ${D}/usr/lib/ada/adainclude/garlic/*.ali \
-		${D}/usr/lib/ada/adalib/garlic/
-	mv ${D}/usr/lib/ada/adainclude/garlic/lib*.a \
-		${D}/usr/lib/ada/adalib/garlic/
-
-	#install examples
-	cp -r Examples ${D}/usr/share/doc/${PF}/
-}