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

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

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.

---
 gnome-extra/libgda/libgda-9999.ebuild | 7 +++----
 gnome-extra/libgda/metadata.xml       | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

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

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