diff options
| -rw-r--r-- | gnome-extra/libgda/ChangeLog | 10 | ||||
| -rw-r--r-- | gnome-extra/libgda/libgda-4.2.9.ebuild | 125 | ||||
| -rw-r--r-- | gnome-extra/libgda/libgda-5.0.2.ebuild | 154 | ||||
| -rw-r--r-- | gnome-extra/libgda/libgda-5.0.3-r1.ebuild (renamed from gnome-extra/libgda/libgda-5.0.3.ebuild) | 5 | ||||
| -rw-r--r-- | gnome-extra/libgda/metadata.xml | 1 |
5 files changed, 13 insertions, 282 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index 39b6cea6d0f5..78b8fb47dc35 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/libgda # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.195 2012/03/25 16:31:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.196 2012/04/01 18:20:25 pacho Exp $ + +*libgda-5.0.3-r1 (01 Apr 2012) + + 01 Apr 2012; Pacho Ramos <pacho@gentoo.org> +libgda-5.0.3-r1.ebuild, + -libgda-4.2.9.ebuild, -libgda-5.0.2.ebuild, -libgda-5.0.3.ebuild, + metadata.xml: + java-pkg-opt-2 default phases were being skipped by accident causing java + detection problems like bug #401219 by Maciej Piechotka. Remove old. 25 Mar 2012; Raúl Porcel <armin76@gentoo.org> libgda-4.2.11.ebuild: alpha/ia64/sparc stable wrt #393007 diff --git a/gnome-extra/libgda/libgda-4.2.9.ebuild b/gnome-extra/libgda/libgda-4.2.9.ebuild deleted file mode 100644 index 68c9be66d9d4..000000000000 --- a/gnome-extra/libgda/libgda-4.2.9.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# 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.9.ebuild,v 1.5 2011/10/30 16:23:25 armin76 Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 - -DESCRIPTION="Gnome Database Access Library" -HOMEPAGE="http://www.gnome-db.org/" -LICENSE="GPL-2 LGPL-2" - -# MDB support currently works with CVS only, so disable it in the meantime -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mysql oci8 postgres sourceview ssl" -SLOT="4" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" - -# FIXME: sqlite is automagic, but maybe it is a hard-dep -# FIXME: autoconf is a hell of inconsistencies -RDEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.16:2 - >=dev-libs/libxml2-2:2 - dev-libs/libxslt - dev-libs/libunique:1 - sys-libs/readline - sys-libs/ncurses - berkdb? ( sys-libs/db ) - !bindist? ( firebird? ( dev-db/firebird ) ) - gtk? ( - || ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 ) - canvas? ( x11-libs/goocanvas:0 ) - sourceview? ( x11-libs/gtksourceview:2.0 ) - graphviz? ( media-gfx/graphviz ) - ) - gnome-keyring? ( gnome-base/libgnome-keyring ) - http? ( >=net-libs/libsoup-2.24:2.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) - json? ( dev-libs/json-glib ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - ssl? ( dev-libs/openssl ) - >=dev-db/sqlite-3.6.22:3" -# mdb? ( >app-office/mdbtools-0.5 ) - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.18 - >=dev-util/intltool-0.35.5 - >=app-text/gnome-doc-utils-0.9 - >=dev-util/gtk-doc-am-1 - doc? ( >=dev-util/gtk-doc-1 )" - -# Tests are not really good -RESTRICT="test" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - - if use canvas || use graphviz || use sourceview; then - if ! use gtk; then - ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag." - ewarn "Disabling for now." - G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview" - else - G2CONF="${G2CONF} - $(use_with canvas goocanvas) - $(use_with graphviz) - $(use_with sourceview gtksourceview)" - fi - fi - - G2CONF="${G2CONF} - --with-unique - --disable-scrollkeeper - --disable-static - --enable-system-sqlite - $(use_with berkdb bdb /usr) - $(use_with gnome-keyring) - $(use_with gtk ui) - $(use_with http libsoup) - $(use_enable introspection) - $(use_enable introspection gda-gi) - $(use_enable introspection gdaui-gi) - $(use_with java java $JAVA_HOME) - $(use_with ldap) - $(use_with mysql mysql /usr) - $(use_with postgres postgres /usr) - $(use_enable ssl crypto) - --without-mdb" -# $(use_with mdb mdb /usr) - - if use bindist; then - # firebird license is not GPL compatible - G2CONF="${G2CONF} --without-firebird" - else - G2CONF="${G2CONF} $(use_with firebird firebird /usr)" - fi - - use berkdb && append-cppflags "-I$(db_includedir)" - # --disable-json doesn't work, upstream bug #636439 - use json && G2CONF="${G2CONF} --enable-json" - use oci8 || G2CONF="${G2CONF} --without-oracle" - - # Not in portage - G2CONF="${G2CONF} - --disable-default-binary" - - export XDG_DATA_HOME="${T}/.local" -} - -src_prepare() { - gnome2_src_prepare - - # Fix build order for generated content, upstream #630958 - epatch "${FILESDIR}/${PN}-4.2.2-fix-build-order.patch" - - # Fix compilation failure of keyword_hash.c, upstream #630959 - epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch" - - intltoolize --force --copy --automake || die - eautoreconf -} diff --git a/gnome-extra/libgda/libgda-5.0.2.ebuild b/gnome-extra/libgda/libgda-5.0.2.ebuild deleted file mode 100644 index fb34695fb466..000000000000 --- a/gnome-extra/libgda/libgda-5.0.2.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# 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-5.0.2.ebuild,v 1.1 2011/11/21 11:57:46 pacho Exp $ - -EAPI="4" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="yes" -PYTHON_DEPEND="2" - -inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python - -DESCRIPTION="Gnome Database Access Library" -HOMEPAGE="http://www.gnome-db.org/" -LICENSE="GPL-2 LGPL-2" - -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -RDEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.16:2 - >=dev-libs/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? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) - http? ( >=net-libs/libsoup-2.24:2.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) - json? ( dev-libs/json-glib ) - 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} - >=dev-util/pkgconfig-0.18 - >=dev-util/intltool-0.35.5 - >=app-text/gnome-doc-utils-0.9 - doc? ( >=dev-util/gtk-doc-1 ) - vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - - if use canvas || use graphviz || use sourceview; then - if ! use gtk; then - ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag." - ewarn "Disabling for now." - G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview" - else - G2CONF="${G2CONF} - $(use_with canvas goocanvas) - $(use_with graphviz) - $(use_with sourceview gtksourceview)" - fi - fi - - G2CONF="${G2CONF} - --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) - $(use_enable vala)" - - 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" - - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Disable broken tests so we can check the others, upstream bug #???? - epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch" - - # 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 - 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 - - python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf} - - # Fix valac version, upstream bug #664462 - sed -e 's:"$VALA_BINDIR/valac":"$VALA_BINDIR/valac-0.14":' \ - -i configure.ac || die "sed failed" - - eautoreconf - gnome2_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 -} diff --git a/gnome-extra/libgda/libgda-5.0.3.ebuild b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild index 258a50bfcfcf..5c9ea1ff2f2c 100644 --- a/gnome-extra/libgda/libgda-5.0.3.ebuild +++ b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3.ebuild,v 1.2 2012/01/26 01:06:31 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.1 2012/04/01 18:20:25 pacho Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -51,6 +51,8 @@ DEPEND="${RDEPEND} # vala? ( >=dev-lang/vala-0.14:0.14[vapigen] ) pkg_setup() { + java-pkg-opt-2_pkg_setup + DOCS="AUTHORS ChangeLog NEWS README" if use canvas || use graphviz || use sourceview; then @@ -138,6 +140,7 @@ src_prepare() { intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf gnome2_src_prepare + java-pkg-opt-2_src_prepare } pkg_postinst() { diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml index 55fa7c486325..0dccce1fcd47 100644 --- a/gnome-extra/libgda/metadata.xml +++ b/gnome-extra/libgda/metadata.xml @@ -11,6 +11,5 @@ <flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></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> |