New version: 1.2.3

Package-Manager: portage-2.1_pre4-r1

6 files changed, 127 insertions, 113 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index ad8fa966d5d1..8dd52b2a6144 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.84 2005/11/02 18:18:58 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.85 2006/01/31 05:22:16 leonardop Exp $
+
+*libgda-1.2.3 (31 Jan 2006)
+
+  31 Jan 2006; Leonardo Boshell <leonardop@gentoo.org> +libgda-1.2.3.ebuild:
+  New version. Dropped patches that have been included upstream. Don't call
+  eautoreconf as it's no longer necessary.
 
   02 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
   libgda-1.2.2-r1.ebuild:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index d16792786183..cec9590ff392 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,20 +1,60 @@
-MD5 7f4a03482d7586158c9c6528e322614e ChangeLog 12802
+MD5 6e50105ff5ef6218ef88bc0cbd9298ae ChangeLog 13031
+RMD160 95ac7c361445eaa446681797e8dd0d9dcefef4d0 ChangeLog 13031
+SHA256 65ed4d4026b3237fa1666f087f03e0dda4739e8ed6aa9eb0341a98685422a37c ChangeLog 13031
 MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
-MD5 907142ea1e11bcf5b01f25dfa2fd2b54 files/digest-libgda-1.0.3 66
+RMD160 d555d5b2a4f406b1550d6d8b397dbeb06c84cb84 files/digest-libgda-0.2.96-r2 66
+SHA256 f6bbd94735dd5140d78c7055fdd35b71f4bc79ade9e1d54486f9d8335bc5dc8c files/digest-libgda-0.2.96-r2 66
 MD5 c15d8674b02051d6c9af76a12258ab8b files/digest-libgda-1.0.4 66
+RMD160 cfaf28747302afeb9b458ec7063457100cad8e22 files/digest-libgda-1.0.4 66
+SHA256 48f5a1cefea3b10676acbe0d9ae133cc69579b0c1fff8d0c1c4618410224dbc5 files/digest-libgda-1.0.4 66
 MD5 ef67c275e1a496a0f75f76369994c248 files/digest-libgda-1.2.2-r1 66
+RMD160 0b178e11c309c672a120afb36f6c4866aac66317 files/digest-libgda-1.2.2-r1 66
+SHA256 aa84c5e5b42a9b36925a99199f8072a3e626dfcd66a5db2997b6905c63c77eae files/digest-libgda-1.2.2-r1 66
+MD5 0585ea86d6d935b35b23b5b574db7c87 files/digest-libgda-1.2.3 244
+RMD160 9fc9ec61243574b939d96986ec33522214d63c01 files/digest-libgda-1.2.3 244
+SHA256 f0c3c9e2af594dd3621ac1914aec3c9695204b2d2bf0ce035931fd31cac4c9f2 files/digest-libgda-1.2.3 244
 MD5 552028d2c6006f11a013b81e4e3fc56c files/libgda-0.2.96-gcc3.4.patch 607
+RMD160 ac7d328579e04fcd9e4e057d31bbd86542e73ee7 files/libgda-0.2.96-gcc3.4.patch 607
+SHA256 7610b824c4e22c6f9d2b4441a04a01e41d94f6f663cbd8efe1da3dd86dbd1e30 files/libgda-0.2.96-gcc3.4.patch 607
 MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
+RMD160 ee298fea8438f7a8e30932100c1f80c116dbdbb8 files/libgda-0.2.96-gentoo.patch 3345
+SHA256 487e54652be309b0af41f71466b3e24cacda1b50079eed9b2d615a97debbd166 files/libgda-0.2.96-gentoo.patch 3345
 MD5 89d5a7588e21826826be8ecb11218b94 files/libgda-1.0.2-freetds_fix.patch 1338
+RMD160 62f2dc9b951f8456d5c034e69abc9c3c21b2e46a files/libgda-1.0.2-freetds_fix.patch 1338
+SHA256 22455fe285d8a14ea52671bcaaba3fa1a8f77f3ec5ca55b19a7f05413411df79 files/libgda-1.0.2-freetds_fix.patch 1338
 MD5 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
+RMD160 e53f3e9643b8539f26263c86b20e8891779f5f34 files/libgda-1.0.3-gcc3.4.patch 4236
+SHA256 66bbbc316defc5d4fdb956dc60fe2b77713766310c7d8b7521b7f7000a77e3df files/libgda-1.0.3-gcc3.4.patch 4236
 MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
+RMD160 53981751943f3df42d1f310d35cfc3837698980f files/libgda-1.0.3-gtkdoc_fixes.patch 15598
+SHA256 e8968d8fb4680d67361fd5a617f738426bfaea7bddd92c32472e7b6a9926542c files/libgda-1.0.3-gtkdoc_fixes.patch 15598
 MD5 b87a0e5fdf7e23d29ee4452e694140c4 files/libgda-1.0.4-firebird-provider.patch 1055
+RMD160 64cf3ed4f37a4060da606c3ecb27f38ed9c80cbb files/libgda-1.0.4-firebird-provider.patch 1055
+SHA256 cdf37a75ba776ab4a523b60e862a9fa03f150c1afd2347348653697390be4a2f files/libgda-1.0.4-firebird-provider.patch 1055
 MD5 42fbab3bc532505fcd7e85aafb9c5a41 files/libgda-1.0.4-freetds-0.6x.patch 482
+RMD160 aaf333f6e0559ad3a4df5d8efae777acecd60cb7 files/libgda-1.0.4-freetds-0.6x.patch 482
+SHA256 be352ea4f0a7269ad039bb5118426cc7457cbc8bf137d540232e0eeadb690eef files/libgda-1.0.4-freetds-0.6x.patch 482
 MD5 b8d3b0cae4aa507dd9c6cecee8d30067 files/libgda-1.2-syslog_format_fix.patch 630
+RMD160 14a597939d54abb23ebbf65da4b3119dee7cf23e files/libgda-1.2-syslog_format_fix.patch 630
+SHA256 2119d27d1dfa955c5d95cbc58c02b4c947db15fb819b97ce1b0674b0c0930002 files/libgda-1.2-syslog_format_fix.patch 630
 MD5 b4dee0ec0bc3b4333c572810d035c68f files/libgda-1.2.1-mdb_fix.patch 617
+RMD160 d0834957fedc6875a02b5c4d07ea23151aa48344 files/libgda-1.2.1-mdb_fix.patch 617
+SHA256 d2c35139c43c570685f99c69aff2832f8db930b04c3991c7f0f91d6b0bc1be32 files/libgda-1.2.1-mdb_fix.patch 617
 MD5 c95ffd3e34df767ced0741bb1ba184e2 files/libgda-1.2.2-freetds_fixes.patch 1771
+RMD160 dda830caeb7c609a7a23453ef5f540c1586e3767 files/libgda-1.2.2-freetds_fixes.patch 1771
+SHA256 b69939f99e820918d9631cacaec2eb7b0abaf1bf11bff4d51198906f3c8b27f2 files/libgda-1.2.2-freetds_fixes.patch 1771
 MD5 efe942efcc3bbe2a6ae347a7e6808a57 libgda-0.2.96-r2.ebuild 3487
-MD5 3d8fafea6831dfad58db40dbdef7e9a4 libgda-1.0.3.ebuild 2755
+RMD160 4ffa3eda4b0b7a06e4cfd7f7e14c68ab4894216b libgda-0.2.96-r2.ebuild 3487
+SHA256 5c96615081c4da021f868707c54c651457b59a2a59aa466d20c5a6379ea510db libgda-0.2.96-r2.ebuild 3487
 MD5 eceac9d80b6e54f4091a9a3026c32fec libgda-1.0.4.ebuild 2939
+RMD160 db9db378fdc3dc092b00461a2c2c1da035142212 libgda-1.0.4.ebuild 2939
+SHA256 2617b2d5550cdc257027d516f96869800acd89a825e9fce95e85e6365e9c5bab libgda-1.0.4.ebuild 2939
 MD5 3a955c39d43b49a850a20873b50cccd5 libgda-1.2.2-r1.ebuild 2254
+RMD160 e32f7f96fca843f17fac94600af7a3edce2ceb14 libgda-1.2.2-r1.ebuild 2254
+SHA256 1695724cd483582f547e1da79845a6e9d6020ae4c2f50c5c90a29da177d83b1d libgda-1.2.2-r1.ebuild 2254
+MD5 9fc8d48c5e3e0bd2678c22d9fbac90d2 libgda-1.2.3.ebuild 1995
+RMD160 c07a63d66a702e46b5c8b703d277f0cb084d4db7 libgda-1.2.3.ebuild 1995
+SHA256 947e3e4b65a79797102738f4d1e3bed64bc3a573dadd7899c7aaa00897db3754 libgda-1.2.3.ebuild 1995
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
diff --git a/gnome-extra/libgda/files/digest-libgda-1.0.3 b/gnome-extra/libgda/files/digest-libgda-1.0.3
deleted file mode 100644
index 560d33c3f999..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb571389cd7624f362315d5180298263 libgda-1.0.3.tar.bz2 1087558
diff --git a/gnome-extra/libgda/files/digest-libgda-1.2.3 b/gnome-extra/libgda/files/digest-libgda-1.2.3
new file mode 100644
index 000000000000..adced57e3d8b
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-1.2.3
@@ -0,0 +1,3 @@
+MD5 eb9c31c3102d542de728f5f55674d511 libgda-1.2.3.tar.bz2 1075643
+RMD160 d429dcce511084287cc63a2d1df93f7ca6d9316c libgda-1.2.3.tar.bz2 1075643
+SHA256 17add29bb2d7b57da5874f8a28c1a0af4b6f965ad992fef25002b6c33318f303 libgda-1.2.3.tar.bz2 1075643
diff --git a/gnome-extra/libgda/libgda-1.0.3.ebuild b/gnome-extra/libgda/libgda-1.0.3.ebuild
deleted file mode 100644
index c230be0abf6a..000000000000
--- a/gnome-extra/libgda/libgda-1.0.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.3.ebuild,v 1.13 2005/10/30 15:04:12 leonardop Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
-SLOT="1"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~ia64 amd64"
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libxml2-2.0
-	>=dev-libs/libxslt-1.0.9
-	>=gnome-base/gnome-vfs-2.0
-	dev-libs/popt
-	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 )
-	x86? ( firebird? ( dev-db/firebird ) )
-	freetds? ( >=dev-db/freetds-0.5 )
-	sqlite? ( =dev-db/sqlite-2* )
-	!ia64? ( 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
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
-
-# problems with parallel builds
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix ${S}/doc/Makefile.in
-	cd ${S}
-	# Fix libgda's manual source. See bug #46337.
-	epatch ${FILESDIR}/${P}-gtkdoc_fixes.patch
-
-	# Fix gcc 3.4 compilation.  See bug #49234
-	epatch ${FILESDIR}/${P}-gcc3.4.patch
-}
-
-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"
-
-	# workaround for readline-4.1 profile - disables building of gda-config-tool
-	if has_version "=sys-libs/readline-4.1*"; then
-		export CONFIG_TOOL_HEADERS="wrong"
-	fi
-
-	gnome2_src_compile ${myconf}
-
-	unset CONFIG_TOOL_HEADERS
-
-}
diff --git a/gnome-extra/libgda/libgda-1.2.3.ebuild b/gnome-extra/libgda/libgda-1.2.3.ebuild
new file mode 100644
index 000000000000..a52e1ef4bc36
--- /dev/null
+++ b/gnome-extra/libgda/libgda-1.2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.2.3.ebuild,v 1.1 2006/01/31 05:22:16 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome Database Access Library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2 LGPL-2"
+
+IUSE="berkdb doc firebird freetds ldap mdb mysql oci8 odbc postgres sqlite xbase"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2
+	>=dev-libs/libxml2-2
+	>=dev-libs/libxslt-1.0.9
+	sys-libs/readline
+	sys-libs/ncurses
+	dev-libs/popt
+	berkdb? ( sys-libs/db )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.2.1 )
+	freetds? ( >=dev-db/freetds-0.62 )
+	x86? ( firebird? ( dev-db/firebird ) )
+	xbase? ( dev-db/xbase )
+	sqlite? ( >=dev-db/sqlite-3 )
+	mdb? ( >=app-office/mdbtools-0.5 )
+	ldap? ( >=net-nds/openldap-2.0.25 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	app-text/scrollkeeper
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
+
+# problems with parallel builds
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="$(use_with berkdb bdb /usr)    \
+		$(use_with firebird firebird /usr) \
+		$(use_with freetds tds /usr)       \
+		$(use_with ldap ldap /usr)         \
+		$(use_with mdb mdb /usr)           \
+		$(use_with mysql mysql /usr)       \
+		$(use_with odbc odbc /usr)         \
+		$(use_with postgres postgres /usr) \
+		$(use_with sqlite sqlite /usr)     \
+		$(use_with xbase xbase /usr)"
+
+	use oci8 || G2CONF="${G2CONF} --without-oracle"
+
+	# not in portage
+	G2CONF="${G2CONF} --without-msql --without-sybase --without-ibmdb2"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Fix freetds API problems
+	epatch "${FILESDIR}"/${PN}-1.0.2-freetds_fix.patch
+	# Fix compilation of the mdb provider
+	epatch "${FILESDIR}"/${PN}-1.2.1-mdb_fix.patch
+
+	gnome2_omf_fix doc/Makefile.in
+}