commit: 92e671ec0fbdb8ea7f57446d91463b085d8d2071 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Oct 26 15:25:49 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 15:29:49 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=92e671ec
dev-libs/libgdata: moved to gentoo-x86 --- dev-libs/libgdata/files/disable-uhttpmock.patch | 49 -------------- dev-libs/libgdata/libgdata-0.15.0.ebuild | 85 ------------------------- dev-libs/libgdata/libgdata-9999.ebuild | 20 +++--- 3 files changed, 11 insertions(+), 143 deletions(-) diff --git a/dev-libs/libgdata/files/disable-uhttpmock.patch b/dev-libs/libgdata/files/disable-uhttpmock.patch deleted file mode 100644 index 10814dd..0000000 --- a/dev-libs/libgdata/files/disable-uhttpmock.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9cd4239a07d40c270ac2acf69a598609020904a5 Mon Sep 17 00:00:00 2001 -From: Priit Laes <pl...@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-0.15.0.ebuild b/dev-libs/libgdata/libgdata-0.15.0.ebuild deleted file mode 100644 index a640b65..0000000 --- a/dev-libs/libgdata/libgdata-0.15.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $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 autotools eutils gnome2 vala -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE="http://live.gnome.org/libgdata"; - -LICENSE="LGPL-2.1+" -SLOT="0/13" # subslot = libgdata soname version -IUSE="gnome gnome-online-accounts +introspection static-libs vala" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -fi -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:= - 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) ) -" - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.14 )" -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.in || die "network test disable failed" - - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - gnome2_src_configure \ - $(use_enable gnome) \ - $(use_enable gnome goa) \ - $(use_enable introspection) \ - $(use_enable vala) \ - $(use_enable static-libs static) \ - --disable-tests -} - -src_test() { - unset ORBIT_SOCKETDIR - unset DBUS_SESSION_BUS_ADDRESS - dbus-launch emake check || die "emake check failed" -} diff --git a/dev-libs/libgdata/libgdata-9999.ebuild b/dev-libs/libgdata/libgdata-9999.ebuild index 7bce910..886cbee 100644 --- a/dev-libs/libgdata/libgdata-9999.ebuild +++ b/dev-libs/libgdata/libgdata-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -13,31 +13,32 @@ if [[ ${PV} = 9999 ]]; then fi DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE="http://live.gnome.org/libgdata"; +HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"; LICENSE="LGPL-2.1+" -SLOT="0/13" # subslot = libgdata soname version -IUSE="gnome gnome-online-accounts +introspection static-libs vala" +SLOT="0/19" # subslot = libgdata soname version +IUSE="gnome +introspection static-libs vala" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" + KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi REQUIRED_IUSE="vala? ( introspection )" # gtk+ is needed for gdk # configure checks for gtk:3, but only uses it for demos which are not installed RDEPEND=" - >=dev-libs/glib-2.31:2 + >=dev-libs/glib-2.32: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?] + net-libs/uhttpmock >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 ) - ) + >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) " DEPEND="${RDEPEND} @@ -75,5 +76,6 @@ src_configure() { src_test() { unset ORBIT_SOCKETDIR unset DBUS_SESSION_BUS_ADDRESS - dbus-launch emake check || die "emake check failed" + export GSETTINGS_BACKEND="memory" #486412 + dbus-launch emake check }
