Version bump, remove old.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 55 insertions, 89 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 42b711d9beb2..18c61fd51cf0 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.163 2011/04/04 15:40:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.164 2011/04/20 16:54:11 pacho Exp $
+
+*libgda-4.2.6 (20 Apr 2011)
+
+  20 Apr 2011; Pacho Ramos <pacho@gentoo.org> -libgda-4.1.4-r1.ebuild,
+  -files/libgda-4.1.4-install-header.patch, +libgda-4.2.6.ebuild:
+  Version bump, remove old.
 
 *libgda-4.2.5-r1 (04 Apr 2011)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index bf8bdbb23b4e..9ade1b15b997 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -3,36 +3,25 @@ Hash: SHA1
 
 AUX libgda-1.2.3-mdb_api.patch 1374 RMD160 d7091403baa8b299d815be7e679fb17720d18b29 SHA1 8e36dec7a9844769697df815048f126b47a89792 SHA256 a65143afb029c72db1038f6577e517377263f9d9281eb583e8bbffe9d1a7e499
 AUX libgda-1.2.4-freetds_api_fixes.patch 14119 RMD160 2c2becec232a74eb9e430288b3e78f70e2294f2c SHA1 125e13af1ffbf03d2f503908a67eb7575fe65dc4 SHA256 cf4dfa78d13f79d698532945ba7a26edc2a256a7b1fa3cdc89eec544d18448ea
-AUX libgda-4.1.4-install-header.patch 1762 RMD160 5c97195e574642bedd584e4e89a1d7e53ddea131 SHA1 328867caedb287ef996944c8bb409cce7f6ad0f2 SHA256 9779651e112172e435cc77b8d4afd1578b2050d36baf3772f4c8bd5583467d4b
 AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
 AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1
 AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f
 DIST libgda-1.2.4.tar.bz2 1087076 RMD160 83981076ac408fdd4b89f0cb97cb605d5301fcb2 SHA1 a2fefe602a07ca92cfb066492e33d4d1e4733bfc SHA256 d5e700203764e3f8d9ab3573a9b1b0e218778022c7956cf719fa0500b3027930
 DIST libgda-3.0.4.tar.bz2 2908854 RMD160 6efbf5a0f40277124dcc5464168677cc97be40e3 SHA1 50ba121e05ab1fbe95b66e8df4f54a0c6a30ef23 SHA256 3f9d75e9bc50610bf6033863b79265c7c9c702323b918caf90eb3923f971da48
-DIST libgda-4.1.4.tar.bz2 12217669 RMD160 a2331b9ece709e215a4c8b73d33cc0557142ab32 SHA1 b18c1b7d3114ca370a54bb7bbd6bbb931509a46a SHA256 82866d2d9628f2605f7fd22f12953d2516259401f3d234c208865d7881659235
 DIST libgda-4.2.2.tar.bz2 14091997 RMD160 2604f68f25ee1a44b9b44897a6d06a7d2ede63c1 SHA1 124c00c977b0cfd4a615c925ec79ee0ff97e107f SHA256 7d0bfca2eda3158fb44ff05890aabd79e6e4b357a03574eacf380dc03bcb9d87
 DIST libgda-4.2.5.tar.bz2 15196398 RMD160 e9bd4e33b8b5758a3e88775f18d66375389d51ba SHA1 ffafc1c51b5c27a21e716f71346c70552fa5525b SHA256 b98d6063469a1ba8226d94800732544be629c55132516de741c937e8bf175f13
+DIST libgda-4.2.6.tar.bz2 12632479 RMD160 c534658aea7eb82f6a3a008db846aa8588bc5eba SHA1 37ed6221f7cf162ac6df574d111f248e66d3aa4a SHA256 141259e19ba163500963bd5bd512cfa4eb542b24c99f2fa14a2ef27643308cd3
 EBUILD libgda-1.2.4.ebuild 2283 RMD160 b306c86af14692c872e890531d5bda5eb257d87b SHA1 d34d29c4bbdfbdf1be035e4cbb64bba40d02713f SHA256 a829c7280f55733b294c6ea3bf90c592842a61c0575dc64e66690bb8e0ad8e68
 EBUILD libgda-3.0.4.ebuild 1995 RMD160 e8c0f30a4cc85d69c98ac3162a61c4cdb70cb039 SHA1 5aa1b85875f7aa3b64f7af9c6eaec3dbb00f4653 SHA256 daddd4b35901c0848fcd1f7c7f63193c44e1d9935701f0d49ce71aecc448832b
-EBUILD libgda-4.1.4-r1.ebuild 3200 RMD160 74fee0c39c6414fb5efc1fa319dee3e57febb8b2 SHA1 4bbd60cdd3a46606174856fa9c23df21fe435e99 SHA256 c32a44327691bd7fe68139bee9e0391e603e6fd0a1d5fb3ca2c6a1d96d33fea1
 EBUILD libgda-4.2.2.ebuild 3523 RMD160 3c2d6d860bce908a4899a1e4650423d767757cad SHA1 a029fdb96de02751d8a6751ca542deb90925c835 SHA256 4f0926ae46da5228ab8f6d389c7988acab75ca186fdb887898b202d8d6482bd9
 EBUILD libgda-4.2.5-r1.ebuild 3820 RMD160 469f26e56e718332a7bf6b2d190d1cc59f6c5e11 SHA1 f953f9186089134cb2681cdd1fec6dbae9266a66 SHA256 a004aa40f2a70fde90e59d767a723ae73410b1ff851379aaddb8fea470a009cf
-MISC ChangeLog 24618 RMD160 0e691ba9f548e8360edf46c2f1e04fdd140b5e2d SHA1 a8da40d27bb14d05f0f227de0b958b4b2a03237f SHA256 38f0b6c99798a4c6b5229dc107db1b667b2b4750762f7c80cf70f1c30d2295c7
+EBUILD libgda-4.2.6.ebuild 3778 RMD160 22f4f49ede819242e9612c67db8277ef68b69e41 SHA1 6b8320553e18bbd2ef4dcd1c30f31521374553b2 SHA256 e887532355b912dd3e194da30ebc538cf5a774802dae977996b03b7cd116663c
+MISC ChangeLog 24810 RMD160 14f4a9a217c92a816e7429f3843696c6bc33cdad SHA1 4c7f4e3571706a498fd7a784a88f6d1e0ffa35d0 SHA256 9ba29045437e98924e73111ce0d334d39bb81b024e940798b416ddce805ca384
 MISC metadata.xml 723 RMD160 9d9142462b76a2f63fef0aae5234b82bdaa691b5 SHA1 1f1bfff922d1a5ee49ad825212f8b865d30c818a SHA256 e4a93d5cfd3ca132966e5a14daafbbf8c99f944e70e184bfa137a0bb4df676e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNmeZfAAoJEO/kOhxWD91kbPoP/3cp/m5oQlxipM7GNxGyX34V
-LZJWlk5kq4J+u1sTtJ8ya01gEoQsHJG4hQOa4lSEJbkD8e48B8vu9aq698CTeA2J
-I79x/JEPnt1I/OE2yPWdczq1I/HpNHwQVkqf+YFfMK6gSMyIP+MAXTfk9XiLjluu
-n+PcSbpnx65jcHCinafKrGnuZgo1XuzhSlwRMeJC0sM/WhisVRHtNvkdQaPEoe3K
-fpV1YIURJ7dxJ6G7ZimXWL1XiCb8uRgHBMBz8U8Sbbs1/EPGP8vDVbZjDAhZohYc
-qVU43vXO0C3wHQVdYU2KJWR24bAXdl+y2edVC6Iwasy6KqtSy1MnuhrrFer7jAtJ
-JeiQPB71CBegkwBE8cCDlsrIqd5IERYovySxd1a9cjyMZmmKuTlXznXR2bhA7aos
-ywRi931KdyQ0CaryfhjMfWDthPc0JWiTiL3uayN8lkCreSOGTLWSVHgttuUPqT/p
-0XKGQEEEnAsIhr2KcStP0gegtYylpZNNhn2XhtYgUFzo/ymyCcxKHlgeukAl3Wpz
-2YTQzHyAV10jjRB/iepAlxoYUa2O4Ms6hAYL6uIlfWXzA3hJyTZ5lGrgvJsiPApz
-YLdXERq5vvHmkIvxWNlX4HQyLl1O3Hd/Haa4WJIWjlJ8NCFScfXRNCuWulAB6YAQ
-en/SWouRi8pC+LfqGj8H
-=sje5
+iEYEARECAAYFAk2vD7oACgkQCaWpQKGI+9S+qACdEjnyIwSUfFPiTQaimCB211+l
+HAcAn1Nl9ZIPKI65AyrxpLzX8QUpdwmd
+=6bsW
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch b/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch
deleted file mode 100644
index 269fee3542ba..000000000000
--- a/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 342b5fdef11e4894e975df5563ab24ac66cf899a Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Tue, 19 Jan 2010 20:56:02 +0000
-Subject: Correctly install libgda.h, bug #607357
-
----
-diff --git a/libgda/Makefile.am b/libgda/Makefile.am
-index e3ea991..8da4548 100644
---- a/libgda/Makefile.am
-+++ b/libgda/Makefile.am
-@@ -247,7 +247,7 @@ uninstall-def-files:
- endif
- 
- gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda
--gdainclude_HEADERS=$(libgda_built_headers) $(gda_headers)
-+gdainclude_HEADERS=$(libgda_built_headers) $(gda_headers) libgda.h
- 
- CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
- 	gda-marshal.c \
---
-cgit v0.8.3.1
-
---- a/libgda/Makefile.in	2010-03-31 23:18:30.000000000 +0200
-+++ b/libgda/Makefile.in	2010-03-31 23:18:50.000000000 +0200
-@@ -220,7 +220,7 @@
- 	gda-tree.h gda-tree-mgr-columns.h gda-tree-mgr-schemas.h \
- 	gda-tree-mgr-tables.h gda-tree-node.h gda-tree-manager.h \
- 	gda-tree-mgr-label.h gda-tree-mgr-select.h gda-util.h \
--	gda-value.h gda-xa-transaction.h
-+	gda-value.h gda-xa-transaction.h libgda.h
- HEADERS = $(gdainclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -686,7 +688,7 @@
- 
- @PLATFORM_WIN32_TRUE@libgda_4_0_la_DEPENDENCIES = libgda.def
- gdaincludedir = $(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda
--gdainclude_HEADERS = $(libgda_built_headers) $(gda_headers)
-+gdainclude_HEADERS = $(libgda_built_headers) $(gda_headers) libgda.h
- CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
- 	gda-marshal.c gda-enum-types.h s-enum-types-h gda-enum-types.c \
- 	s-enum-types-c libgda.def libgda-$(GDA_ABI_VERSION).lib \
diff --git a/gnome-extra/libgda/libgda-4.1.4-r1.ebuild b/gnome-extra/libgda/libgda-4.2.6.ebuild
index ca420320367f..e95b0ea801ea 100644
--- a/gnome-extra/libgda/libgda-4.1.4-r1.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.6.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.1.4-r1.ebuild,v 1.9 2011/03/08 05:21:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.6.ebuild,v 1.1 2011/04/20 16:54:11 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2
 
 DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2 LGPL-2"
 
 # MDB support currently works with CVS only, so disable it in the meantime
-# experimental IUSE: introspection
-IUSE="berkdb bindist canvas doc firebird freetds gtk graphviz ldap mysql oci8 odbc postgres sourceview xbase"
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
 SLOT="4"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 # FIXME: sqlite is automagic, but maybe it is a hard-dep
 # FIXME: autoconf is a hell of inconsistencies
@@ -26,36 +26,37 @@ RDEPEND="
 	dev-libs/libunique:1
 	sys-libs/readline
 	sys-libs/ncurses
-	>=net-libs/libsoup-2.24:2.4
 	berkdb?   ( sys-libs/db )
-	freetds?  ( >=dev-db/freetds-0.62 )
 	!bindist? ( firebird? ( dev-db/firebird ) )
 	gtk? (
-		>=x11-libs/gtk+-2.12:2
+		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
 		canvas? ( x11-libs/goocanvas:0 )
 		sourceview? ( x11-libs/gtksourceview:2.0 )
 		graphviz? ( media-gfx/graphviz )
 	)
-	ldap?     ( >=net-nds/openldap-2.0.25 )
+	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
+	json?     ( dev-libs/json-glib )
 	mysql?    ( virtual/mysql )
-	odbc?     ( >=dev-db/unixODBC-2.0.6 )
 	postgres? ( dev-db/postgresql-base )
-	xbase?    ( dev-db/xbase )
+	ssl?      ( dev-libs/openssl )
 	>=dev-db/sqlite-3.6.22:3"
-#   json?     ( dev-libs/json-glib )
 #	mdb?      ( >app-office/mdbtools-0.5 )
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.18
 	>=dev-util/intltool-0.35.5
+	>=app-text/gnome-doc-utils-0.9
+	>=dev-util/gtk-doc-am-1
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 # Tests are not really good
 RESTRICT="test"
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
 	if use canvas || use graphviz || use sourceview; then
 		if ! use gtk; then
 			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
@@ -71,19 +72,20 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		--with-unique
-		--with-libsoup
-		--disable-introspection
+		--disable-scrollkeeper
 		--disable-static
 		--enable-system-sqlite
-		$(use_with gtk ui)
 		$(use_with berkdb bdb /usr)
-		$(use_with odbc odbc /usr)
+		$(use_with gnome-keyring)
+		$(use_with gtk ui)
+		$(use_with http libsoup)
+		$(use_enable introspection)
+		$(use_enable introspection gda-gi)
+		$(use_enable introspection gdaui-gi)
+		$(use_with java java $JAVA_HOME)
 		$(use_with mysql mysql /usr)
 		$(use_with postgres postgres /usr)
-		$(use_with freetds tds /usr)
-		$(use_with xbase xbase /usr)
-		$(use_with ldap ldap /usr)
-		$(use_with java java $JAVA_HOME)
+		$(use_enable ssl crypto)
 		--without-mdb"
 #		$(use_with mdb mdb /usr)
 
@@ -95,23 +97,34 @@ pkg_setup() {
 	fi
 
 	use berkdb && append-cppflags "-I$(db_includedir)"
+	# --disable-json doesn't work, upstream bug #636439
+	use json && G2CONF="${G2CONF} --enable-json"
 	use oci8 || G2CONF="${G2CONF} --without-oracle"
 
 	# Not in portage
 	G2CONF="${G2CONF}
-		--without-msql
-		--without-sybase
-		--without-ibmdb2
 		--disable-default-binary"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix missing header installation, bug #308793
-	epatch "${FILESDIR}/${PN}-4.1.4-install-header.patch"
+	# Fix build order for generated content, upstream #630958
+	epatch "${FILESDIR}/${PN}-4.2.2-fix-build-order.patch"
+
+	# Fix compilation failure of keyword_hash.c, upstream #630959
+	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
 }
 
 src_test() {
-	emake check HOME=$(unset HOME; echo "~") || die "tests failed"
+	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+	# Nothing uses these in the tree
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 }