* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2011-02-09 22:00 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-02-09 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 3ce6c5708fff3360049001c828691f7dcf59c9f4
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 9 20:47:30 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb 9 20:47:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ce6c570
gnome-extra/libgda: don't set keywords for live version
---
| 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index 6b5b6a6..057d623 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
@@ -14,7 +14,12 @@ LICENSE="GPL-2 LGPL-2"
# MDB support currently works with CVS only, so disable it in the meantime
IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
# FIXME: sqlite is automagic, but maybe it is a hard-dep
# FIXME: autoconf is a hell of inconsistencies
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2011-02-27 15:30 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2011-02-27 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 119eb33e65430e85674d3e4397403478e86ed397
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 15:27:00 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 15:27:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=119eb33e
gnome-extra/libgda: pin dependencies to appropriate slot
---
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index 057d623..b532c7d 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
>=dev-libs/glib-2.16:2
>=dev-libs/libxml2-2
dev-libs/libxslt
- dev-libs/libunique
+ dev-libs/libunique:1
sys-libs/readline
sys-libs/ncurses
berkdb? ( sys-libs/db )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2011-03-06 20:22 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-06 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 6ca296b01c2cb85cd4e37a94af790d63d5e388ad
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 6 19:41:50 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 20:19:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6ca296b0
Add gnome-extra/libgda-4.99.0, slot 5
---
.../{libgda-9999.ebuild => libgda-4.99.0.ebuild} | 23 +++++++++++++------
| 23 +++++++++++++------
2 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-4.99.0.ebuild
similarity index 89%
copy from gnome-extra/libgda/libgda-9999.ebuild
copy to gnome-extra/libgda/libgda-4.99.0.ebuild
index b532c7d..5bfcf0e 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-4.99.0.ebuild
@@ -3,9 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
EAPI="3"
+GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
-inherit db-use eutils flag-o-matic gnome2 gnome2-live java-pkg-opt-2
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
DESCRIPTION="Gnome Database Access Library"
HOMEPAGE="http://www.gnome-db.org/"
@@ -13,9 +14,10 @@ LICENSE="GPL-2 LGPL-2"
# MDB support currently works with CVS only, so disable it in the meantime
IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
-SLOT="4"
+SLOT="5"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
+ EGIT_BRANCH="gtk3"
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -28,15 +30,15 @@ RDEPEND="
>=dev-libs/glib-2.16:2
>=dev-libs/libxml2-2
dev-libs/libxslt
- dev-libs/libunique:1
+ dev-libs/libunique:3
sys-libs/readline
sys-libs/ncurses
berkdb? ( sys-libs/db )
!bindist? ( firebird? ( dev-db/firebird ) )
gtk? (
- >=x11-libs/gtk+-2.12:2
- canvas? ( x11-libs/goocanvas )
- sourceview? ( x11-libs/gtksourceview:2.0 )
+ >=x11-libs/gtk+-3.0.0:3
+ canvas? ( x11-libs/goocanvas:2.0 )
+ sourceview? ( x11-libs/gtksourceview:3.0 )
graphviz? ( media-gfx/graphviz )
)
gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
@@ -114,9 +116,16 @@ src_prepare() {
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
- gnome2-live_src_prepare
+ gnome2_src_prepare
}
src_test() {
emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
}
+
+src_install() {
+ gnome2_src_install
+
+ # File-collisions. How do we handle this?
+ rm -rf "${ED}"/usr/bin/gda_trml2* || die
+}
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index b532c7d..5bfcf0e 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -3,9 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
EAPI="3"
+GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
-inherit db-use eutils flag-o-matic gnome2 gnome2-live java-pkg-opt-2
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
DESCRIPTION="Gnome Database Access Library"
HOMEPAGE="http://www.gnome-db.org/"
@@ -13,9 +14,10 @@ LICENSE="GPL-2 LGPL-2"
# MDB support currently works with CVS only, so disable it in the meantime
IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
-SLOT="4"
+SLOT="5"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
+ EGIT_BRANCH="gtk3"
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -28,15 +30,15 @@ RDEPEND="
>=dev-libs/glib-2.16:2
>=dev-libs/libxml2-2
dev-libs/libxslt
- dev-libs/libunique:1
+ dev-libs/libunique:3
sys-libs/readline
sys-libs/ncurses
berkdb? ( sys-libs/db )
!bindist? ( firebird? ( dev-db/firebird ) )
gtk? (
- >=x11-libs/gtk+-2.12:2
- canvas? ( x11-libs/goocanvas )
- sourceview? ( x11-libs/gtksourceview:2.0 )
+ >=x11-libs/gtk+-3.0.0:3
+ canvas? ( x11-libs/goocanvas:2.0 )
+ sourceview? ( x11-libs/gtksourceview:3.0 )
graphviz? ( media-gfx/graphviz )
)
gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
@@ -114,9 +116,16 @@ src_prepare() {
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
- gnome2-live_src_prepare
+ gnome2_src_prepare
}
src_test() {
emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
}
+
+src_install() {
+ gnome2_src_install
+
+ # File-collisions. How do we handle this?
+ rm -rf "${ED}"/usr/bin/gda_trml2* || die
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2011-07-06 18:29 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2011-07-06 18:29 UTC (permalink / raw
To: gentoo-commits
commit: e0a3dc1a734daf1c433e6ceb90004185924b0b71
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 6 18:26:11 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 6 18:26:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e0a3dc1a
gnome-extra/libgda: 4.99.2 → 4.99.3
Version bump, adds suport for postgresql ILIKE, gets rid of deprecated
APIs for gtk+-3.2.
---
.../{libgda-4.99.2.ebuild => libgda-4.99.3.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/gnome-extra/libgda/libgda-4.99.2.ebuild b/gnome-extra/libgda/libgda-4.99.3.ebuild
similarity index 100%
rename from gnome-extra/libgda/libgda-4.99.2.ebuild
rename to gnome-extra/libgda/libgda-4.99.3.ebuild
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2011-10-01 21:01 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2011-10-01 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 44bbe9e74ae39113bdaa5f8b83f61cdbcb253daa
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Oct 1 20:58:49 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 1 20:58:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=44bbe9e7
gnome-extra/libgda: build needs XDG_DATA_HOME (#385251)
Looks like with some combination of USE flags, the build is trying to
access XDG_DATA_HOME, so we need to define it under $T, like in
libgda-4.2.x. Thanks to Henrique Dias <henrique.ribeiro.dias <AT> gmail.com>
for reporting in bug #385251.
---
| 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index f838a18..ae702c3 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -110,6 +110,8 @@ pkg_setup() {
# Not in portage
G2CONF="${G2CONF}
--disable-default-binary"
+
+ export XDG_DATA_HOME="${T}/.local"
}
src_prepare() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2012-12-18 22:18 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-18 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 6335bb882d4c3315208b66e3f26ae5fe08f5797a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 22:18:30 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 22:18:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6335bb88
gnome-extra/libgda: moved to gx86
* Loosely sync live ebuild with gx86
* Add metadata.xml
---
| 171 --------------------------------
| 106 +++++++++-----------
| 14 +++
3 files changed, 64 insertions(+), 227 deletions(-)
diff --git a/gnome-extra/libgda/libgda-5.1.1.ebuild b/gnome-extra/libgda/libgda-5.1.1.ebuild
deleted file mode 100644
index 2d07ee5..0000000
--- a/gnome-extra/libgda/libgda-5.1.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
-#VALA_MIN_API_VERSION="0.16"
-#VALA_MAX_API_VERSION="0.16" # configure explicitly checks for 0.16
-#VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python # vala
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala
-SLOT="5"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2
- dev-libs/libxslt
- sys-libs/readline
- sys-libs/ncurses
- berkdb? ( sys-libs/db )
- !bindist? ( 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 )
- )
- gnome-keyring? ( app-crypt/libsecret )
- 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-base )
- ssl? ( dev-libs/openssl )
- >=dev-db/sqlite-3.6.22:3"
-
-DEPEND="${RDEPEND}
- >=app-text/gnome-doc-utils-0.9
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- java? ( virtual/jdk:1.6 )"
-# vala? ( $(vala_depend) )
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
- doc? (
- >=dev-util/gtk-doc-1.14
- vala? ( app-text/yelp-tools ) )"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-RESTRICT="test"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS README"
-
- if use canvas || use graphviz || use sourceview; then
- if ! use gtk; then
- ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
- ewarn "Disabling for now."
- G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
- else
- G2CONF="${G2CONF}
- $(use_with canvas goocanvas)
- $(use_with graphviz)
- $(use_with sourceview gtksourceview)"
- fi
- fi
-
- G2CONF="${G2CONF}
- --disable-scrollkeeper
- --disable-static
- --enable-system-sqlite
- $(use_with berkdb bdb /usr)
- $(use_with gnome-keyring)
- $(use_with gtk ui)
- $(use_with http libsoup)
- $(use_enable introspection)
- $(use_with java java $JAVA_HOME)
- $(use_enable json)
- $(use_with ldap)
- $(use_with mdb mdb /usr)
- $(use_with mysql mysql /usr)
- $(use_with postgres postgres /usr)
- $(use_enable ssl crypto)
- --disable-vala"
- # vala bindings fail to build
-
- if use bindist; then
- # firebird license is not GPL compatible
- G2CONF="${G2CONF} --without-firebird"
- else
- G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
- fi
-
- use berkdb && append-cppflags "-I$(db_includedir)"
- use oci8 || G2CONF="${G2CONF} --without-oracle"
-
- # Not in portage
- G2CONF="${G2CONF}
- --disable-default-binary"
-
- # Prevent file collisions with libgda:4
- epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
- 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
- if [[ ${PV} != 9999 ]] ; then
- 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
- fi
- 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
-
- python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
- [[ ${PV} = 9999 ]] || eautoreconf
- gnome2_src_prepare
- java-pkg-opt-2_src_prepare
- use vala && vala_src_prepare
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- local d
- for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
- python_mod_optimize ${d}
- done
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- local d
- for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
- python_mod_cleanup ${d}
- done
-}
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index 5362369..bc3fa69 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
@@ -14,13 +14,18 @@ if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
-DESCRIPTION="Gnome Database Access Library"
+DESCRIPTION="Gnome database access library"
HOMEPAGE="http://www.gnome-db.org/"
LICENSE="GPL-2+ LGPL-2+"
-IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
-REQUIRED_USE="vala? ( introspection )"
-SLOT="5"
+IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="canvas? ( gtk )
+ firebird? ( !bindist )
+ graphviz? ( gtk )
+ sourceview? ( gtk )
+ vala? ( introspection )"
+# firebird license is not GPL compatible
+SLOT="5/4" # subslot = libgda-5.0 soname version
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
@@ -33,13 +38,13 @@ RDEPEND="
>=dev-libs/glib-2.32:2
>=dev-libs/libxml2-2
dev-libs/libxslt
- sys-libs/readline
- sys-libs/ncurses
+ sys-libs/readline:=
+ sys-libs/ncurses:=
berkdb? ( sys-libs/db )
!bindist? ( firebird? ( dev-db/firebird ) )
gtk? (
>=x11-libs/gtk+-3.0.0:3
- canvas? ( x11-libs/goocanvas:2.0 )
+ canvas? ( x11-libs/goocanvas:2.0= )
sourceview? ( x11-libs/gtksourceview:3.0 )
graphviz? ( media-gfx/graphviz )
)
@@ -47,24 +52,31 @@ RDEPEND="
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-base )
- ssl? ( dev-libs/openssl )
- >=dev-db/sqlite-3.6.22:3"
-
+ ldap? ( net-nds/openldap:= )
+ mdb? ( >app-office/mdbtools-0.5:= )
+ mysql? ( virtual/mysql:= )
+ postgres? ( dev-db/postgresql-base:= )
+ reports? (
+ ${PYTHON_DEPS}
+ dev-java/fop
+ dev-python/reportlab )
+ ssl? ( dev-libs/openssl:= )
+ >=dev-db/sqlite-3.6.22:3=
+"
DEPEND="${RDEPEND}
>=app-text/gnome-doc-utils-0.9
dev-util/gtk-doc-am
>=dev-util/intltool-0.40.6
virtual/pkgconfig
java? ( virtual/jdk:1.6 )
- vala? ( $(vala_depend) )"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
- doc? (
- >=dev-util/gtk-doc-1.14
- vala? ( app-text/yelp-tools ) )"
+ vala? ( $(vala_depend) )
+"
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/yelp-tools
+ doc? ( >=dev-util/gtk-doc-1.14 )
+ vala? ( $(vala_depend) )"
+fi
pkg_setup() {
java-pkg-opt-2_pkg_setup
@@ -73,27 +85,14 @@ pkg_setup() {
}
src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS README"
-
- if use canvas || use graphviz || use sourceview; then
- if ! use gtk; then
- ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
- ewarn "Disabling for now."
- G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
- else
- G2CONF="${G2CONF}
- $(use_with canvas goocanvas)
- $(use_with graphviz)
- $(use_with sourceview gtksourceview)"
- fi
- fi
-
G2CONF="${G2CONF}
- --disable-scrollkeeper
--disable-static
--enable-system-sqlite
$(use_with berkdb bdb /usr)
+ $(use_with canvas goocanvas)
+ $(use_with firebird firebird /usr)
$(use_with gnome-keyring)
+ $(use_with graphviz)
$(use_with gtk ui)
$(use_with http libsoup)
$(use_enable introspection)
@@ -104,6 +103,8 @@ src_prepare() {
$(use_with mysql mysql /usr)
$(use_with postgres postgres /usr)
$(use_enable ssl crypto)
+ $(use_with sourceview gtksourceview)
+ --disable-default-binary
$(use_enable vala)"
if use bindist; then
@@ -116,9 +117,10 @@ src_prepare() {
use berkdb && append-cppflags "-I$(db_includedir)"
use oci8 || G2CONF="${G2CONF} --without-oracle"
- # Not in portage
- G2CONF="${G2CONF}
- --disable-default-binary"
+ 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-help-collision.patch"
@@ -142,26 +144,18 @@ src_prepare() {
die "mv ${f} failed"
done
- python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
[[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
java-pkg-opt-2_src_prepare
use vala && vala_src_prepare
}
-pkg_postinst() {
- gnome2_pkg_postinst
- local d
- for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
- python_mod_optimize ${d}
- done
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- local d
- for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
- python_mod_cleanup ${d}
- done
+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
}
--git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
new file mode 100644
index 0000000..ef8617e
--- /dev/null
+++ b/gnome-extra/libgda/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
+ <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+ <flag name="json">Enable support for JSON format</flag>
+ <flag name="mdb">Enable support for Microsoft Access database using
+ <pkg>app-office/mdbtools</pkg></flag>
+ <flag name="reports">Install tools for generating graphical reports</flag>
+ <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2012-12-30 3:03 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-30 3:03 UTC (permalink / raw
To: gentoo-commits
commit: 14b65048437503a29a7a3a15943e75a4fa9e75e8
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 03:02:37 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 03:03:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=14b65048
gnome-extra/libgda: add bindist and vala flag descriptions
---
| 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
--git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index ef8617e..306a0f5 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -3,6 +3,8 @@
<pkgmetadata>
<herd>gnome</herd>
<use>
+ <flag name="bindist">Disable support for <pkg>dev-db/firebird</pkg> database
+ which is not GPL compatible.</flag>
<flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
<flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
<flag name="json">Enable support for JSON format</flag>
@@ -10,5 +12,6 @@
<pkg>app-office/mdbtools</pkg></flag>
<flag name="reports">Install tools for generating graphical reports</flag>
<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2014-11-02 15:58 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-02 15:58 UTC (permalink / raw
To: gentoo-commits
commit: a3a6a13413d8944b5389af461418378c4de71f2b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 2 14:31:53 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 2 14:31:53 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a3a6a134
gnome-extra/libgda: sync with gentoo-x86
Fix repoman warnings as well.
---
| 7 +++----
| 4 +++-
2 files changed, 6 insertions(+), 5 deletions(-)
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index 03888c8..ad28e36 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -5,11 +5,11 @@
EAPI="5"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python vala
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -63,7 +63,7 @@ RDEPEND="
reports? (
${PYTHON_DEPS}
dev-java/fop
- dev-python/reportlab )
+ dev-python/reportlab[${PYTHON_USEDEP}] )
ssl? ( dev-libs/openssl:= )
>=dev-db/sqlite-3.6.22:3=
"
@@ -94,7 +94,6 @@ src_prepare() {
-i libgda-report/RML/Makefile.{am,in} || die
# Prevent file collisions with libgda:4
- epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
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
--git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 306a0f5..c7fcdf4 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -7,8 +7,10 @@
which is not GPL compatible.</flag>
<flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
<flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+ <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to
+ store login credentials</flag>
<flag name="json">Enable support for JSON format</flag>
- <flag name="mdb">Enable support for Microsoft Access database using
+ <flag name="mdb">Enable support for Microsoft Access database using
<pkg>app-office/mdbtools</pkg></flag>
<flag name="reports">Install tools for generating graphical reports</flag>
<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/
@ 2015-05-13 7:33 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-13 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 4b17080cf6c2facaca4df93daabc446cc60d9770
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 07:33:05 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed May 13 07:33:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4b17080c
gnome-extra/libgda: sync with gentoo-x86
Remove unused gnome-doc-utils, replaced by yelp-tools.
| 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index ad28e36..145663f 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,6 +7,7 @@ GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
PYTHON_COMPAT=( python2_7 )
VALA_MIN_API_VERSION="0.18"
+VALA_MAX_API_VERSION="0.26"
VALA_USE_DEPEND="vapigen"
inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
@@ -18,11 +19,10 @@ DESCRIPTION="GNOME database access library"
HOMEPAGE="http://www.gnome-db.org/"
LICENSE="GPL-2+ LGPL-2+"
-IUSE="berkdb bindist canvas firebird gtk graphviz http +introspection json ldap libsecret mdb mysql oci8 postgres reports sourceview ssl vala"
+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 )
- firebird? ( !bindist )
graphviz? ( gtk )
sourceview? ( gtk )
vala? ( introspection )
@@ -44,8 +44,8 @@ RDEPEND="
dev-libs/libxslt
sys-libs/readline:=
sys-libs/ncurses:=
- berkdb? ( sys-libs/db )
- !bindist? ( firebird? ( dev-db/firebird ) )
+ berkdb? ( sys-libs/db:= )
+ firebird? ( dev-db/firebird )
gtk? (
>=x11-libs/gtk+-3.0.0:3
canvas? ( x11-libs/goocanvas:2.0= )
@@ -59,17 +59,18 @@ RDEPEND="
libsecret? ( app-crypt/libsecret )
mdb? ( >app-office/mdbtools-0.5:= )
mysql? ( virtual/mysql:= )
- postgres? ( dev-db/postgresql-base:= )
+ postgres? ( dev-db/postgresql:= )
reports? (
${PYTHON_DEPS}
dev-java/fop
dev-python/reportlab[${PYTHON_USEDEP}] )
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
- dev-util/gtk-doc-am
+ app-text/yelp-tools
+ >=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40.6
virtual/pkgconfig
java? ( virtual/jdk:1.6 )
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-05-13 7:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-01 21:01 [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2015-05-13 7:33 Gilles Dartiguelongue
2014-11-02 15:58 Gilles Dartiguelongue
2012-12-30 3:03 Alexandre Rostovtsev
2012-12-18 22:18 Gilles Dartiguelongue
2011-07-06 18:29 Alexandre Restovtsev
2011-03-06 20:22 Nirbheek Chauhan
2011-02-27 15:30 Gilles Dartiguelongue
2011-02-09 22:00 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox