bumping to x86 stable

7 files changed, 9 insertions, 207 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 3da550ef583d..8a6f8ec232ea 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.20 2003/06/16 09:39:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.21 2003/06/27 10:00:07 liquidx Exp $
+
+  20 Jun 2003; Alastair Tse <liquidx@gentoo.org> libgda-0.11.0.ebuild,
+  libgda-0.12.0.ebuild, libgda-0.12.1.ebuild:
+  marked 0.12.1 as stable x86
 
 *libgda-0.12.1 (16 Jun 2003)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 3da04752dd30..5896ac714bf5 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,12 +1,8 @@
-MD5 764f90376af95e3310e691f2a778512d ChangeLog 3319
+MD5 cf0dca8148b81f1fd9688a7cecfc2ecb ChangeLog 3467
 MD5 5ab82f7dadae03ca71999d11372c5569 libgda-0.2.95-r1.ebuild 3309
-MD5 0706eb893fe1650972a01bf901cbd3ce libgda-0.12.0.ebuild 2425
 MD5 8f9f7b7c7813c4a410bdabf61cb18ddb libgda-0.2.96-r2.ebuild 3513
-MD5 671b9cf742c73f2b54e960d74ae9eee9 libgda-0.12.1.ebuild 2425
-MD5 358ffa5bf7e7cc07a199014c693c9ee1 libgda-0.11.0.ebuild 2514
+MD5 775b162b977d776feafb5fafab81f80f libgda-0.12.1.ebuild 2424
 MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
-MD5 f304a410c4ca5df624d99703eb7b1dfc files/digest-libgda-0.12.0 66
 MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
 MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
 MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
-MD5 4536d2d472e66b26d777dad00e029fb5 files/digest-libgda-0.11.0 206
diff --git a/gnome-extra/libgda/files/digest-libgda-0.11.0 b/gnome-extra/libgda/files/digest-libgda-0.11.0
deleted file mode 100644
index 2acd56a69aff..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.11.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b25e6e812f6a42246239fb79f338c09e /files/libgda-0.2.96-gentoo.patch 3345
-MD5 c0365280ad0baf2c352569690a2aa866 /libgda-0.11.0.ebuild 2509
-MD5 8e50d1082033f413c8e8b700b078194b libgda-0.11.0.tar.bz2 828283
diff --git a/gnome-extra/libgda/files/digest-libgda-0.12.0 b/gnome-extra/libgda/files/digest-libgda-0.12.0
deleted file mode 100644
index 3b68ca614795..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 445b26d782468c11f5cf3a972a710e42 libgda-0.12.0.tar.bz2 896601
diff --git a/gnome-extra/libgda/libgda-0.11.0.ebuild b/gnome-extra/libgda/libgda-0.11.0.ebuild
deleted file mode 100644
index 79d05328ed86..000000000000
--- a/gnome-extra/libgda/libgda-0.11.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.11.0.ebuild,v 1.3 2003/04/22 22:50:55 lu_zero Exp $
-
-IUSE="odbc postgres mysql ldap firebird"
-
-inherit gnome2 gnome.org
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~ppc"
-
-RDEPEND=">=gnome-base/ORBit2-2.3.91
-   >=dev-libs/glib-2.0.4
-   >=gnome-base/bonobo-activation-0.7.0
-   >=gnome-base/libbonobo-2.0.0
-   >=dev-libs/libxml2-2.4.23
-   >=gnome-base/gconf-1.2.0
-   >=dev-libs/libxslt-1.0.9
-   >=gnome-base/gnome-vfs-2.0.0
-   dev-libs/popt
-   sys-libs/readline
-   sys-libs/ncurses
-   mysql? ( >=dev-db/mysql-3.23.51 )
-   postgres? ( >=dev-db/postgresql-7.2.1 )
-   odbc? ( >=dev-db/unixODBC-2.0.6 )
-   ldap? ( net-nds/openldap )
-   firebird? ( >=dev-db/firebird-1.0 )"
-   
-# - libgda needs a version that portage doesn't have yet
-#   freetds? ( >=dev-db/freetds-0.61 )"   
-# - removing un-ratified use flags
-# sqlite? ( >=dev-db/sqlite-2.4.2 )
-
-DEPEND=">=dev-util/pkgconfig-0.8
-   >=dev-util/intltool-0.22
-   ${RDEPEND}"
-
-src_compile() {
-
-	local myconf 
-
-	if [ -n "`use mysql`" ]; then
-		myconf="${myconf} --with-mysql=/usr"
-	else
-		myconf="${myconf} --without-mysql"
-	fi
-
-  	if [ -n "`use postgres`" ]; then
-        myconf="${myconf} --with-postgres=/usr"
-	else
-		myconf="${myconf} --without-postgres"
-  	fi
-
-  	if [ -n "`use odbc`" ]; then
-        myconf="${myconf} --with-odbc=/usr"
-	else
-		myconf="${myconf} --without-odbc"
-  	fi
-
-    if [ -n "`use ldap`" ]; then
-        myconf="${myconf} --with-ldap=/usr"
-    else
-        myconf="${myconf} --without-ldap"
-    fi
-
-    # disabling unratified USE flags    
-	#if [ -n "`use sqlite`" ]; then
-	#	myconf="$myconf --with-sqlite=/usr"
-	#else
-	#	myconf="$myconf --without-sqlite"
-	#fi
-
-	# explicitly disabling freetds until we have a
-	# compatible versions in portage
-    #if [ -n "`use freetds`" ]; then
-	#    myconf="$myconf --with-tds=/usr"
-	#else
-	#    myconf="$myconf --without-tds"
-	#fi
-
-	if [ -n "`use firebird`" ]; then
-		myconf="${myconf} --with-firebird=/usr"
-	else
-		myconf="${myconf} --without-firebird"
-    fi
-
-	myconf="${myconf} --without-tds"
-    myconf="${myconf} --without-sqlite"
-    myconf="${myconf} --without-ibmdb2"
-    myconf="${myconf} --without-sybase"
-    myconf="${myconf} --without-oracle"
-    myconf="${myconf} --without-mdb"
-
-	gnome2_src_compile ${myconf}
-}
diff --git a/gnome-extra/libgda/libgda-0.12.0.ebuild b/gnome-extra/libgda/libgda-0.12.0.ebuild
deleted file mode 100644
index ccbf521e7c08..000000000000
--- a/gnome-extra/libgda/libgda-0.12.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.12.0.ebuild,v 1.2 2003/06/03 16:16:12 liquidx Exp $
-
-IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8"
-
-inherit gnome2 gnome.org
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~ppc"
-
-RDEPEND=">=gnome-base/ORBit2-2.3.91
-	>=dev-libs/glib-2.0.4
-	>=gnome-base/bonobo-activation-0.7.0
-	>=gnome-base/libbonobo-2.0.0
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/gconf-1.2.0 
-	>=dev-libs/libxslt-1.0.9
-	>=gnome-base/gnome-vfs-2.0.0
-	dev-libs/popt
-	sys-libs/readline
-	sys-libs/ncurses
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.2.1 )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	firebird? ( >=dev-db/firebird-1.0 )
-	freetds? ( >=dev-db/freetds-0.5 )
-	sqlite? ( >=dev-db/sqlite-2.4.2 )
-	mdb? ( >=app-office/mdbtools-0.5 )"
-
-DEPEND=">=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.22
-	>=sys-devel/gettext-0.11
-	app-text/scrollkeeper
-	${RDEPEND}"
-	
-# problems with parallel builds	
-MAKEOPTS="${MAKEOPTS} -j1"	
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix ${S}/doc/Makefile.in
-}
-
-src_compile() {
-
-	local myconf 
-
-	use mysql \
-		&& myconf="${myconf} --with-mysql=/usr" \
-		|| myconf="${myconf} --without-mysql"
-
-	use postgres \
-		&& myconf="${myconf} --with-postgres=/usr" \
-		|| myconf="${myconf} --without-postgres"
-
-	use odbc \
-		&& myconf="${myconf} --with-odbc=/usr" \
-		|| myconf="${myconf} --without-odbc"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap=/usr" \
-		|| myconf="${myconf} --without-ldap"
-
-	use sqlite \
-		&& myconf="$myconf --with-sqlite=/usr" \
-		|| myconf="$myconf --without-sqlite"
-
-	use freetds \
-		&& myconf="$myconf --with-tds=/usr" \
-		|| myconf="$myconf --without-tds"
-
-	use firebird \
-		&& myconf="${myconf} --with-firebird=/usr" \
-		|| myconf="${myconf} --without-firebird"
-
-	use mdb \
-		&& myconf="${myconf} --with-mdb=/usr" \
-		|| myconf="${myconf} --without-mdb"
-
-	# not in portage (http://linux.techass.com/projects/xdb/)
-	myconf="${myconf} --without-xbase"
-	myconf="${myconf} --without-msql"
-	
-	# closed source dbs 
-    myconf="${myconf} --without-ibmdb2"
-    myconf="${myconf} --without-sybase"
-	use oci8 || myconf="${myconf} --without-oracle"
-
-	gnome2_src_compile ${myconf}
-}
diff --git a/gnome-extra/libgda/libgda-0.12.1.ebuild b/gnome-extra/libgda/libgda-0.12.1.ebuild
index 411223c6f5cf..2192d555a982 100644
--- a/gnome-extra/libgda/libgda-0.12.1.ebuild
+++ b/gnome-extra/libgda/libgda-0.12.1.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/gnome-extra/libgda/libgda-0.12.1.ebuild,v 1.1 2003/06/16 09:39:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.12.1.ebuild,v 1.2 2003/06/27 10:00:08 liquidx Exp $
 
 IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND=">=gnome-base/ORBit2-2.3.91
 	>=dev-libs/glib-2.0.4