version bump

12 files changed, 208 insertions, 9 deletions

diff --git a/dev-db/mergeant/ChangeLog b/dev-db/mergeant/ChangeLog
index c174dead0da7..86f359250428 100644
--- a/dev-db/mergeant/ChangeLog
+++ b/dev-db/mergeant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mergeant
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.4 2003/06/03 10:33:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.5 2003/06/16 09:43:23 liquidx Exp $
+
+*mergeant-0.12.1 (16 Jun 2003)
+
+  16 Jun 2003; Alastair Tse <liquidx@gentoo.org> mergeant-0.12.1.ebuild:
+  new gnomedb release
 
 *mergeant-0.12.0 (03 Jun 2003)
 
diff --git a/dev-db/mergeant/Manifest b/dev-db/mergeant/Manifest
index 1c16f259ec46..ab875b843eed 100644
--- a/dev-db/mergeant/Manifest
+++ b/dev-db/mergeant/Manifest
@@ -1,7 +1,7 @@
 MD5 de73768f96b9ee522467979c04fb9454 mergeant-0.12.0.ebuild 1236
-MD5 69daa3620edd4a80e7d1d33b4e57dd4c ChangeLog 750
+MD5 f9ad2dd1d7cc5b3de8c63147011ebfe6 ChangeLog 878
 MD5 42ba8cda84c8d3b4c935a1a2e8342767 mergeant-0.11.0.ebuild 1163
-MD5 de73768f96b9ee522467979c04fb9454 mergeant-0.12.1.ebuild 1236
+MD5 d815836e94cb15855368328bd992706b mergeant-0.12.1.ebuild 1236
 MD5 7acea0628375a86548ecc40dd5f34c35 files/digest-mergeant-0.12.0 69
 MD5 cae37a9c8157e94e07b7826c93ceb9b8 files/digest-mergeant-0.11.0 135
 MD5 40c851ac355e64c4e94e52bbeabf5a2d files/digest-mergeant-0.12.1 69
diff --git a/dev-db/mergeant/files/digest-mergeant-0.12.1 b/dev-db/mergeant/files/digest-mergeant-0.12.1
new file mode 100644
index 000000000000..dee092481cb3
--- /dev/null
+++ b/dev-db/mergeant/files/digest-mergeant-0.12.1
@@ -0,0 +1 @@
+MD5 42a2f6778b81409db6cd1baa49663dca mergeant-0.12.1.tar.bz2 1204581
diff --git a/dev-db/mergeant/mergeant-0.12.1.ebuild b/dev-db/mergeant/mergeant-0.12.1.ebuild
new file mode 100644
index 000000000000..02d53cab6587
--- /dev/null
+++ b/dev-db/mergeant/mergeant-0.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.12.1.ebuild,v 1.1 2003/06/16 09:43:23 liquidx Exp $
+
+IUSE=""
+
+inherit gnome2 gnome.org
+
+DESCRIPTION="Database admin tool using libgnomedb and libgda"
+HOMEPAGE="http://www.gnome-db.org/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~x86"
+
+RDEPEND=">=gnome-extra/libgnomedb-0.12.0
+	>=gnome-extra/libgda-0.12.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/gconf-2.0
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/libxml2-2.5
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=gnome-base/libglade-2.0"
+
+DEPEND=">=dev-util/pkgconfig-0.8
+	>=dev-util/intltool-0.22
+	app-text/scrollkeeper
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	gnome2_omf_fix ${S}/doc/Makefile.in
+}
+
+src_install() {
+    # redefined libdir so plugins don't get installed in /usr/lib
+	gnome2_src_install "libdir=${D}/usr/share/mergeant/plugins" "dtddir=${D}/usr/share/mergeant/dtd/" "Mergeant_Lang_helpdir=${D}/usr/share/doc/mergeant/C" "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "Pixmapdir=${D}/usr/share/pixmaps/mergeant"
+}
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 1df7926d0091..3da550ef583d 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,11 @@
 # 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.19 2003/06/03 10:30:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.20 2003/06/16 09:39:49 liquidx Exp $
+
+*libgda-0.12.1 (16 Jun 2003)
+
+  16 Jun 2003; Alastair Tse <liquidx@gentoo.org> libgda-0.12.1.ebuild:
+  new gnomedb release
 
 *libgda-0.12.0 (03 Jun 2003)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index d2c4d1bd133b..3da04752dd30 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,8 +1,8 @@
-MD5 866e839c7240d81edc7b1067dcc45792 ChangeLog 3195
+MD5 764f90376af95e3310e691f2a778512d ChangeLog 3319
 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 0706eb893fe1650972a01bf901cbd3ce libgda-0.12.1.ebuild 2425
+MD5 671b9cf742c73f2b54e960d74ae9eee9 libgda-0.12.1.ebuild 2425
 MD5 358ffa5bf7e7cc07a199014c693c9ee1 libgda-0.11.0.ebuild 2514
 MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
 MD5 f304a410c4ca5df624d99703eb7b1dfc files/digest-libgda-0.12.0 66
diff --git a/gnome-extra/libgda/files/digest-libgda-0.12.1 b/gnome-extra/libgda/files/digest-libgda-0.12.1
new file mode 100644
index 000000000000..afbe137e9977
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-0.12.1
@@ -0,0 +1 @@
+MD5 d98597ca9746d36db8e455ce7de48ac0 libgda-0.12.1.tar.bz2 902974
diff --git a/gnome-extra/libgda/libgda-0.12.1.ebuild b/gnome-extra/libgda/libgda-0.12.1.ebuild
new file mode 100644
index 000000000000..411223c6f5cf
--- /dev/null
+++ b/gnome-extra/libgda/libgda-0.12.1.ebuild
@@ -0,0 +1,95 @@
+# 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 $
+
+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/libgnomedb/ChangeLog b/gnome-extra/libgnomedb/ChangeLog
index 9f160438279f..9492840354cf 100644
--- a/gnome-extra/libgnomedb/ChangeLog
+++ b/gnome-extra/libgnomedb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgnomedb
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.5 2003/06/03 10:32:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/ChangeLog,v 1.6 2003/06/16 09:42:01 liquidx Exp $
+
+*libgnomedb-0.12.1 (16 Jun 2003)
+
+  16 Jun 2003; Alastair Tse <liquidx@gentoo.org> libgnomedb-0.12.1.ebuild:
+  new gnomedb release. note that i'm not bumping to 0.12.2 because it only
+  has compile fixes for redhat and <gtk+-2.2 
 
 *libgnomedb-0.12.0 (03 Jun 2003)
 
diff --git a/gnome-extra/libgnomedb/Manifest b/gnome-extra/libgnomedb/Manifest
index 09b4ae3d9f75..108491a57220 100644
--- a/gnome-extra/libgnomedb/Manifest
+++ b/gnome-extra/libgnomedb/Manifest
@@ -1,7 +1,7 @@
 MD5 1fbbd43762268be9f6edf1dc90e8ac63 libgnomedb-0.12.0.ebuild 1286
-MD5 0a4f3f3064274ddc51325abcff39a13a ChangeLog 857
+MD5 5df97b7493af72ff8d254a6bb4fc27c6 ChangeLog 1088
 MD5 6961ed582ef339924beb8f248da1b128 libgnomedb-0.11.0.ebuild 1187
-MD5 1fbbd43762268be9f6edf1dc90e8ac63 libgnomedb-0.12.1.ebuild 1286
+MD5 e5934d46f9ed8fcf9616b63e07d0676e libgnomedb-0.12.1.ebuild 1286
 MD5 3c1b10b6d4897bc066955a9de7c7ce6b files/digest-libgnomedb-0.12.0 70
 MD5 e4775dad3ecf0f85975f4e18256b9216 files/digest-libgnomedb-0.11.0 138
 MD5 d48a0cec30d90af0c488dc4dbfc3e1a3 files/digest-libgnomedb-0.12.1 70
diff --git a/gnome-extra/libgnomedb/files/digest-libgnomedb-0.12.1 b/gnome-extra/libgnomedb/files/digest-libgnomedb-0.12.1
new file mode 100644
index 000000000000..849fecafd27f
--- /dev/null
+++ b/gnome-extra/libgnomedb/files/digest-libgnomedb-0.12.1
@@ -0,0 +1 @@
+MD5 78816530d0740016dd1b98effb56c811 libgnomedb-0.12.1.tar.bz2 483140
diff --git a/gnome-extra/libgnomedb/libgnomedb-0.12.1.ebuild b/gnome-extra/libgnomedb/libgnomedb-0.12.1.ebuild
new file mode 100644
index 000000000000..0cbc315fb7f2
--- /dev/null
+++ b/gnome-extra/libgnomedb/libgnomedb-0.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgnomedb/libgnomedb-0.12.1.ebuild,v 1.1 2003/06/16 09:42:01 liquidx Exp $
+
+IUSE=""
+
+inherit gnome2 gnome.org
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Library for writing gnome database programs"
+HOMEPAGE="http://www.gnome-db.org/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~x86 ~ppc"
+
+RDEPEND=">=gnome-extra/libgda-0.12.0
+	>=x11-libs/gtk+-2.0.6
+	>=gnome-base/libglade-2.0.0
+	>=gnome-base/libgnomeui-2.0.0
+	>=gnome-base/bonobo-activation-2.0
+	>=gnome-base/libbonoboui-2.0.0"
+# optionally needs gtksourceview but not in portage
+
+DEPEND=">=dev-util/pkgconfig-0.8
+	>=dev-util/intltool-0.22
+	>=sys-devel/gettext-0.11
+	>=app-text/scrollkeeper-0.3.11
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	gnome2_omf_fix ${S}/doc/Makefile.in
+}
+
+src_install() {
+	gnome2_src_install
+    
+    # minor cosmetic fix to capplet icon
+    capplet_link=${D}/usr/share/control-center-2.0/capplets/database-properties.desktop
+    if [ -f "${capplet_link}" ]; then
+       mv ${capplet_link} ${capplet_link}.orig && \
+         sed 's,Icon=gnome-db.png,Icon=libgnomedb/gnome-db.png,' ${capplet_link}.orig > ${capplet_link}
+       rm ${capplet_link}.orig
+    fi
+}