summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-12-04 11:15:20 +0000
committerPacho Ramos <pacho@gentoo.org>2010-12-04 11:15:20 +0000
commitb532a51bf68723ec190440f08dfe6430ef4b62bb (patch)
treeff4482188af1f8601080728d30c7c64b96d7a6aa /gnome-extra
parentx86 stable wrt bug #347115 (diff)
downloadhistorical-b532a51bf68723ec190440f08dfe6430ef4b62bb.tar.gz
historical-b532a51bf68723ec190440f08dfe6430ef4b62bb.tar.bz2
historical-b532a51bf68723ec190440f08dfe6430ef4b62bb.zip
Version bump with bugfixes and translation updates, removes old DB providers.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/libgda/ChangeLog8
-rw-r--r--gnome-extra/libgda/Manifest11
-rw-r--r--gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch20
-rw-r--r--gnome-extra/libgda/libgda-4.2.2.ebuild121
4 files changed, 155 insertions, 5 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index cb2d7cb12240..99da5660640e 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/libgda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.153 2010/11/01 12:18:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.154 2010/12/04 11:15:20 pacho Exp $
+
+*libgda-4.2.2 (04 Dec 2010)
+
+ 04 Dec 2010; Pacho Ramos <pacho@gentoo.org> +libgda-4.2.2.ebuild,
+ +files/libgda-4.2.2-fix-build-order.patch:
+ Version bump with bugfixes and translation updates, removes old DB providers.
01 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> -libgda-4.1.0.ebuild,
libgda-4.2.0.ebuild:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 4eb9a1953232..dc21f95ae529 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -10,22 +10,25 @@ AUX libgda-4.2.0-fix-build-order.patch 1260 RMD160 45d51d47cc3e7117e80d30f360d6b
AUX libgda-4.2.0-fix-undefined-mdb.patch 878 RMD160 2dec9f85f1d37a2c0d629b2f9fc60f085cd34e2a SHA1 b26bd7b9fb6b9e067eb20e233280b43336bb7505 SHA256 c63ed8660cb96482a1ce36af3524c10a1bc5468a3038c2fc75cbe3cce855688a
AUX libgda-4.2.0-json-libcrypto-automagic.patch 3004 RMD160 6aeb885ea26b920d3e8ce8a43826ac91c1c782f4 SHA1 8804ff4ee4ad830720baadf792382218c2dcc0ba SHA256 127e654e7e6fd71ae62a9a9107d7997a67aa3e1d87234e632e0ba7fbd4e0eeb9
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
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.10.tar.bz2 12944110 RMD160 979abd512ff437eded06d770568ca7d36d7c4e5d SHA1 78f7018734905ba1aa83b4b8add9184eed369fa0 SHA256 2800989489410ba5cc4c0adbd0efd79a539175b17ee19342e737fb11824aad55
DIST libgda-4.1.4.tar.bz2 12217669 RMD160 a2331b9ece709e215a4c8b73d33cc0557142ab32 SHA1 b18c1b7d3114ca370a54bb7bbd6bbb931509a46a SHA256 82866d2d9628f2605f7fd22f12953d2516259401f3d234c208865d7881659235
DIST libgda-4.2.0.tar.bz2 13932542 RMD160 fa284ee1bc98ff81fcd788c77fdd467fab861b63 SHA1 98da33580855525c927afcbdaea83625156ec206 SHA256 2e639957f50719957cea5326b0d95511794322a54f9ef8547d3241f409765441
+DIST libgda-4.2.2.tar.bz2 14091997 RMD160 2604f68f25ee1a44b9b44897a6d06a7d2ede63c1 SHA1 124c00c977b0cfd4a615c925ec79ee0ff97e107f SHA256 7d0bfca2eda3158fb44ff05890aabd79e6e4b357a03574eacf380dc03bcb9d87
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.10.ebuild 3234 RMD160 22e494e6c2fa22a6db3ec7038d5ddc2602427db3 SHA1 6ac697f2d129e77ee56a3a14abc57b233b658dfc SHA256 987f2b3ec9ba413042ac42642d72ba091654bfae78a4fbcfaeefd441460b0914
EBUILD libgda-4.1.4-r1.ebuild 3185 RMD160 b4f8c8bbbaafae5aaef429ecc3aa640cdec082bc SHA1 8b3ef8261229a31d8534f70e8f8dcb5a41b6d2ad SHA256 6035221f5b86efc90849c3df57606086e122db0279161f651df14ae7cd5b938b
EBUILD libgda-4.2.0.ebuild 3978 RMD160 e654e1951a5040732c65955beb8e3dfa2a33928b SHA1 84790a4ecd2642acdf10e2b279366a4c7d41ebde SHA256 c468a2fb596e26308c6fedf89a16d4fecdc4f9adeefa95b33a7a004c09bae7f3
-MISC ChangeLog 22911 RMD160 cb23f85031547a5f9a73fe42d140b458ee8ea47b SHA1 8e93250bdab36f291bb80380ebae13bf5e392d1d SHA256 a147e754d12519be855c02af1cca275c9d5cbb32f1e6436bc963e79de4f2f179
+EBUILD libgda-4.2.2.ebuild 3520 RMD160 4c04ea15e3f84182ae0d45aad71317fad474be7f SHA1 2b064a4b51c9d0a1dcda8abff78e0b2393c2997b SHA256 b3214f64ee533f2bc80d22eada3f91059eccd8ba885d3c7c10bc11350313b7cb
+MISC ChangeLog 23136 RMD160 0b7d621ebe38520a028863e5cdb3b2a094852371 SHA1 90da33e714ef6e73a267d72c029057956e5d09c0 SHA256 105e51c4bb0e13f7640f75aa2b35ab2c3696d6a7ffe27e2ccdeb3f5a2fe3e71a
MISC metadata.xml 723 RMD160 9d9142462b76a2f63fef0aae5234b82bdaa691b5 SHA1 1f1bfff922d1a5ee49ad825212f8b865d30c818a SHA256 e4a93d5cfd3ca132966e5a14daafbbf8c99f944e70e184bfa137a0bb4df676e9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkzOsBgACgkQ1fmVwcYIWAadOwCfTgMrSdPePlba4UzIzCZXTbQ8
-BGoAoM3wip1Fow/5wDnP5pNi95m17Mjw
-=lZp4
+iEYEARECAAYFAkz6Is4ACgkQCaWpQKGI+9RY/ACfQusp20ZDyi4f+V7Fd7woUCrW
+jBcAoIG729UbLmmTJ/RRUSsFoGhu22Ks
+=GDWs
-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
new file mode 100644
index 000000000000..ac310890cdb0
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
@@ -0,0 +1,20 @@
+--- libgda/sqlite/Makefile.am.orig 2010-12-04 11:33:12.000000000 +0100
++++ libgda/sqlite/Makefile.am 2010-12-04 11:34:50.000000000 +0100
+@@ -58,9 +58,9 @@
+ gda-sqlite.h \
+ keywords_hash.h \
+ gda-symbols-util.h \
+- gda-symbols-util.c
+-
+-BUILT_SOURCES = xml_embedded.h keywords_hash.c
++ gda-symbols-util.c \
++ xml_embedded.h \
++ keywords_hash.c
+
+ libgda_sqlite_la_SOURCES = $(sqlitesources)
+ libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
+@@ -86,3 +86,4 @@
+ EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
+
+ CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
++BUILT_SOURCES = xml_embedded.h keywords_hash.c
diff --git a/gnome-extra/libgda/libgda-4.2.2.ebuild b/gnome-extra/libgda/libgda-4.2.2.ebuild
new file mode 100644
index 000000000000..2db515b6a46c
--- /dev/null
+++ b/gnome-extra/libgda/libgda-4.2.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.2.ebuild,v 1.1 2010/12/04 11:15:20 pacho Exp $
+
+EAPI="3"
+
+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
+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"
+
+# FIXME: sqlite is automagic, but maybe it is a hard-dep
+# FIXME: autoconf is a hell of inconsistencies
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2
+ dev-libs/libxslt
+ dev-libs/libunique
+ sys-libs/readline
+ sys-libs/ncurses
+ berkdb? ( sys-libs/db )
+ !bindist? ( firebird? ( dev-db/firebird ) )
+ gtk? (
+ >=x11-libs/gtk+-2.12
+ canvas? ( x11-libs/goocanvas )
+ sourceview? ( x11-libs/gtksourceview:2.0 )
+ graphviz? ( media-gfx/graphviz )
+ )
+ 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 )
+ postgres? ( dev-db/postgresql-base )
+ ssl? ( dev-libs/openssl )
+ >=dev-db/sqlite-3.6.22:3"
+# 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 )"
+
+# 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."
+ ewarn "Disabling for now."
+ G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
+ else
+ G2CONF="${G2CONF}
+ $(use_with canvas goocanvas)
+ $(use_with graphviz)
+ $(use_with sourceview gtksourceview)"
+ fi
+ fi
+
+ G2CONF="${G2CONF}
+ --with-unique
+ --disable-scrollkeeper
+ --disable-static
+ --enable-system-sqlite
+ $(use_with berkdb bdb /usr)
+ $(use_with gnome-keyring)
+ $(use_with gtk ui)
+ $(use_with http libsoup)
+ $(use_enable introspection)
+ $(use_with java java $JAVA_HOME)
+ $(use_with mysql mysql /usr)
+ $(use_with postgres postgres /usr)
+ $(use_enable ssl crypto)
+ --without-mdb"
+# $(use_with mdb mdb /usr)
+
+ if use bindist; then
+ # firebird license is not GPL compatible
+ G2CONF="${G2CONF} --without-firebird"
+ else
+ G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
+ 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}
+ --disable-default-binary"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # 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"
+}