[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2023-05-29 Thread Sam James
commit: c189c93ecd38b87fa9fc715d9a637d165aa01137
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 21:24:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 21:24:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c189c93e

gnome-extra/libgda: Keyword 5.2.9-r1 arm64, #906618

Signed-off-by: Sam James  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index 7c3368aa3f6c..047fb144b015 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
app-text/iso-codes



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2023-05-18 Thread Andreas Sturmlechner
commit: fd1d834d9ab4afc233101fa50b86ec20676503e2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 14 12:16:28 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 18 12:09:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1d834d

gnome-extra/libgda: Rename USE=gnome-keyring -> keyring

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index aa2f5c31bbe1..7c3368aa3f6c 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ DESCRIPTION="GNOME database access library"
 HOMEPAGE="https://www.gnome-db.org/;
 LICENSE="GPL-2+ LGPL-2+"
 
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
+IUSE="berkdb canvas debug firebird keyring gtk graphviz http +introspection 
json ldap mdb mysql oci8 postgres sourceview ssl vala"
 REQUIRED_USE="
canvas? ( gtk )
graphviz? ( gtk )
@@ -31,7 +31,7 @@ RDEPEND="
sys-libs/ncurses:0=
berkdb? ( sys-libs/db:* )
firebird? ( dev-db/firebird )
-   gnome-keyring? ( app-crypt/libsecret )
+   keyring? ( app-crypt/libsecret )
gtk? (
>=x11-libs/gtk+-3.0.0:3
canvas? ( x11-libs/goocanvas:2.0= )
@@ -139,7 +139,7 @@ src_configure() {
$(use_with canvas goocanvas) \
$(use_enable debug) \
$(use_with firebird firebird /usr) \
-   $(use_with gnome-keyring libsecret) \
+   $(use_with keyring libsecret) \
$(use_with graphviz) \
$(use_with gtk ui) \
$(use_with http libsoup) \



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-12-12 Thread James Le Cuirot
commit: 476078168b3fe590bf5a1f433eabc549d9387949
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Dec 12 21:03:53 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Dec 12 21:03:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47607816

gnome-extra/libgda: Drop old 5.2.9

Signed-off-by: James Le Cuirot  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9.ebuild | 157 -
 1 file changed, 157 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild 
b/gnome-extra/libgda/libgda-5.2.9.ebuild
deleted file mode 100644
index c32450ceda62..
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 java-pkg-opt-2 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="https://www.gnome-db.org/;
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
-REQUIRED_USE="
-   canvas? ( gtk )
-   graphviz? ( gtk )
-   sourceview? ( gtk )
-   vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-   app-text/iso-codes
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/libxml2-2
-   dev-libs/libxslt
-   sys-libs/readline:0=
-   sys-libs/ncurses:0=
-   berkdb? ( sys-libs/db:* )
-   firebird? ( dev-db/firebird )
-   gnome-keyring? ( app-crypt/libsecret )
-   gtk? (
-   >=x11-libs/gtk+-3.0.0:3
-   canvas? ( x11-libs/goocanvas:2.0= )
-   sourceview? ( x11-libs/gtksourceview:3.0 )
-   graphviz? ( media-gfx/graphviz )
-   )
-   http? ( >=net-libs/libsoup-2.24:2.4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-   json? ( dev-libs/json-glib )
-   ldap? ( net-nds/openldap:= )
-   mdb? ( >app-office/mdbtools-0.5:= )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   postgres? ( dev-db/postgresql:= )
-   ssl? ( dev-libs/openssl:0= )
-   >=dev-db/sqlite-3.10.2:3=
-   vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build 
system fixes - bug 674066
-DEPEND="${RDEPEND}
-   dev-libs/libgee:0.8
-   app-text/yelp-tools
-   dev-util/glib-utils
-   dev-util/gtk-doc-am
-   >=dev-util/intltool-0.40.6
-   virtual/pkgconfig
-   java? ( >=virtual/jdk-1.6 )
-   vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
-   test
-   firebird? ( bindist )
-"
-
-pkg_setup() {
-   java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-   use berkdb && append-cppflags "-I$(db_includedir)"
-
-   # They need python2
-   sed -e '/SUBDIRS =/ s/trml2html//' \
-   -e '/SUBDIRS =/ s/trml2pdf//' \
-   -i libgda-report/RML/Makefile.{am,in} || die
-
-   # replace my_bool with _Bool
-   eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch"
-   # ... and stop using bool elsewhere too
-   eapply "${FILESDIR}/${PN}-5.2.9-redefine-bool-error.patch"
-
-   # Prevent file collisions with libgda:4
-   eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-   eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-   # Move files with mv (since epatch can't handle rename diffs) and
-   # update pre-generated gtk-doc files (for non-git versions of libgda)
-   local f
-   for f in tools/browser/doc/gda-browser* ; do
-   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-   done
-   for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-   sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-   -i ${f} || die "sed ${f} failed"
-   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-   done
-   for f in control-center/data/*_gda-control-center.png ; do
-   mv ${f} 
${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-   die "mv ${f} failed"
-   done
-
-   gnome2_src_prepare
-   java-pkg-opt-2_src_prepare
-   use vala && vala_src_prepare
-}
-
-src_configure() {
-   # Upstream broken configure handling for UI library introspection and 
vala bindings if passing a choice with use_enable - 
https://gitlab.gnome.org/GNOME/libgda/issues/158
-   # But if we don't pass an explicit choice, it behaves 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-12-12 Thread Arthur Zamarin
commit: d0a2675ffcd103688170b1f7e2bfe1e02db47ce4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Dec 12 17:52:19 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Dec 12 17:52:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a2675f

gnome-extra/libgda: Stabilize 5.2.9-r1 x86, #885499

Signed-off-by: Arthur Zamarin  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index 87d9aa2fd08d..aa2f5c31bbe1 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
app-text/iso-codes



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-12-11 Thread Sam James
commit: 10d5a314da9f88a35c01635c619f4fd703140a70
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 12 01:59:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 12 01:59:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d5a314

gnome-extra/libgda: Stabilize 5.2.9-r1 amd64, #885499

Signed-off-by: Sam James  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index e2a6eaa7b82e..87d9aa2fd08d 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
app-text/iso-codes



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/

2022-11-18 Thread Matt Turner
commit: e7c9a7e4b48154186e15366dca4e788754721d0a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Nov 13 14:14:34 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 19 01:44:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c9a7e4

gnome-extra/libgda: Apply patch to fix building without introspection

This has been submitted upstream but not merged yet.

Closes: https://bugs.gentoo.org/810046
Signed-off-by: James Le Cuirot  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28254
Signed-off-by: Matt Turner  gentoo.org>

 .../files/libgda-5.2.9-no-introspection.patch  | 61 ++
 gnome-extra/libgda/libgda-5.2.9-r1.ebuild  |  3 ++
 2 files changed, 64 insertions(+)

diff --git a/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch 
b/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch
new file mode 100644
index ..806a4a1c69e1
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch
@@ -0,0 +1,61 @@
+From df00d64aae3a5751fda757623936d4863bf88f58 Mon Sep 17 00:00:00 2001
+From: matoro <82255-mat...@users.noreply.gitlab.gnome.org>
+Date: Wed, 22 Jun 2022 10:29:48 -0400
+Subject: [PATCH] Fixed behavior for --{enable,disable}-introspection
+
+This now works to compile using --disable-introspection even if
+gobject-introspection is not installed at all
+---
+ configure.ac | 30 +++---
+ 1 file changed, 7 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b9e973617..b610fc953 100644
+--- a/configure.ac
 b/configure.ac
+@@ -476,35 +476,19 @@ AC_SUBST(JSON_GLIB_LIBS)
+ dnl *
+ dnl Check for GObject Introspection
+ dnl *
+-GOBJECT_INTROSPECTION_CHECK([1.30.0])
+-
+-AC_ARG_ENABLE([gdaui-gi],
+-AS_HELP_STRING([--disable-gdaui-gi[=@<:@yes/no@:>@]], [Disable GObject 
Introspection for libgda-ui [default=no]]),
+-[
+-  if test x$enableval = xyes
+-  then
+-disable_gdaui_gi=no
+-  else
+-disable_gdaui_gi=yes
+-  fi
+-],[
+-  disable_gdaui_gi=no
+-])
+-
+-if test x$found_introspection != xyes
++m4_ifdef([GOBJECT_INTROSPECTION_CHECK], 
[GOBJECT_INTROSPECTION_CHECK([1.30.0])])
++if test "x$found_introspection" != "xyes"
+ then
+-  disable_gda_gi=yes
+-  disable_gdaui_gi=yes
++  disable_gda_gi=yes
++  disable_gdaui_gi=yes
+ fi
+ 
+-AM_CONDITIONAL(ENABLE_GDA_GI, [test x$disable_gda_gi != xyes])
+-
+-if test x$have_ui != xyes
++if test "x$have_ui" != "xyes"
+ then
+   disable_gdaui_gi=yes
+ fi
+-
+-AM_CONDITIONAL(ENABLE_GDAUI_GI, [test x$disable_gdaui_gi != xyes])
++AM_CONDITIONAL(ENABLE_GDA_GI, [test "$disable_gda_gi" != "yes"])
++AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$disable_gdaui_gi" != "yes"])
+ 
+ dnl **
+ dnl Check for Vala Compiler
+-- 
+GitLab
+

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index 1aca92fcec07..e2a6eaa7b82e 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -107,6 +107,9 @@ src_prepare() {
die "mv ${f} failed"
done
 
+   # Fix building without introspection.
+   eapply "${FILESDIR}/${PN}-5.2.9-no-introspection.patch"
+
gnome2_src_prepare
java-pkg-opt-2_src_prepare
 }



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-11-18 Thread Matt Turner
commit: 29643879bbd81d0886b73c89d8866856bd8a148a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Nov 13 14:07:50 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 19 01:44:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29643879

gnome-extra/libgda: Bump EAPI to 8

This is the last pre-EAPI-7 consumer of db-use.eclass.

Signed-off-by: James Le Cuirot  gentoo.org>
Signed-off-by: Matt Turner  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 159 ++
 1 file changed, 159 insertions(+)

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
new file mode 100644
index ..3cb270db2bec
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF="yes"
+
+inherit db-use flag-o-matic gnome2 java-pkg-opt-2 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="https://www.gnome-db.org/;
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
+REQUIRED_USE="
+   canvas? ( gtk )
+   graphviz? ( gtk )
+   sourceview? ( gtk )
+   vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+   app-text/iso-codes
+   >=dev-libs/glib-2.32:2
+   >=dev-libs/libxml2-2
+   dev-libs/libxslt
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
+   berkdb? ( sys-libs/db:* )
+   firebird? ( dev-db/firebird )
+   gnome-keyring? ( app-crypt/libsecret )
+   gtk? (
+   >=x11-libs/gtk+-3.0.0:3
+   canvas? ( x11-libs/goocanvas:2.0= )
+   sourceview? ( x11-libs/gtksourceview:3.0 )
+   graphviz? ( media-gfx/graphviz )
+   )
+   http? ( >=net-libs/libsoup-2.24:2.4 )
+   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+   json? ( dev-libs/json-glib )
+   ldap? ( net-nds/openldap:= )
+   mdb? ( >app-office/mdbtools-0.5:= )
+   mysql? ( dev-db/mysql-connector-c:0= )
+   postgres? ( dev-db/postgresql:= )
+   ssl? ( dev-libs/openssl:0= )
+   >=dev-db/sqlite-3.10.2:3=
+   vala? ( dev-libs/libgee:0.8 )
+"
+
+# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build 
system fixes - bug 674066
+DEPEND="${RDEPEND}
+   dev-libs/libgee:0.8
+"
+
+# java dep shouldn't rely on slots, bug #450004
+BDEPEND="
+   app-text/yelp-tools
+   dev-util/glib-utils
+   dev-util/gtk-doc-am
+   >=dev-util/intltool-0.40.6
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.6 )
+   vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+   test
+   firebird? ( bindist )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+   use berkdb && append-cppflags "-I$(db_includedir)"
+
+   # They need python2
+   sed -e '/SUBDIRS =/ s/trml2html//' \
+   -e '/SUBDIRS =/ s/trml2pdf//' \
+   -i libgda-report/RML/Makefile.{am,in} || die
+
+   # replace my_bool with _Bool
+   eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch"
+   # ... and stop using bool elsewhere too
+   eapply "${FILESDIR}/${PN}-5.2.9-redefine-bool-error.patch"
+
+   # Prevent file collisions with libgda:4
+   eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+   eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+   # Move files with mv (since epatch can't handle rename diffs) and
+   # update pre-generated gtk-doc files (for non-git versions of libgda)
+   local f
+   for f in tools/browser/doc/gda-browser* ; do
+   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+   done
+   for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+   sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+   -i ${f} || die "sed ${f} failed"
+   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+   done
+   for f in control-center/data/*_gda-control-center.png ; do
+   mv ${f} 
${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+   die "mv ${f} failed"
+   done
+
+   gnome2_src_prepare
+   java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+   use vala && vala_setup
+
+   # Upstream broken configure handling for UI library introspection and 
vala bindings if passing a choice with use_enable - 
https://gitlab.gnome.org/GNOME/libgda/issues/158

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-11-18 Thread Matt Turner
commit: d2f4f02f49acb86e7281e5569db0a0922d5da1b4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Nov 13 14:10:39 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 19 01:44:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4f02f

gnome-extra/libgda: Detect BerkDB in the right way with configure flags

Upstream has a proper way to do this without appending to CPPFLAGS. This method
will even work when cross-compiling after db-use.eclass has been fixed.

Signed-off-by: James Le Cuirot  gentoo.org>
Signed-off-by: Matt Turner  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
index 3cb270db2bec..1aca92fcec07 100644
--- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 GNOME2_EAUTORECONF="yes"
 
-inherit db-use flag-o-matic gnome2 java-pkg-opt-2 vala
+inherit db-use gnome2 java-pkg-opt-2 vala
 
 DESCRIPTION="GNOME database access library"
 HOMEPAGE="https://www.gnome-db.org/;
@@ -78,8 +78,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-   use berkdb && append-cppflags "-I$(db_includedir)"
-
# They need python2
sed -e '/SUBDIRS =/ s/trml2html//' \
-e '/SUBDIRS =/ s/trml2pdf//' \
@@ -114,6 +112,15 @@ src_prepare() {
 }
 
 src_configure() {
+   local bdbroot bdbinc bdblib
+
+   if use berkdb; then
+   bdbinc=$(db_includedir)
+   bdbroot=${bdbinc%/include/*}
+   bdbinc=${bdbinc#${bdbroot}/}
+   bdblib=$(get_libdir)
+   fi
+
use vala && vala_setup
 
# Upstream broken configure handling for UI library introspection and 
vala bindings if passing a choice with use_enable - 
https://gitlab.gnome.org/GNOME/libgda/issues/158
@@ -123,7 +130,9 @@ src_configure() {
--disable-default-binary \
--disable-static \
--enable-system-sqlite \
-   $(use_with berkdb bdb /usr) \
+   $(use_with berkdb bdb "${bdbroot}") \
+   $(use_with berkdb bdb-includedir-name "${bdbinc}") \
+   $(use_with berkdb bdb-libdir-name "${bdblib}") \
$(use_with canvas goocanvas) \
$(use_enable debug) \
$(use_with firebird firebird /usr) \



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-10-30 Thread Matt Turner
commit: c121b10a275bc7ad6f08e55acb130cf4af8c6b60
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct 29 21:20:11 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Oct 30 22:28:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c121b10a

gnome-extra/libgda: Set remote-id

Signed-off-by: Matt Turner  gentoo.org>

 gnome-extra/libgda/metadata.xml | 25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 2b1ac515e9b4..fa310b2c239c 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -1,15 +1,18 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   gn...@gentoo.org
-   Gentoo GNOME Desktop
-   
-   
-   Enable support for 
x11-libs/goocanvas
-   Enable embedded net-libs/libsoup 
based server
-   Enable support for JSON format
-   Enable support for Microsoft Access database 
using app-office/mdbtools
-   Enable support for 
x11-libs/gtksourceview
-   
+  
+gn...@gentoo.org
+Gentoo GNOME Desktop
+  
+  
+Enable support for x11-libs/goocanvas
+Enable embedded net-libs/libsoup based 
server
+Enable support for JSON format
+Enable support for Microsoft Access database using 
app-office/mdbtools
+Enable support for 
x11-libs/gtksourceview
+  
+  
+GNOME/libgda
+  
 



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2022-04-16 Thread Yixun Lan
commit: 34cdf14ea0a74ed3cba99cb7ada6d1ec449f3a84
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Apr 16 11:15:54 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Apr 16 12:24:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cdf14e

gnome-extra/libgda: Keyword 5.2.9 riscv, #838088

Signed-off-by: Yixun Lan  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild 
b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 9a3fb0517f99..c32450ceda62 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
app-text/iso-codes



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/, gnome-extra/libgda/files/

2021-11-21 Thread Sam James
commit: a86d660c0f1ffcef7ba19ef801f1248504994541
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 22 06:51:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 22 06:52:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86d660c

gnome-extra/libgda: fix build with USE=canvas

Closes: https://bugs.gentoo.org/818106
Thanks-to: Tee KOBAYASHI  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/libgda-5.2.9-redefine-bool-error.patch   | 38 ++
 gnome-extra/libgda/libgda-5.2.9.ebuild |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch 
b/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch
new file mode 100644
index ..0ef845bd7a4d
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/818106
+--- a/tools/browser/canvas/browser-canvas-text.c
 b/tools/browser/canvas/browser-canvas-text.c
+@@ -231,7 +231,7 @@ browser_canvas_text_set_property (GObjec
+   const gchar *cstr = NULL;
+   gchar *str;
+   gdouble size = 0;
+-  gboolean bool = FALSE;
++  gboolean bool_var = FALSE;
+ 
+   ct = BROWSER_CANVAS_TEXT (object);
+ 
+@@ -269,11 +269,11 @@ browser_canvas_text_set_property (GObjec
+   ct->priv->highlight_color = g_strdup 
(BROWSER_CANVAS_ENTITY_COLOR);
+   break;
+   case PROP_UNDERLINE:
+-  bool = g_value_get_boolean (value);
+-  ct->priv->underline = bool;
++  bool_var = g_value_get_boolean (value);
++  ct->priv->underline = bool_var;
+   adjust_text_pango_attributes (ct);
+   if (ct->priv->text_item) {
+-  if (bool) {
++  if (bool_var) {
+   str = g_strdup_printf ("%s", 
ct->priv->text);
+   g_object_set (G_OBJECT (ct->priv->text_item), 
+ "text", str,
+@@ -286,8 +286,8 @@ browser_canvas_text_set_property (GObjec
+ "use-markup", FALSE, NULL);
+   }
+   case PROP_BOLD:
+-  bool = g_value_get_boolean (value);
+-  ct->priv->bold = bool;
++  bool_var = g_value_get_boolean (value);
++  ct->priv->bold = bool_var;
+   adjust_text_pango_attributes (ct);
+   break;
+   default:

diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild 
b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 135738d0063e..9a3fb0517f99 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -86,6 +86,8 @@ src_prepare() {
 
# replace my_bool with _Bool
eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch"
+   # ... and stop using bool elsewhere too
+   eapply "${FILESDIR}/${PN}-5.2.9-redefine-bool-error.patch"
 
# Prevent file collisions with libgda:4
eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/

2021-09-24 Thread Sam James
commit: 1a2c12ba5c70d6887856c59e6c1b4e2633f9a441
Author: shimataro  zelkova  cc>
AuthorDate: Wed Sep 22 21:19:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 25 02:45:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2c12ba

gnome-extra/libgda: fix build with newer MySQL

Thanks-to: Attila Tóth  atoth.sote.hu>
Closes: https://bugs.gentoo.org/692672
Signed-off-by: shimataro  zelkova.cc>
Closes: https://github.com/gentoo/gentoo/pull/22367
Signed-off-by: Sam James  gentoo.org>

 .../libgda/files/libgda-5.2-my_bool-error.patch| 136 +
 gnome-extra/libgda/libgda-5.2.9.ebuild |   3 +
 2 files changed, 139 insertions(+)

diff --git a/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch 
b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch
new file mode 100644
index 000..9e696ef1c4d
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch
@@ -0,0 +1,136 @@
+https://bugs.gentoo.org/692672
+
+--- a/providers/mysql/gda-mysql-provider.c
 b/providers/mysql/gda-mysql-provider.c
+@@ -1835,7 +1835,7 @@ real_prepare (GdaServerProvider *provider, GdaConnection 
*cnc, GdaStatement *stm
+   return FALSE;
+   }
+ 
+-  my_bool update_max_length = 1;
++  _Bool update_max_length = 1;
+   if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, 
(const void *) _max_length)) {
+   _gda_mysql_make_error (cnc, NULL, mysql_stmt, error);
+   mysql_stmt_close (mysql_stmt);
+@@ -1941,7 +1941,7 @@ prepare_stmt_simple (MysqlConnectionData  *cdata,
+   return FALSE;
+   }
+ 
+-  my_bool update_max_length = 1;
++  _Bool update_max_length = 1;
+   if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, 
(const void *) _max_length)) {
+   _gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error);
+   mysql_stmt_close (mysql_stmt);
+@@ -2327,7 +2327,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider  
 *provider,
+   if (allow_noparam) {
+ /* bind param to NULL */
+   mysql_bind_param[i].buffer_type = 
MYSQL_TYPE_NULL;
+-  mysql_bind_param[i].is_null = (my_bool*)1;
++  mysql_bind_param[i].is_null = (_Bool *) 1;
+ empty_rs = TRUE;
+ continue;
+   }
+@@ -2347,7 +2347,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider  
 *provider,
+   if (allow_noparam) {
+ /* bind param to NULL */
+   mysql_bind_param[i].buffer_type = 
MYSQL_TYPE_NULL;
+-  mysql_bind_param[i].is_null = (my_bool*)1;
++  mysql_bind_param[i].is_null = (_Bool *) 1;
+ empty_rs = TRUE;
+ continue;
+   }
+@@ -2399,7 +2399,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider  
 *provider,
+   GdaStatement *rstmt;
+   if (! gda_rewrite_statement_for_null_parameters (stmt, 
params, , error)) {
+   mysql_bind_param[i].buffer_type = 
MYSQL_TYPE_NULL;
+-  mysql_bind_param[i].is_null = (my_bool*)1;
++  mysql_bind_param[i].is_null = (_Bool *) 1;
+   }
+   else if (!rstmt)
+   return NULL;
+@@ -2459,7 +2459,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider  
 *provider,
+   ts = (GdaTimestamp*) gda_value_get_timestamp (value);
+   if (!ts) {
+   mysql_bind_param[i].buffer_type = 
MYSQL_TYPE_NULL;
+-  mysql_bind_param[i].is_null = (my_bool*)1;
++  mysql_bind_param[i].is_null = (_Bool *) 1;
+   }
+   else {
+   gboolean tofree = FALSE;
+@@ -2495,7 +2495,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider  
 *provider,
+   ts = (GdaTime*) gda_value_get_time (value);
+   if (!ts) {
+   mysql_bind_param[i].buffer_type = 
MYSQL_TYPE_NULL;
+-  mysql_bind_param[i].is_null = (my_bool*)1;
++  mysql_bind_param[i].is_null = (_Bool *) 1;
+   }
+   else {
+   gboolean tofree = FALSE;
+@@ -2528,7 +2528,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider  
 *provider,
+   ts = (GDate*) g_value_get_boxed (value);

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2021-04-21 Thread Sam James
commit: 6394b3039b45240cc0d161ec1664ea608db40df4
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 09:16:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:50:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6394b303

gnome-extra/libgda: drop epatch

Signed-off-by: Sam James  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild 
b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 33969ae9376..ac392e8d05d 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit db-use epatch flag-o-matic gnome2 java-pkg-opt-2 vala
+inherit db-use flag-o-matic gnome2 java-pkg-opt-2 vala
 
 DESCRIPTION="GNOME database access library"
 HOMEPAGE="https://www.gnome-db.org/;



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2020-10-03 Thread Pacho Ramos
commit: 82e52cbf00fe78cb530bf48ad489f3e0a79ba62e
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct  3 16:06:28 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct  3 16:06:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e52cbf

gnome-extra/libgda: appdata files are only installed with USE gtk

Closes: https://bugs.gentoo.org/743715
Thanks-to: Toralf Förster
Thanks-to: Kent Fredric
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Pacho Ramos  gentoo.org>

 gnome-extra/libgda/libgda-5.2.9.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild 
b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 73305fd1f2f..3edc6cce0ca 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -146,5 +146,7 @@ pkg_preinst() {
 src_install() {
gnome2_src_install
# Use new location
-   mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+   if use gtk; then
+   mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2020-09-19 Thread Pacho Ramos
commit: bf6e7867c127e47f96d8a2e446219b474243d394
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 19 20:38:14 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 19 20:38:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6e7867

gnome-extra/libgda: Bump to 5.2.9

Also drop gnome-doc-utils deps

Closes: https://bugs.gentoo.org/726824
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Pacho Ramos  gentoo.org>

 gnome-extra/libgda/Manifest|   1 +
 gnome-extra/libgda/libgda-5.2.9.ebuild | 150 +
 2 files changed, 151 insertions(+)

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index bf631978e8b..7802d82407f 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1 +1,2 @@
 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 
7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e
 SHA512 
6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
+DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B 
b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980
 SHA512 
a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231

diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild 
b/gnome-extra/libgda/libgda-5.2.9.ebuild
new file mode 100644
index 000..73305fd1f2f
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="https://www.gnome-db.org/;
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
+REQUIRED_USE="
+   canvas? ( gtk )
+   graphviz? ( gtk )
+   sourceview? ( gtk )
+   vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+   app-text/iso-codes
+   >=dev-libs/glib-2.32:2
+   >=dev-libs/libxml2-2
+   dev-libs/libxslt
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
+   berkdb? ( sys-libs/db:* )
+   firebird? ( dev-db/firebird )
+   gnome-keyring? ( app-crypt/libsecret )
+   gtk? (
+   >=x11-libs/gtk+-3.0.0:3
+   canvas? ( x11-libs/goocanvas:2.0= )
+   sourceview? ( x11-libs/gtksourceview:3.0 )
+   graphviz? ( media-gfx/graphviz )
+   )
+   http? ( >=net-libs/libsoup-2.24:2.4 )
+   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+   json? ( dev-libs/json-glib )
+   ldap? ( net-nds/openldap:= )
+   mdb? ( >app-office/mdbtools-0.5:= )
+   mysql? ( dev-db/mysql-connector-c:0= )
+   postgres? ( dev-db/postgresql:= )
+   ssl? ( dev-libs/openssl:0= )
+   >=dev-db/sqlite-3.10.2:3=
+   vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build 
system fixes - bug 674066
+DEPEND="${RDEPEND}
+   dev-libs/libgee:0.8
+   app-text/yelp-tools
+   dev-util/glib-utils
+   dev-util/gtk-doc-am
+   >=dev-util/intltool-0.40.6
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.6 )
+   vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+   test
+   firebird? ( bindist )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+   use berkdb && append-cppflags "-I$(db_includedir)"
+
+   # They need python2
+   sed -e '/SUBDIRS =/ s/trml2html//' \
+   -e '/SUBDIRS =/ s/trml2pdf//' \
+   -i libgda-report/RML/Makefile.{am,in} || die
+
+   # Prevent file collisions with libgda:4
+   eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+   eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+   # Move files with mv (since epatch can't handle rename diffs) and
+   # update pre-generated gtk-doc files (for non-git versions of libgda)
+   local f
+   for f in tools/browser/doc/gda-browser* ; do
+   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+   done
+   for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+   sed -e 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2020-09-19 Thread Pacho Ramos
commit: 0270bffe2ae5306985b7156c374422754a18865d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 19 20:04:09 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 19 20:04:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0270bffe

gnome-extra/libgda: Drop USE reports to kill python2

Closes: https://bugs.gentoo.org/735344
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Pacho Ramos  gentoo.org>

 gnome-extra/libgda/libgda-5.2.8-r1.ebuild | 29 ++---
 gnome-extra/libgda/metadata.xml   |  1 -
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
index c6837a81f02..082aba06ff1 100644
--- a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
@@ -4,18 +4,16 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 vala
 
 DESCRIPTION="GNOME database access library"
 HOMEPAGE="https://www.gnome-db.org/;
 LICENSE="GPL-2+ LGPL-2+"
 
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
 REQUIRED_USE="
-   reports? ( ${PYTHON_REQUIRED_USE} )
canvas? ( gtk )
graphviz? ( gtk )
sourceview? ( gtk )
@@ -49,10 +47,6 @@ RDEPEND="
mdb? ( >app-office/mdbtools-0.5:= )
mysql? ( dev-db/mysql-connector-c:0= )
postgres? ( dev-db/postgresql:= )
-   reports? (
-   ${PYTHON_DEPS}
-   dev-java/fop
-   dev-python/reportlab )
ssl? ( dev-libs/openssl:0= )
>=dev-db/sqlite-3.10.2:3=
vala? ( dev-libs/libgee:0.8 )
@@ -81,7 +75,6 @@ RESTRICT="
 
 pkg_setup() {
java-pkg-opt-2_pkg_setup
-   use reports && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -90,10 +83,10 @@ src_prepare() {
 
use berkdb && append-cppflags "-I$(db_includedir)"
 
-   use reports ||
-   sed -e '/SUBDIRS =/ s/trml2html//' \
-   -e '/SUBDIRS =/ s/trml2pdf//' \
-   -i libgda-report/RML/Makefile.{am,in} || die
+   # They need python2
+   sed -e '/SUBDIRS =/ s/trml2html//' \
+   -e '/SUBDIRS =/ s/trml2pdf//' \
+   -i libgda-report/RML/Makefile.{am,in} || die
 
# Prevent file collisions with libgda:4
eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
@@ -157,13 +150,3 @@ pkg_preinst() {
gnome2_pkg_preinst
java-pkg-opt-2_pkg_preinst
 }
-
-src_install() {
-   gnome2_src_install
-   if use reports; then
-   for t in trml2{html,pdf}; do
-   python_scriptinto /usr/share/libgda-5.0/gda_${t}
-   python_doscript libgda-report/RML/${t}/${t}.py
-   done
-   fi
-}

diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index c72a40986ea..8e5194e79e3 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -10,7 +10,6 @@
Enable embedded net-libs/libsoup 
based server
Enable support for JSON format
Enable support for Microsoft Access database 
using app-office/mdbtools
-   Install tools for generating graphical 
reports
Enable support for 
x11-libs/gtksourceview

 



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/, gnome-extra/gnome-system-monitor/, ...

2019-10-11 Thread Michał Górny
commit: ef53f3b688bf4b67c1c66d0dd0f4ace51edf2372
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:35:45 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:35:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef53f3b6

gnome-extra: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny  gentoo.org>

 .../evolution-data-server/evolution-data-server-3.30.5-r1.ebuild| 2 +-
 gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild   | 2 +-
 gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild   | 2 +-
 gnome-extra/gnome-calculator/gnome-calculator-3.30.1.ebuild | 2 +-
 gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild | 2 +-
 gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild   | 2 +-
 gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild| 2 +-
 gnome-extra/gnome-system-monitor/gnome-system-monitor-3.30.0.ebuild | 2 +-
 gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild   | 2 +-
 gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild   | 2 +-
 gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild| 2 +-
 gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild| 2 +-
 gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild   | 2 +-
 gnome-extra/gucharmap/gucharmap-10.0.3.ebuild   | 2 +-
 gnome-extra/gucharmap/gucharmap-11.0.3.ebuild   | 2 +-
 gnome-extra/gucharmap/gucharmap-12.0.1.ebuild   | 2 +-
 gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild   | 2 +-
 gnome-extra/libgda/libgda-5.2.8-r1.ebuild   | 2 +-
 gnome-extra/libgsf/libgsf-1.14.43.ebuild| 2 +-
 gnome-extra/libgsf/libgsf-1.14.45.ebuild| 2 +-
 gnome-extra/libgsf/libgsf-1.14.46.ebuild| 2 +-
 gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild   | 2 +-
 gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild   | 2 +-
 gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild | 2 +-
 gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild | 2 +-
 gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild | 2 +-
 gnome-extra/zenity/zenity-3.30.0.ebuild | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git 
a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild 
b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
index 45acbd84cc5..38777837678 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/62" # subslot = libcamel-1.2 soname version
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap 
kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to 
handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, 
bug #519512

diff --git 
a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild 
b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
index f2100b28c06..b92e1fc0d91 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0/62-24" # subslot = libcamel-1.2/libedataserver-1.2 
soname version
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap 
kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to 
handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, 
bug #519512

diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild 
b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
index 46fca22ad7e..ca80e0a0dfe 100644
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gconf-editor;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/

2019-05-18 Thread Mart Raudsepp
commit: 0c4a13140429bfc8212ecab61fdd64898ef85c86
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat May 18 21:07:00 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May 18 21:24:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4a1314

gnome-extra/libgda: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-extra/libgda/Manifest|   1 -
 .../libgda/files/libgda-5.2.4-vala-check.patch |  35 
 gnome-extra/libgda/libgda-5.2.4-r2.ebuild  | 182 -
 gnome-extra/libgda/libgda-5.2.4-r3.ebuild  | 182 -
 4 files changed, 400 deletions(-)

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index ab2677fd061..bf631978e8b 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,2 +1 @@
-DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 
567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1
 SHA512 
90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 
7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e
 SHA512 
6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece

diff --git a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch 
b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
deleted file mode 100644
index c586d49356d..000
--- a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba 
-Date: Sun, 7 Feb 2016 20:49:07 +0100
-Subject: Re-correction for bug #761424
-
-Automatic detection of API version

- configure.ac | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 152f676..9898a32 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -571,13 +571,13 @@ fi
- vala_api="No Vala bindings will be generated"
- if test "x$enable_vala" = "xyes"
- then
--  AM_PROG_VALAC([0.26.0])
-+  AM_PROG_VALAC()
-   if test "x$VALA_API_VERSION" = "x"
-   then
--  VAPIGEN_CHECK([0.26.0],[0.26],,no)
--  vala_api="0.26 (Default)"
-+  VAPIGEN_CHECK(,,,no)
-+  vala_api="`pkg-config --modversion vapigen` (Default)"
-   else
--  VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
-+  VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
-   vala_api=$VALA_API_VERSION
-   fi
- else
--- 
-cgit v0.12
-

diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
deleted file mode 100644
index b45f3537357..000
--- a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/;
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
-   reports? ( ${PYTHON_REQUIRED_USE} )
-   canvas? ( gtk )
-   graphviz? ( gtk )
-   sourceview? ( gtk )
-   vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-   app-text/iso-codes
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/libxml2-2
-   dev-libs/libxslt
-   sys-libs/readline:0=
-   sys-libs/ncurses:0=
-   berkdb? ( sys-libs/db:* )
-   firebird? ( dev-db/firebird )
-   gnome-keyring? ( app-crypt/libsecret )
-   gtk? (
-   >=x11-libs/gtk+-3.0.0:3
-   canvas? ( x11-libs/goocanvas:2.0= )
-   sourceview? ( x11-libs/gtksourceview:3.0 )
-   graphviz? ( media-gfx/graphviz )
-   )
-   http? ( >=net-libs/libsoup-2.24:2.4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-   json? ( dev-libs/json-glib )
-   ldap? ( net-nds/openldap:= )
-   mdb? ( >app-office/mdbtools-0.5:= )
-   mysql? ( virtual/mysql:= )
-   postgres? ( dev-db/postgresql:= )
-   reports? (
-   ${PYTHON_DEPS}
-   dev-java/fop
-   dev-python/reportlab )
-   ssl? ( =dev-db/sqlite-3.6.22:3=
-   vala? ( 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2019-02-11 Thread Brian Evans
commit: b02183ab8fc017f9f800ad3c455e59e583257af8
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 11 18:25:01 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Feb 11 18:25:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02183ab

gnome-extra/libgda: Revbump for mysql dependency change

Non-maintainer commit

Ack-by: leio  gentoo.org
Bug: https://bugs.gentoo.org/665902
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 ...{libgda-5.2.8.ebuild => libgda-5.2.4-r3.ebuild} | 45 ++
 ...{libgda-5.2.8.ebuild => libgda-5.2.8-r1.ebuild} |  4 +-
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
similarity index 83%
copy from gnome-extra/libgda/libgda-5.2.8.ebuild
copy to gnome-extra/libgda/libgda-5.2.4-r3.ebuild
index 6570bb39df7..17ea3fb66a1 100644
--- a/gnome-extra/libgda/libgda-5.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
 
 DESCRIPTION="GNOME database access library"
 HOMEPAGE="http://www.gnome-db.org/;
@@ -47,21 +46,19 @@ RDEPEND="
json? ( dev-libs/json-glib )
ldap? ( net-nds/openldap:= )
mdb? ( >app-office/mdbtools-0.5:= )
-   mysql? ( virtual/mysql:= )
+   mysql? ( dev-db/mysql-connector-c:0= )
postgres? ( dev-db/postgresql:= )
reports? (
${PYTHON_DEPS}
dev-java/fop
dev-python/reportlab )
-   ssl? ( dev-libs/openssl:0= )
-   >=dev-db/sqlite-3.10.2:3=
+   ssl? ( =dev-db/sqlite-3.6.22:3=
vala? ( dev-libs/libgee:0.8 )
 "
 
 # java dep shouldn't rely on slots, bug #450004
-# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build 
system fixes - bug 674066
 DEPEND="${RDEPEND}
-   dev-libs/libgee:0.8
>=app-text/gnome-doc-utils-0.9
app-text/yelp-tools
dev-util/glib-utils
@@ -88,6 +85,13 @@ src_prepare() {
# Fix compilation with -Werror=format-security (from 'master')
eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
 
+   # Support JRE 1.8 (from Fedora)
+   eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+   # Fix vala test,
+   # https://bugzilla.gnome.org/show_bug.cgi?id=761424
+   eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
+
use berkdb && append-cppflags "-I$(db_includedir)"
 
use reports ||
@@ -114,18 +118,25 @@ src_prepare() {
die "mv ${f} failed"
done
 
+   eautoreconf
gnome2_src_prepare
java-pkg-opt-2_src_prepare
use vala && vala_src_prepare
-
-   # Support JRE 1.8 (from Fedora) - patches configure, so applied AFTER 
gnome2_src_prepare runs eautoreconf
-   eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
 }
 
 src_configure() {
-   # Upstream broken configure handling for UI library introspection and 
vala bindings if passing a choice with use_enable - 
https://gitlab.gnome.org/GNOME/libgda/issues/158
-   # But if we don't pass an explicit choice, it behaves as we need (only 
enable them if --enable-ui AND the appropriate --enable-introspection or 
--enable-vala)
+   local myconf=( )
+   if use introspection ; then
+   myconf+=( $(use_enable gtk gdaui-gi) )
+   else
+   myconf+=( --disable-gdaui-gi )
+   fi
+   if use vala ; then
+   myconf+=( $(use_enable gtk gdaui-vala) )
+   else
+   myconf+=( --disable-gdaui-vala )
+   fi
+
gnome2_src_configure \
--with-help \
--disable-default-binary \
@@ -140,17 +151,19 @@ src_configure() {
$(use_with gtk ui) \
$(use_with http libsoup) \
$(use_enable introspection) \
+   $(use_enable introspection gda-gi) \
"$(use_with java java $JAVA_HOME)" \
$(use_enable json) \
$(use_with ldap) \
-   --with-ldap-libdir-name="$(get_libdir)" \
$(use_with mdb mdb /usr) \
$(use_with mysql mysql /usr) \
$(use_with oci8 oracle) \
$(use_with postgres postgres /usr) \
$(use_enable ssl crypto) \
$(use_with sourceview gtksourceview) \
-   $(use_enable vala)
+   $(use_enable vala) \
+   $(use_enable vala vala-extensions) \
+   ${myconf[@]}
 }
 
 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2018-12-31 Thread Mart Raudsepp
commit: 33e0c87a28ce9c90d2f54ec8783b1bb3c76ea7d7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Dec 31 21:48:16 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Dec 31 21:49:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e0c87a

gnome-extra/libgda: fix USE=ldap build on 17.1 profiles

Without passing libdir-name to configure it always uses "lib",
which will fail on systems where /usr/lib is not a symlink to
/usr/lib64, when openldap is installed to lib64, as it is on
17.1 amd64 profiles. Unfortunately openldap still doesn't ship
pkgconfig files, but fortunately there's this configure knob
with which to teach it where openldap is.

Closes: https://bugs.gentoo.org/669728
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-extra/libgda/libgda-5.2.8.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild 
b/gnome-extra/libgda/libgda-5.2.8.ebuild
index 0eb06d4b35c..6570bb39df7 100644
--- a/gnome-extra/libgda/libgda-5.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8.ebuild
@@ -143,6 +143,7 @@ src_configure() {
"$(use_with java java $JAVA_HOME)" \
$(use_enable json) \
$(use_with ldap) \
+   --with-ldap-libdir-name="$(get_libdir)" \
$(use_with mdb mdb /usr) \
$(use_with mysql mysql /usr) \
$(use_with oci8 oracle) \



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2018-12-30 Thread Mart Raudsepp
commit: f45a16054d54e562153adf0e74e4c810840f3230
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Dec 30 10:49:58 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Dec 30 10:50:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45a1605

gnome-extra/libgda: workaround build failures without vala

Upstream configure has a bad check for the libgee not existing failure,
by checking a variable that's not used anymore, so the check will
always fail with no libgee found - no matter if vala extensions
are actually requested or not. Due to older version not building
against new openssl, workaround it quickly and temporarily by
always requiring libgee during build, pending a proper fix that
fixes the check in configure.

Bug: https://bugs.gentoo.org/674066
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-extra/libgda/libgda-5.2.8.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild 
b/gnome-extra/libgda/libgda-5.2.8.ebuild
index 1b78dd77194..0eb06d4b35c 100644
--- a/gnome-extra/libgda/libgda-5.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8.ebuild
@@ -59,7 +59,9 @@ RDEPEND="
 "
 
 # java dep shouldn't rely on slots, bug #450004
+# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build 
system fixes - bug 674066
 DEPEND="${RDEPEND}
+   dev-libs/libgee:0.8
>=app-text/gnome-doc-utils-0.9
app-text/yelp-tools
dev-util/glib-utils



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2018-12-28 Thread Mart Raudsepp
commit: 802021a945e43c9400779336b0f6d4c0b245531e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Dec 28 16:20:19 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Dec 28 16:22:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802021a9

gnome-extra/libgda: bump to 5.2.8, compatible with openssl-1.1

Also fix JRE 1.8 patch to not be reverted by the eautoreconf - however no
clue if it actually works.

Closes: https://bugs.gentoo.org/666156
Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 gnome-extra/libgda/Manifest|   1 +
 gnome-extra/libgda/libgda-5.2.8.ebuild | 166 +
 2 files changed, 167 insertions(+)

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 365859e91e4..ab2677fd061 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1 +1,2 @@
 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 
567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1
 SHA512 
90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
+DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 
7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e
 SHA512 
6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece

diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild 
b/gnome-extra/libgda/libgda-5.2.8.ebuild
new file mode 100644
index 000..1b78dd77194
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.8.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/;
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+   reports? ( ${PYTHON_REQUIRED_USE} )
+   canvas? ( gtk )
+   graphviz? ( gtk )
+   sourceview? ( gtk )
+   vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   app-text/iso-codes
+   >=dev-libs/glib-2.32:2
+   >=dev-libs/libxml2-2
+   dev-libs/libxslt
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
+   berkdb? ( sys-libs/db:* )
+   firebird? ( dev-db/firebird )
+   gnome-keyring? ( app-crypt/libsecret )
+   gtk? (
+   >=x11-libs/gtk+-3.0.0:3
+   canvas? ( x11-libs/goocanvas:2.0= )
+   sourceview? ( x11-libs/gtksourceview:3.0 )
+   graphviz? ( media-gfx/graphviz )
+   )
+   http? ( >=net-libs/libsoup-2.24:2.4 )
+   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+   json? ( dev-libs/json-glib )
+   ldap? ( net-nds/openldap:= )
+   mdb? ( >app-office/mdbtools-0.5:= )
+   mysql? ( virtual/mysql:= )
+   postgres? ( dev-db/postgresql:= )
+   reports? (
+   ${PYTHON_DEPS}
+   dev-java/fop
+   dev-python/reportlab )
+   ssl? ( dev-libs/openssl:0= )
+   >=dev-db/sqlite-3.10.2:3=
+   vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+   >=app-text/gnome-doc-utils-0.9
+   app-text/yelp-tools
+   dev-util/glib-utils
+   dev-util/gtk-doc-am
+   >=dev-util/intltool-0.40.6
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.6 )
+   vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+   test
+   firebird? ( bindist )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+   use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # Fix compilation with -Werror=format-security (from 'master')
+   eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+   use berkdb && append-cppflags "-I$(db_includedir)"
+
+   use reports ||
+   sed -e '/SUBDIRS =/ s/trml2html//' \
+   -e '/SUBDIRS =/ s/trml2pdf//' \
+   -i libgda-report/RML/Makefile.{am,in} || die
+
+   # Prevent file collisions with libgda:4
+   eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+   eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2018-12-28 Thread Mart Raudsepp
commit: 53dd6948675b603e6f3f0ee5a854730b722a10d9
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Dec 28 11:03:23 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Dec 28 11:06:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53dd6948

gnome-extra/libgda: require openssl-1.0*, add glib-utils dep

Bug: https://bugs.gentoo.org/666156
Closes: https://bugs.gentoo.org/668078
Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 gnome-extra/libgda/libgda-5.2.4-r2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
index 478c3717548..b45f3537357 100644
--- a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,7 @@ RDEPEND="
${PYTHON_DEPS}
dev-java/fop
dev-python/reportlab )
-   ssl? ( dev-libs/openssl:= )
+   ssl? ( =dev-db/sqlite-3.6.22:3=
vala? ( dev-libs/libgee:0.8 )
 "
@@ -61,6 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
>=app-text/gnome-doc-utils-0.9
app-text/yelp-tools
+   dev-util/glib-utils
dev-util/gtk-doc-am
>=dev-util/intltool-0.40.6
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2018-11-13 Thread Mart Raudsepp
commit: 804d2b9ed26c7b155d94ac9e04a9234836e73cdd
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Nov 13 22:01:04 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Nov 13 22:08:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d2b9e

Revert "gnome-extra/libgda: 5.2.5 version bump"

This reverts commit 880699bb699214cac6e4f6e99a369eeccca4ca43.

Unauthorized commit with the following issues:

* USE=vala completely broken.
  "configure: WARNING: unrecognized options: --enable-vala" should
  have given a hint, after blindly dropping a patch we had to fix
  this case properly.
* Wrong sqlite minimum dep

Issues inherited from old version, that would be routine for
maintainer to check over and fix:

* Missing glib-utils build dep
* Ineffective JRE 1.8 support patch (configure only is patched, but
  eautoreconf is called after patching)
* Lack of GNOME2_EAUTORECONF="yes" usage over manual autotools
  inherit and eautoreconf call (leads to double elibtoolize call,
  which is problematic for some edge cases and could QA warn)

Fixing vala takes some effort, hence a revert of commit that shouldn't
have been pushed (not acked by maintainer) for now, not immediate
follow-up fixes.

Bug: https://bugs.gentoo.org/666156
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-extra/libgda/Manifest|   1 -
 gnome-extra/libgda/libgda-5.2.5.ebuild | 177 -
 2 files changed, 178 deletions(-)

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 139b13ce55b..365859e91e4 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,2 +1 @@
 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 
567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1
 SHA512 
90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
-DIST libgda-5.2.5.tar.xz 12786512 BLAKE2B 
f1a60e581576c4b875feeba30989740a5fa20b838995e1a3be629ac8ec6369ceae214505bf93855a51b3760655abd179d5e4419ed30bebfb8592639ff29cf591
 SHA512 
81d05a67a76bbbeef8c171cb3a440168bcd32d404338d25f0525d668bdaa1e708189576ab580cf5a1fcfc51e5c4c35ee1f7fcd9b470f4896290924fd282eda8d

diff --git a/gnome-extra/libgda/libgda-5.2.5.ebuild 
b/gnome-extra/libgda/libgda-5.2.5.ebuild
deleted file mode 100644
index 42a137e3fff..000
--- a/gnome-extra/libgda/libgda-5.2.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/;
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
-   reports? ( ${PYTHON_REQUIRED_USE} )
-   canvas? ( gtk )
-   graphviz? ( gtk )
-   sourceview? ( gtk )
-   vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-   app-text/iso-codes
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/libxml2-2
-   dev-libs/libxslt
-   sys-libs/readline:0=
-   sys-libs/ncurses:0=
-   berkdb? ( sys-libs/db:* )
-   firebird? ( dev-db/firebird )
-   gnome-keyring? ( app-crypt/libsecret )
-   gtk? (
-   >=x11-libs/gtk+-3.0.0:3
-   canvas? ( x11-libs/goocanvas:2.0= )
-   sourceview? ( x11-libs/gtksourceview:3.0 )
-   graphviz? ( media-gfx/graphviz )
-   )
-   http? ( >=net-libs/libsoup-2.24:2.4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-   json? ( dev-libs/json-glib )
-   ldap? ( net-nds/openldap:= )
-   mdb? ( >app-office/mdbtools-0.5:= )
-   mysql? ( virtual/mysql:= )
-   postgres? ( dev-db/postgresql:= )
-   reports? (
-   ${PYTHON_DEPS}
-   dev-java/fop
-   dev-python/reportlab )
-   ssl? ( dev-libs/openssl:= )
-   >=dev-db/sqlite-3.6.22:3=
-   vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
-   >=app-text/gnome-doc-utils-0.9
-   app-text/yelp-tools
-   dev-util/gtk-doc-am
-   >=dev-util/intltool-0.40.6
-   virtual/pkgconfig
-   java? ( >=virtual/jdk-1.6 )
-   vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
-   test
-   firebird? ( bindist )
-"
-
-pkg_setup() {
-   

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2018-11-13 Thread Craig Andrews
commit: 880699bb699214cac6e4f6e99a369eeccca4ca43
Author: Craig Andrews  gentoo  org>
AuthorDate: Tue Nov  6 17:59:13 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Tue Nov 13 20:28:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880699bb

gnome-extra/libgda: 5.2.5 version bump

Closes: https://bugs.gentoo.org/666156
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews  gentoo.org>

 gnome-extra/libgda/Manifest|   1 +
 gnome-extra/libgda/libgda-5.2.5.ebuild | 177 +
 2 files changed, 178 insertions(+)

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 365859e91e4..139b13ce55b 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1 +1,2 @@
 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 
567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1
 SHA512 
90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
+DIST libgda-5.2.5.tar.xz 12786512 BLAKE2B 
f1a60e581576c4b875feeba30989740a5fa20b838995e1a3be629ac8ec6369ceae214505bf93855a51b3760655abd179d5e4419ed30bebfb8592639ff29cf591
 SHA512 
81d05a67a76bbbeef8c171cb3a440168bcd32d404338d25f0525d668bdaa1e708189576ab580cf5a1fcfc51e5c4c35ee1f7fcd9b470f4896290924fd282eda8d

diff --git a/gnome-extra/libgda/libgda-5.2.5.ebuild 
b/gnome-extra/libgda/libgda-5.2.5.ebuild
new file mode 100644
index 000..42a137e3fff
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/;
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+   reports? ( ${PYTHON_REQUIRED_USE} )
+   canvas? ( gtk )
+   graphviz? ( gtk )
+   sourceview? ( gtk )
+   vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   app-text/iso-codes
+   >=dev-libs/glib-2.32:2
+   >=dev-libs/libxml2-2
+   dev-libs/libxslt
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
+   berkdb? ( sys-libs/db:* )
+   firebird? ( dev-db/firebird )
+   gnome-keyring? ( app-crypt/libsecret )
+   gtk? (
+   >=x11-libs/gtk+-3.0.0:3
+   canvas? ( x11-libs/goocanvas:2.0= )
+   sourceview? ( x11-libs/gtksourceview:3.0 )
+   graphviz? ( media-gfx/graphviz )
+   )
+   http? ( >=net-libs/libsoup-2.24:2.4 )
+   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+   json? ( dev-libs/json-glib )
+   ldap? ( net-nds/openldap:= )
+   mdb? ( >app-office/mdbtools-0.5:= )
+   mysql? ( virtual/mysql:= )
+   postgres? ( dev-db/postgresql:= )
+   reports? (
+   ${PYTHON_DEPS}
+   dev-java/fop
+   dev-python/reportlab )
+   ssl? ( dev-libs/openssl:= )
+   >=dev-db/sqlite-3.6.22:3=
+   vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+   >=app-text/gnome-doc-utils-0.9
+   app-text/yelp-tools
+   dev-util/gtk-doc-am
+   >=dev-util/intltool-0.40.6
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.6 )
+   vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+   test
+   firebird? ( bindist )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+   use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # Fix compilation with -Werror=format-security (from 'master')
+   eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+   # Support JRE 1.8 (from Fedora)
+   eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+   use berkdb && append-cppflags "-I$(db_includedir)"
+
+   use reports ||
+   sed -e '/SUBDIRS =/ s/trml2html//' \
+   -e '/SUBDIRS =/ s/trml2pdf//' \
+   -i libgda-report/RML/Makefile.{am,in} || die
+
+   # Prevent file collisions with libgda:4
+   eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+   eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+   # Move files with mv (since epatch can't handle rename diffs) and
+ 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2017-11-26 Thread David Seifert
commit: f866579124f4e07b17300414f83fb7ab8a0b5914
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 11:51:16 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:00:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8665791

gnome-extra/libgda: [QA] Consistent whitespace in metadata.xml

 gnome-extra/libgda/metadata.xml | 25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index aae12a8f52c..c72a40986ea 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -1,17 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-gn...@gentoo.org
-Gentoo GNOME Desktop
-  
-  
-Enable support for x11-libs/goocanvas
-Enable embedded net-libs/libsoup based 
server
-Enable support for JSON format
-Enable support for Microsoft Access database using 
-   app-office/mdbtools
-Install tools for generating graphical reports
-Enable support for 
x11-libs/gtksourceview
-  
+   
+   gn...@gentoo.org
+   Gentoo GNOME Desktop
+   
+   
+   Enable support for 
x11-libs/goocanvas
+   Enable embedded net-libs/libsoup 
based server
+   Enable support for JSON format
+   Enable support for Microsoft Access database 
using app-office/mdbtools
+   Install tools for generating graphical 
reports
+   Enable support for 
x11-libs/gtksourceview
+   
 



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2017-02-15 Thread Mart Raudsepp
commit: 3b921e8f62f9c51cba8139d283896472c0d56a34
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Feb 15 19:58:29 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Feb 15 20:36:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b921e8f

gnome-extra/libgda: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 gnome-extra/libgda/libgda-5.2.4-r1.ebuild | 180 --
 1 file changed, 180 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
deleted file mode 100644
index 064ca8b361..00
--- a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.26" # configure explicitly checks for that version
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/;
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas firebird gnome-keyring gtk graphviz http +introspection 
json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
-   reports? ( ${PYTHON_REQUIRED_USE} )
-   canvas? ( gtk )
-   graphviz? ( gtk )
-   sourceview? ( gtk )
-   vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-   app-text/iso-codes
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/libxml2-2
-   dev-libs/libxslt
-   sys-libs/readline:0=
-   sys-libs/ncurses:0=
-   berkdb? ( sys-libs/db:* )
-   firebird? ( dev-db/firebird )
-   gnome-keyring? ( app-crypt/libsecret )
-   gtk? (
-   >=x11-libs/gtk+-3.0.0:3
-   canvas? ( x11-libs/goocanvas:2.0= )
-   sourceview? ( x11-libs/gtksourceview:3.0 )
-   graphviz? ( media-gfx/graphviz )
-   )
-   http? ( >=net-libs/libsoup-2.24:2.4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-   json? ( dev-libs/json-glib )
-   ldap? ( net-nds/openldap:= )
-   mdb? ( >app-office/mdbtools-0.5:= )
-   mysql? ( virtual/mysql:= )
-   postgres? ( dev-db/postgresql:= )
-   reports? (
-   ${PYTHON_DEPS}
-   dev-java/fop
-   dev-python/reportlab )
-   ssl? ( dev-libs/openssl:= )
-   >=dev-db/sqlite-3.6.22:3=
-   vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
-   >=app-text/gnome-doc-utils-0.9
-   app-text/yelp-tools
-   dev-util/gtk-doc-am
-   >=dev-util/intltool-0.40.6
-   virtual/pkgconfig
-   java? ( >=virtual/jdk-1.6 )
-   vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
-   test
-   firebird? ( bindist )
-"
-
-pkg_setup() {
-   java-pkg-opt-2_pkg_setup
-   use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   # Fix compilation with -Werror=format-security (from 'master')
-   epatch "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
-   # Support JRE 1.8 (from Fedora)
-   epatch "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
-   use berkdb && append-cppflags "-I$(db_includedir)"
-
-   use reports ||
-   sed -e '/SUBDIRS =/ s/trml2html//' \
-   -e '/SUBDIRS =/ s/trml2pdf//' \
-   -i libgda-report/RML/Makefile.{am,in} || die
-
-   # Prevent file collisions with libgda:4
-   epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-   epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-   # Move files with mv (since epatch can't handle rename diffs) and
-   # update pre-generated gtk-doc files (for non-git versions of libgda)
-   local f
-   for f in tools/browser/doc/gda-browser* ; do
-   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-   done
-   for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-   sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-   -i ${f} || die "sed ${f} failed"
-   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-   done
-   for f in control-center/data/*_gda-control-center.png ; do
-   mv ${f} 
${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-   die "mv ${f} failed"
-   done
-
-   eautoreconf
-   gnome2_src_prepare
-   

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/files/, gnome-extra/libgda/

2016-10-08 Thread Pacho Ramos
commit: ff6e5e947d763336a125b9e4ad0fd42e822aa61b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct  8 08:46:18 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct  8 09:50:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6e5e94

gnome-extra/libgda: Upstream patches to fix vala detection and allow the usage 
of newer slots.

Package-Manager: portage-2.3.1

 .../libgda/files/libgda-5.2.4-vala-check.patch |  35 
 gnome-extra/libgda/libgda-5.2.4-r2.ebuild  | 182 +
 2 files changed, 217 insertions(+)

diff --git a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch 
b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
new file mode 100644
index ..c586d49
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
@@ -0,0 +1,35 @@
+From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
+From: Vivien Malerba 
+Date: Sun, 7 Feb 2016 20:49:07 +0100
+Subject: Re-correction for bug #761424
+
+Automatic detection of API version
+---
+ configure.ac | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 152f676..9898a32 100644
+--- a/configure.ac
 b/configure.ac
+@@ -571,13 +571,13 @@ fi
+ vala_api="No Vala bindings will be generated"
+ if test "x$enable_vala" = "xyes"
+ then
+-  AM_PROG_VALAC([0.26.0])
++  AM_PROG_VALAC()
+   if test "x$VALA_API_VERSION" = "x"
+   then
+-  VAPIGEN_CHECK([0.26.0],[0.26],,no)
+-  vala_api="0.26 (Default)"
++  VAPIGEN_CHECK(,,,no)
++  vala_api="`pkg-config --modversion vapigen` (Default)"
+   else
+-  VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
++  VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
+   vala_api=$VALA_API_VERSION
+   fi
+ else
+-- 
+cgit v0.12
+

diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
new file mode 100644
index ..5210527
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/;
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http 
+introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+   reports? ( ${PYTHON_REQUIRED_USE} )
+   canvas? ( gtk )
+   graphviz? ( gtk )
+   sourceview? ( gtk )
+   vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   app-text/iso-codes
+   >=dev-libs/glib-2.32:2
+   >=dev-libs/libxml2-2
+   dev-libs/libxslt
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
+   berkdb? ( sys-libs/db:* )
+   firebird? ( dev-db/firebird )
+   gnome-keyring? ( app-crypt/libsecret )
+   gtk? (
+   >=x11-libs/gtk+-3.0.0:3
+   canvas? ( x11-libs/goocanvas:2.0= )
+   sourceview? ( x11-libs/gtksourceview:3.0 )
+   graphviz? ( media-gfx/graphviz )
+   )
+   http? ( >=net-libs/libsoup-2.24:2.4 )
+   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+   json? ( dev-libs/json-glib )
+   ldap? ( net-nds/openldap:= )
+   mdb? ( >app-office/mdbtools-0.5:= )
+   mysql? ( virtual/mysql:= )
+   postgres? ( dev-db/postgresql:= )
+   reports? (
+   ${PYTHON_DEPS}
+   dev-java/fop
+   dev-python/reportlab )
+   ssl? ( dev-libs/openssl:= )
+   >=dev-db/sqlite-3.6.22:3=
+   vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+   >=app-text/gnome-doc-utils-0.9
+   app-text/yelp-tools
+   dev-util/gtk-doc-am
+   >=dev-util/intltool-0.40.6
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.6 )
+   vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+   test
+   firebird? ( bindist )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+   use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # Fix compilation with -Werror=format-security (from 'master')
+   eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+   # Support JRE 1.8 (from Fedora)
+   eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+   # Fix vala test,
+   # 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2016-10-08 Thread Pacho Ramos
commit: d3d5ab31cd81b2f5795ae371cdb0b75875251c62
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct  8 08:46:49 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct  8 09:50:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d5ab31

gnome-extra/libgda: Drop old

Package-Manager: portage-2.3.1

 gnome-extra/libgda/libgda-5.2.4.ebuild | 168 -
 1 file changed, 168 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.4.ebuild 
b/gnome-extra/libgda/libgda-5.2.4.ebuild
deleted file mode 100644
index f7c0721..
--- a/gnome-extra/libgda/libgda-5.2.4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.26" # configure explicitly checks for that version
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/;
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas firebird gnome-keyring gtk graphviz http +introspection 
json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
-   reports? ( ${PYTHON_REQUIRED_USE} )
-   canvas? ( gtk )
-   graphviz? ( gtk )
-   sourceview? ( gtk )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-   app-text/iso-codes
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/libxml2-2
-   dev-libs/libxslt
-   sys-libs/readline:0=
-   sys-libs/ncurses:0=
-   berkdb? ( sys-libs/db:* )
-   firebird? ( dev-db/firebird )
-   gnome-keyring? ( app-crypt/libsecret )
-   gtk? (
-   >=x11-libs/gtk+-3.0.0:3
-   canvas? ( x11-libs/goocanvas:2.0= )
-   sourceview? ( x11-libs/gtksourceview:3.0 )
-   graphviz? ( media-gfx/graphviz )
-   )
-   http? ( >=net-libs/libsoup-2.24:2.4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-   json? ( dev-libs/json-glib )
-   ldap? ( net-nds/openldap:= )
-   mdb? ( >app-office/mdbtools-0.5:= )
-   mysql? ( virtual/mysql:= )
-   postgres? ( dev-db/postgresql:= )
-   reports? (
-   ${PYTHON_DEPS}
-   dev-java/fop
-   dev-python/reportlab )
-   ssl? ( dev-libs/openssl:= )
-   >=dev-db/sqlite-3.6.22:3=
-   vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
-   >=app-text/gnome-doc-utils-0.9
-   app-text/yelp-tools
-   dev-util/gtk-doc-am
-   >=dev-util/intltool-0.40.6
-   virtual/pkgconfig
-   java? ( >=virtual/jdk-1.6 )
-   vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
-   test
-   firebird? ( bindist )
-"
-
-pkg_setup() {
-   java-pkg-opt-2_pkg_setup
-   use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   # Fix compilation with -Werror=format-security (from 'master')
-   epatch "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
-   # Support JRE 1.8 (from Fedora)
-   epatch "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
-   use berkdb && append-cppflags "-I$(db_includedir)"
-
-   use reports ||
-   sed -e '/SUBDIRS =/ s/trml2html//' \
-   -e '/SUBDIRS =/ s/trml2pdf//' \
-   -i libgda-report/RML/Makefile.{am,in} || die
-
-   # Prevent file collisions with libgda:4
-   epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-   epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-   # Move files with mv (since epatch can't handle rename diffs) and
-   # update pre-generated gtk-doc files (for non-git versions of libgda)
-   local f
-   for f in tools/browser/doc/gda-browser* ; do
-   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-   done
-   for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-   sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-   -i ${f} || die "sed ${f} failed"
-   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-   done
-   for f in control-center/data/*_gda-control-center.png ; do
-   mv ${f} 
${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-   die "mv ${f} failed"
-   done
-
-   eautoreconf
-   gnome2_src_prepare
-   java-pkg-opt-2_src_prepare
-   use vala && vala_src_prepare
-}
-
-src_configure() 

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2016-03-06 Thread Mikle Kolyada
commit: b82303866f5c486a1174841a4badb420ef03
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar  6 18:51:49 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar  6 18:55:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8230386

gnome-extra/libgda: x86 stable wrt bug #566378

Package-Manager: portage-2.2.26

 gnome-extra/libgda/libgda-5.2.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
index 082ba45..064ca8b 100644
--- a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
app-text/iso-codes



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2016-02-08 Thread Patrick Lauer
commit: fcc7258c51ffb03e02e0bc5ccd0136f31d1ac551
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Feb  8 09:53:26 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Mon Feb  8 09:53:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc7258c

gnome-extra/libgda: Remove unneeded useflag description from metadata.xml

Package-Manager: portage-2.2.27

 gnome-extra/libgda/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 2a4ddf7..aae12a8 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -8,8 +8,6 @@
   
 Enable support for x11-libs/goocanvas
 Enable embedded net-libs/libsoup based 
server
-   Enable app-crypt/libsecret support to
-   store login credentials
 Enable support for JSON format
 Enable support for Microsoft Access database using 
app-office/mdbtools



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2016-02-01 Thread Pacho Ramos
commit: a34be74cd2534fc1e1eb1a33d8309e038b88d016
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Feb  1 20:50:12 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Feb  1 21:05:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34be74c

gnome-extra/libgda: Drop old

Package-Manager: portage-2.2.27

 gnome-extra/libgda/Manifest|   1 -
 gnome-extra/libgda/libgda-5.2.2.ebuild | 154 -
 2 files changed, 155 deletions(-)

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 93b2ada..a2c43a8 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,2 +1 @@
-DIST libgda-5.2.2.tar.xz 12173216 SHA256 
c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4 SHA512 
b09ef364c3357a58b17508a39ee53ef462baa54bb3c8af580d23fd2771b034355092ecdb7ef29b29dd08533394a702f12b838732c712fb6b3a04b6b201cd3c74
 WHIRLPOOL 
463efc5825be741d55ab6741d250f537537d59c71d926c20c7202f384e5c7c9b2bcc49419a796df4bfa5e9248f59bcf12aa8331495c3aae7d56408f295c0693f
 DIST libgda-5.2.4.tar.xz 12320228 SHA256 
2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e SHA512 
90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
 WHIRLPOOL 
fee9884ed9edb48603f0ce924316f00d2f38d490147d8c48e512cfd8f1282bd555f1767a56160afc2781b84c1a33466f42a12d4c5115e70af481c54c037bf519

diff --git a/gnome-extra/libgda/libgda-5.2.2.ebuild 
b/gnome-extra/libgda/libgda-5.2.2.ebuild
deleted file mode 100644
index 696604c..000
--- a/gnome-extra/libgda/libgda-5.2.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-#VALA_MIN_API_VERSION="0.18"
-#VALA_MAX_API_VERSION="0.18" # configure explicitly checks for 0.18
-#VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 # vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/;
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas firebird gtk graphviz http +introspection json ldap 
libsecret mdb mysql oci8 postgres reports sourceview ssl" # vala
-REQUIRED_USE="
-   reports? ( ${PYTHON_REQUIRED_USE} )
-   canvas? ( gtk )
-   graphviz? ( gtk )
-   sourceview? ( gtk )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-   app-text/iso-codes
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/libxml2-2
-   dev-libs/libxslt
-   sys-libs/readline:0=
-   sys-libs/ncurses:0=
-   berkdb?   ( sys-libs/db:* )
-   firebird? ( dev-db/firebird )
-   gtk? (
-   >=x11-libs/gtk+-3.0.0:3
-   canvas? ( x11-libs/goocanvas:2.0= )
-   sourceview? ( x11-libs/gtksourceview:3.0 )
-   graphviz? ( media-gfx/graphviz )
-   )
-   http? ( >=net-libs/libsoup-2.24:2.4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.30 )
-   json? ( dev-libs/json-glib )
-   ldap? ( net-nds/openldap:= )
-   libsecret? ( app-crypt/libsecret )
-   mdb?  ( >app-office/mdbtools-0.5:= )
-   mysql?( virtual/mysql:= )
-   postgres? ( dev-db/postgresql:= )
-   reports? (
-   ${PYTHON_DEPS}
-   dev-java/fop
-   dev-python/reportlab )
-   ssl?  ( dev-libs/openssl:= )
-   >=dev-db/sqlite-3.6.22:3=
-"
-#  vala? ( dev-libs/libgee:0.8 )
-DEPEND="${RDEPEND}
-   >=app-text/gnome-doc-utils-0.9
-   app-text/yelp-tools
-   dev-util/gtk-doc-am
-   >=dev-util/intltool-0.40.6
-   virtual/pkgconfig
-   java? ( virtual/jdk:1.6 )"
-#  vala? ( $(vala_depend) )
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="test
-   firebird? ( bindist )"
-
-pkg_setup() {
-   java-pkg-opt-2_pkg_setup
-   use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   use berkdb && append-cppflags "-I$(db_includedir)"
-
-   use reports ||
-   sed -e '/SUBDIRS =/ s/trml2html//' \
-   -e '/SUBDIRS =/ s/trml2pdf//' \
-   -i libgda-report/RML/Makefile.{am,in} || die
-
-   # Prevent file collisions with libgda:4
-   epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-   epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-   # Move files with mv (since epatch can't handle rename diffs) and
-   # update pre-generated gtk-doc files (for non-git versions of libgda)
-   local f
-   for f in tools/browser/doc/gda-browser* ; do
-   

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2016-01-03 Thread Gilles Dartiguelongue
commit: 45bb6d88c8c95b7633ed3c4b69db87aff5833d31
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Jan  3 16:03:13 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Jan  3 16:03:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bb6d88

gnome-extra/libgda: fix introspection/vala/gtk USE flag dependencies, bug 
#563174

Package-Manager: portage-2.2.26

 gnome-extra/libgda/libgda-5.2.4-r1.ebuild | 180 ++
 1 file changed, 180 insertions(+)

diff --git a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild 
b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
new file mode 100644
index 000..221aa1c
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.26" # configure explicitly checks for that version
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 
python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/;
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas firebird gnome-keyring gtk graphviz http +introspection 
json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+   reports? ( ${PYTHON_REQUIRED_USE} )
+   canvas? ( gtk )
+   graphviz? ( gtk )
+   sourceview? ( gtk )
+   vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   app-text/iso-codes
+   >=dev-libs/glib-2.32:2
+   >=dev-libs/libxml2-2
+   dev-libs/libxslt
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
+   berkdb? ( sys-libs/db:* )
+   firebird? ( dev-db/firebird )
+   gnome-keyring? ( app-crypt/libsecret )
+   gtk? (
+   >=x11-libs/gtk+-3.0.0:3
+   canvas? ( x11-libs/goocanvas:2.0= )
+   sourceview? ( x11-libs/gtksourceview:3.0 )
+   graphviz? ( media-gfx/graphviz )
+   )
+   http? ( >=net-libs/libsoup-2.24:2.4 )
+   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+   json? ( dev-libs/json-glib )
+   ldap? ( net-nds/openldap:= )
+   mdb? ( >app-office/mdbtools-0.5:= )
+   mysql? ( virtual/mysql:= )
+   postgres? ( dev-db/postgresql:= )
+   reports? (
+   ${PYTHON_DEPS}
+   dev-java/fop
+   dev-python/reportlab )
+   ssl? ( dev-libs/openssl:= )
+   >=dev-db/sqlite-3.6.22:3=
+   vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+   >=app-text/gnome-doc-utils-0.9
+   app-text/yelp-tools
+   dev-util/gtk-doc-am
+   >=dev-util/intltool-0.40.6
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.6 )
+   vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+   test
+   firebird? ( bindist )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+   use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # Fix compilation with -Werror=format-security (from 'master')
+   epatch "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+   # Support JRE 1.8 (from Fedora)
+   epatch "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+   use berkdb && append-cppflags "-I$(db_includedir)"
+
+   use reports ||
+   sed -e '/SUBDIRS =/ s/trml2html//' \
+   -e '/SUBDIRS =/ s/trml2pdf//' \
+   -i libgda-report/RML/Makefile.{am,in} || die
+
+   # Prevent file collisions with libgda:4
+   epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+   epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+   # Move files with mv (since epatch can't handle rename diffs) and
+   # update pre-generated gtk-doc files (for non-git versions of libgda)
+   local f
+   for f in tools/browser/doc/gda-browser* ; do
+   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+   done
+   for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+   sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+   -i ${f} || die "sed ${f} failed"
+   mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+   done
+   for f in control-center/data/*_gda-control-center.png ; do
+   mv ${f} 
${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+   die "mv ${f} failed"
+   done
+
+   eautoreconf
+   

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2015-12-25 Thread Dennis Lamm
commit: cac0938d848a2ba024f13f73d5b95e5434d79174
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sat Dec 26 05:39:18 2015 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sat Dec 26 05:39:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac0938d

gnome-extra/libgda: fix RDEPEND 5.2.2

Package-Manager: portage-2.2.24

 gnome-extra/libgda/libgda-5.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.2.ebuild 
b/gnome-extra/libgda/libgda-5.2.2.ebuild
index 955f8e4..696604c 100644
--- a/gnome-extra/libgda/libgda-5.2.2.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
dev-libs/libxslt
sys-libs/readline:0=
sys-libs/ncurses:0=
-   berkdb?   ( sys-libs/db )
+   berkdb?   ( sys-libs/db:* )
firebird? ( dev-db/firebird )
gtk? (
>=x11-libs/gtk+-3.0.0:3



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2015-09-07 Thread Mikle Kolyada
commit: 4783954d85c397f5bb273884aa56f990e43a459a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Sep  7 21:02:43 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Sep  7 21:08:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4783954d

gnome-extra/libgda: amd64 stable wrt bug #551826

Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches

 gnome-extra/libgda/libgda-5.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/libgda/libgda-5.2.4.ebuild 
b/gnome-extra/libgda/libgda-5.2.4.ebuild
index 1d46a0d..ab0450c 100644
--- a/gnome-extra/libgda/libgda-5.2.4.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
app-text/iso-codes



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/

2015-08-30 Thread Alexandre Rostovtsev
commit: 004b96698f3694988497f8677def7911195039d2
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Mon Aug 31 00:21:27 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Mon Aug 31 00:21:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004b9669

gnome-extra/libgda: ncurses and readline have multiple slots

Package-Manager: portage-2.2.20.1

 gnome-extra/libgda/libgda-5.2.2.ebuild | 4 ++--
 gnome-extra/libgda/libgda-5.2.4.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/libgda/libgda-5.2.2.ebuild 
b/gnome-extra/libgda/libgda-5.2.2.ebuild
index 1e05846..955f8e4 100644
--- a/gnome-extra/libgda/libgda-5.2.2.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.2.ebuild
@@ -33,8 +33,8 @@ RDEPEND=
=dev-libs/glib-2.32:2
=dev-libs/libxml2-2
dev-libs/libxslt
-   sys-libs/readline:=
-   sys-libs/ncurses:=
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
berkdb?   ( sys-libs/db )
firebird? ( dev-db/firebird )
gtk? (

diff --git a/gnome-extra/libgda/libgda-5.2.4.ebuild 
b/gnome-extra/libgda/libgda-5.2.4.ebuild
index 781520d..1d46a0d 100644
--- a/gnome-extra/libgda/libgda-5.2.4.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4.ebuild
@@ -33,8 +33,8 @@ RDEPEND=
=dev-libs/glib-2.32:2
=dev-libs/libxml2-2
dev-libs/libxslt
-   sys-libs/readline:=
-   sys-libs/ncurses:=
+   sys-libs/readline:0=
+   sys-libs/ncurses:0=
berkdb? ( sys-libs/db:* )
firebird? ( dev-db/firebird )
gnome-keyring? ( app-crypt/libsecret )