[gentoo-commits] proj/gnome:master commit in: dev-libs/libgdata/files/, dev-libs/libgdata/

["Priit Laes" <plaes@plaes.org>]

commit:     5d91bd6afa0c2278d926dfb714b426a39fc9b573
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Jan 18 10:25:03 2014 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Jan 18 10:25:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5d91bd6a

dev-libs/libgdata: Add 0.15.0 to tree, disable tests for now

---
 dev-libs/libgdata/files/disable-uhttpmock.patch    | 49 ++++++++++++++++++++++
 ...libgdata-9999.ebuild => libgdata-0.15.0.ebuild} | 23 ++++++----
 dev-libs/libgdata/libgdata-9999.ebuild             |  9 ++--
 3 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/dev-libs/libgdata/files/disable-uhttpmock.patch b/dev-libs/libgdata/files/disable-uhttpmock.patch
new file mode 100644
index 0000000..10814dd
--- /dev/null
+++ b/dev-libs/libgdata/files/disable-uhttpmock.patch
@@ -0,0 +1,49 @@
+From 9cd4239a07d40c270ac2acf69a598609020904a5 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Wed, 15 Jan 2014 11:53:04 +0200
+Subject: [PATCH] Allow disabling libutthttpmock dependency with
+ --disable-tests
+
+https://bugzilla.gnome.org/show_bug.cgi?id=722249
+
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 8 +++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 028f0f7..78733e0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,8 @@
+-SUBDIRS = . gdata/tests po docs
++SUBDIRS = . po docs
++
++if ENABLE_TESTS
++	SUBDIRS += gdata/tests
++endif
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+diff --git a/configure.ac b/configure.ac
+index 7b4a861..5a33122 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,7 +126,13 @@ AC_SUBST([GOA_ENABLED])
+ dnl ****************************
+ dnl Check for uhttpmock
+ dnl ****************************
+-PKG_CHECK_MODULES(UHTTPMOCK, libuhttpmock-0.0)
++AC_MSG_CHECKING(whether to build with tests)
++AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests], [Whether to build tests]),, enable_tests=yes)
++AC_MSG_RESULT($enable_tests)
++AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
++if test "x$enable_tests" = "xyes"; then
++    PKG_CHECK_MODULES(UHTTPMOCK, libuhttpmock-0.0)
++fi
+ 
+ # Various necessary functions and headers
+ AC_CHECK_FUNCS([strchr])
+-- 
+1.8.5.3
+

diff --git a/dev-libs/libgdata/libgdata-9999.ebuild b/dev-libs/libgdata/libgdata-0.15.0.ebuild
similarity index 74%
copy from dev-libs/libgdata/libgdata-9999.ebuild
copy to dev-libs/libgdata/libgdata-0.15.0.ebuild
index 2cd89a8..a640b65 100644
--- a/dev-libs/libgdata/libgdata-9999.ebuild
+++ b/dev-libs/libgdata/libgdata-0.15.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.14.0.ebuild,v 1.3 2013/12/08 18:01:35 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 vala
+inherit autotools eutils gnome2 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -17,7 +17,7 @@ HOMEPAGE="http://live.gnome.org/libgdata"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/13" # subslot = libgdata soname version
-IUSE="gnome +introspection static-libs vala"
+IUSE="gnome gnome-online-accounts +introspection static-libs vala"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -28,21 +28,25 @@ REQUIRED_IUSE="vala? ( introspection )"
 
 # gtk+ is needed for gdk
 # configure checks for gtk:3, but only uses it for demos which are not installed
+# tests require libuhttpmock (not in portage)
+RESTRICT="test"
 RDEPEND="
 	>=dev-libs/glib-2.31:2
+	>=dev-libs/json-glib-0.15
 	>=dev-libs/libxml2-2:2
 	>=net-libs/liboauth-0.9.4
 	>=net-libs/libsoup-2.42.0:2.4[introspection?]
 	>=x11-libs/gdk-pixbuf-2.14:2
 	gnome? (
 		app-crypt/gcr:=
-		>=net-libs/gnome-online-accounts-3.2
-		>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
+		gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+	)
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
+	>=gnome-base/gnome-common-3.6
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
@@ -53,11 +57,13 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_prepare() {
+	epatch "${FILESDIR}/disable-uhttpmock.patch"
+	eautoreconf
 	# Disable tests requiring network access, bug #307725
 	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf calendar client-login-authorizer contacts documents oauth1-authorizer picasaweb youtube \nOLD_\1:' \
-		-i gdata/tests/Makefile.am || die "network test disable failed"
+		-i gdata/tests/Makefile.in || die "network test disable failed"
 
-	use vala && vala_src_prepare
+	vala_src_prepare
 	gnome2_src_prepare
 }
 
@@ -68,7 +74,8 @@ src_configure() {
 		$(use_enable gnome goa) \
 		$(use_enable introspection) \
 		$(use_enable vala) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		--disable-tests
 }
 
 src_test() {

diff --git a/dev-libs/libgdata/libgdata-9999.ebuild b/dev-libs/libgdata/libgdata-9999.ebuild
index 2cd89a8..7bce910 100644
--- a/dev-libs/libgdata/libgdata-9999.ebuild
+++ b/dev-libs/libgdata/libgdata-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://live.gnome.org/libgdata"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/13" # subslot = libgdata soname version
-IUSE="gnome +introspection static-libs vala"
+IUSE="gnome gnome-online-accounts +introspection static-libs vala"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -36,13 +36,14 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.14:2
 	gnome? (
 		app-crypt/gcr:=
-		>=net-libs/gnome-online-accounts-3.2
-		>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
+		gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+	)
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
+	>=gnome-base/gnome-common-3.6
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
@@ -57,7 +58,7 @@ src_prepare() {
 	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf calendar client-login-authorizer contacts documents oauth1-authorizer picasaweb youtube \nOLD_\1:' \
 		-i gdata/tests/Makefile.am || die "network test disable failed"
 
-	use vala && vala_src_prepare
+	vala_src_prepare
 	gnome2_src_prepare
 }