commit:     fc29f4f5c200b81af2602c8922fcbb3d897ecb86
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 22:11:42 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 25 22:39:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fc29f4f5

dev-libs/libgdata: 0.16.1 → 0.17.1

 ...libgdata-9999.ebuild => libgdata-0.17.1.ebuild} | 23 +++-------------------
 dev-libs/libgdata/libgdata-9999.ebuild             |  8 ++------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/dev-libs/libgdata/libgdata-9999.ebuild 
b/dev-libs/libgdata/libgdata-0.17.1.ebuild
similarity index 70%
copy from dev-libs/libgdata/libgdata-9999.ebuild
copy to dev-libs/libgdata/libgdata-0.17.1.ebuild
index febb79c..85e4635 100644
--- a/dev-libs/libgdata/libgdata-9999.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,22 +8,14 @@ VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala
-if [[ ${PV} = 9999 ]]; then
-       inherit gnome2-live
-fi
 
 DESCRIPTION="GLib-based library for accessing online service APIs using the 
GData protocol"
 HOMEPAGE="https://wiki.gnome.org/Projects/libgdata";
 
 LICENSE="LGPL-2.1+"
-SLOT="0/19" # subslot = libgdata soname version
+SLOT="0/22" # subslot = libgdata soname version
 IUSE="gnome +introspection static-libs test vala"
-if [[ ${PV} = 9999 ]]; then
-       IUSE="${IUSE} doc"
-       KEYWORDS=""
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_IUSE="vala? ( introspection )"
 
 # gtk+ is needed for gdk
@@ -49,16 +41,7 @@ DEPEND="${RDEPEND}
        vala? ( $(vala_depend) )
 "
 
-if [[ ${PV} = 9999 ]]; then
-       DEPEND="${DEPEND}
-               doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
-
 src_prepare() {
-       # 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"
-
        vala_src_prepare
        gnome2_src_prepare
 }

diff --git a/dev-libs/libgdata/libgdata-9999.ebuild 
b/dev-libs/libgdata/libgdata-9999.ebuild
index febb79c..bfaa551 100644
--- a/dev-libs/libgdata/libgdata-9999.ebuild
+++ b/dev-libs/libgdata/libgdata-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ DESCRIPTION="GLib-based library for accessing online service 
APIs using the GDat
 HOMEPAGE="https://wiki.gnome.org/Projects/libgdata";
 
 LICENSE="LGPL-2.1+"
-SLOT="0/19" # subslot = libgdata soname version
+SLOT="0/22" # subslot = libgdata soname version
 IUSE="gnome +introspection static-libs test vala"
 if [[ ${PV} = 9999 ]]; then
        IUSE="${IUSE} doc"
@@ -55,10 +55,6 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_prepare() {
-       # 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"
-
        vala_src_prepare
        gnome2_src_prepare
 }

Reply via email to