diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-11-05 08:27:47 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-11-05 08:27:47 +0000 |
commit | 820ae247a6d6808b28fbeb6eb45bacd20afa791b (patch) | |
tree | 55c8da9d87e267316191917d8b13cfe5b7609b02 /gnome-extra/libgda | |
parent | Fix executable stacks in mmx code #440618 by brian h. (diff) | |
download | gentoo-2-820ae247a6d6808b28fbeb6eb45bacd20afa791b.tar.gz gentoo-2-820ae247a6d6808b28fbeb6eb45bacd20afa791b.tar.bz2 gentoo-2-820ae247a6d6808b28fbeb6eb45bacd20afa791b.zip |
Drop useless USE=doc, it only regenerated documentation. Update license. Drop old.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'gnome-extra/libgda')
-rw-r--r-- | gnome-extra/libgda/ChangeLog | 9 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch | 27 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch | 20 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-4.2.11.ebuild | 117 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-4.2.12.ebuild | 115 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-4.2.13.ebuild | 9 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-5.0.3-r1.ebuild | 14 |
7 files changed, 19 insertions, 292 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index d71cffdf58e3..edb0f8bfbf90 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/libgda # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.212 2012/10/28 15:55:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.213 2012/11/05 08:27:47 tetromino Exp $ + + 05 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch, + -files/libgda-4.2.2-fix-build-order.patch, -libgda-4.2.11.ebuild, + -libgda-4.2.12.ebuild, libgda-4.2.13.ebuild, libgda-5.0.3-r1.ebuild: + Drop useless USE=doc, it only regenerated documentation. Update license. Drop + old. 28 Oct 2012; Raúl Porcel <armin76@gentoo.org> libgda-4.2.13.ebuild: ia64/sparc stable wrt #427544 diff --git a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch deleted file mode 100644 index 5e7dd6147287..000000000000 --- a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 29 Sep 2010 23:53:54 +0200 -Subject: [PATCH] Fix missing include in keyword_hash generator - ---- - libgda/sqlite/mkkeywordhash.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c -index dc6ce89..28f4f83 100644 ---- a/libgda/sqlite/mkkeywordhash.c -+++ b/libgda/sqlite/mkkeywordhash.c -@@ -370,6 +370,10 @@ main (int argc, char **argv) - } - - /* Begin generating code */ -+ printf("#include <stdio.h>\n"); -+ printf("#include <string.h>\n"); -+ printf("#include <glib.h>\n"); -+ - printf("/* Hash score: %d */\n", bestCount); - printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : ""); - printf(" /* zText[] encodes %d bytes of keywords in %d bytes */\n", --- -1.7.3 - 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 deleted file mode 100644 index ac310890cdb0..000000000000 --- a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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.11.ebuild b/gnome-extra/libgda/libgda-4.2.11.ebuild deleted file mode 100644 index 9ab19d344603..000000000000 --- a/gnome-extra/libgda/libgda-4.2.11.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.11.ebuild,v 1.7 2012/05/05 06:25:23 jdhore Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit 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" - -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" - -SLOT="4" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" - -RDEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.16:2 - >=dev-libs/libxml2-2:2 - dev-libs/libxslt - dev-libs/libunique:1 - sys-libs/readline - sys-libs/ncurses - >=dev-db/sqlite-3.6.22:3 - berkdb? ( sys-libs/db ) - !bindist? ( firebird? ( dev-db/firebird ) ) - gtk? ( - || ( >=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 ) - ) - gnome-keyring? ( gnome-base/libgnome-keyring ) - http? ( >=net-libs/libsoup-2.24:2.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) - json? ( dev-libs/json-glib ) - ldap? ( net-nds/openldap ) - mdb? ( >app-office/mdbtools-0.5 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - ssl? ( dev-libs/openssl )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - >=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 - - # Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi - G2CONF="${G2CONF} - --with-unique - --disable-scrollkeeper - --disable-static - --enable-system-sqlite - --disable-vala - $(use_with berkdb bdb /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_enable json) - $(use_with ldap) - $(use_with mdb mdb /usr) - $(use_with mysql mysql /usr) - $(use_with postgres postgres /usr) - $(use_enable ssl crypto)" - - 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)" - use oci8 || G2CONF="${G2CONF} --without-oracle" - - # Not in portage - G2CONF="${G2CONF} - --disable-default-binary" - - export XDG_DATA_HOME="${T}/.local" -} - -src_prepare() { - gnome2_src_prepare - - # Fix compilation failure of keyword_hash.c, upstream #630959 - epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch" -} diff --git a/gnome-extra/libgda/libgda-4.2.12.ebuild b/gnome-extra/libgda/libgda-4.2.12.ebuild deleted file mode 100644 index 32d3213b8835..000000000000 --- a/gnome-extra/libgda/libgda-4.2.12.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.12.ebuild,v 1.7 2012/07/15 19:02:25 armin76 Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit 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" - -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" - -SLOT="4" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" - -RDEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.16:2 - >=dev-libs/libxml2-2:2 - dev-libs/libxslt - dev-libs/libunique:1 - sys-libs/readline - sys-libs/ncurses - >=dev-db/sqlite-3.6.22:3 - berkdb? ( sys-libs/db ) - !bindist? ( firebird? ( dev-db/firebird ) ) - gtk? ( - || ( >=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 ) - ) - gnome-keyring? ( gnome-base/libgnome-keyring ) - http? ( >=net-libs/libsoup-2.24:2.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) - json? ( dev-libs/json-glib ) - ldap? ( net-nds/openldap ) - mdb? ( >app-office/mdbtools-0.5 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - ssl? ( dev-libs/openssl )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - >=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 - - # Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi - G2CONF="${G2CONF} - --with-unique - --disable-scrollkeeper - --disable-static - --enable-system-sqlite - --disable-vala - $(use_with berkdb bdb /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_enable json) - $(use_with ldap) - $(use_with mdb mdb /usr) - $(use_with mysql mysql /usr) - $(use_with postgres postgres /usr) - $(use_enable ssl crypto)" - - 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)" - use oci8 || G2CONF="${G2CONF} --without-oracle" - - # Not in portage - G2CONF="${G2CONF} - --disable-default-binary" -} - -src_prepare() { - gnome2_src_prepare - - # Fix compilation failure of keyword_hash.c, upstream #630959 - epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch" -} diff --git a/gnome-extra/libgda/libgda-4.2.13.ebuild b/gnome-extra/libgda/libgda-4.2.13.ebuild index f043b0ef3086..f350c65c299a 100644 --- a/gnome-extra/libgda/libgda-4.2.13.ebuild +++ b/gnome-extra/libgda/libgda-4.2.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.13.ebuild,v 1.8 2012/10/28 15:55:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.13.ebuild,v 1.9 2012/11/05 08:27:47 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -10,9 +10,9 @@ inherit db-use flag-o-matic gnome2 java-pkg-opt-2 DESCRIPTION="Gnome Database Access Library" HOMEPAGE="http://www.gnome-db.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="GPL-2+ LGPL-2+" -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" +IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" SLOT="4" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" @@ -48,8 +48,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig >=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 )" + >=dev-util/gtk-doc-am-1" # Tests are not really good RESTRICT="test" diff --git a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild index e192137bd2f2..5253009a8b7a 100644 --- a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild +++ b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.8 2012/07/15 19:02:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.9 2012/11/05 08:27:47 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -11,15 +11,15 @@ inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python DESCRIPTION="Gnome Database Access Library" HOMEPAGE="http://www.gnome-db.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="GPL-2+ LGPL-2+" -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala +IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala SLOT="5" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" RDEPEND=" app-text/iso-codes - >=dev-libs/glib-2.16:2 + >=dev-libs/glib-2.28:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline @@ -44,10 +44,10 @@ RDEPEND=" >=dev-db/sqlite-3.6.22:3" DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 - doc? ( >=dev-util/gtk-doc-1 ) + dev-util/gtk-doc-am + >=dev-util/intltool-0.35.5 + virtual/pkgconfig java? ( virtual/jdk:1.6 )" # vala? ( >=dev-lang/vala-0.14:0.14[vapigen] ) |