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

["Gilles Dartiguelongue" <eva@gentoo.org>]

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

---
 gnome-extra/libgda/libgda-5.1.1.ebuild |  171 --------------------------------
 gnome-extra/libgda/libgda-9999.ebuild  |  106 +++++++++-----------
 gnome-extra/libgda/metadata.xml        |   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
-}

diff --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
 }

diff --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>