commit: 6416867a5ac40bb232b4d068050e6e3922251cff
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 15 21:14:31 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 13:51:53 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6416867a
app-crypt/libsecret: 0.16 → 0.18
---
...libsecret-9999.ebuild => libsecret-0.18.ebuild} | 33 ++++++----------------
app-crypt/libsecret/libsecret-9999.ebuild | 14 ++++-----
2 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/app-crypt/libsecret/libsecret-9999.ebuild
b/app-crypt/libsecret/libsecret-0.18.ebuild
similarity index 68%
copy from app-crypt/libsecret/libsecret-9999.ebuild
copy to app-crypt/libsecret/libsecret-0.18.ebuild
index 0f7631e..7c5a95a 100644
--- a/app-crypt/libsecret/libsecret-9999.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.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: $
@@ -7,10 +7,7 @@ PYTHON_COMPAT=( python2_{6,7} )
VALA_MIN_API_VERSION=0.18
VALA_USE_DEPEND=vapigen
-inherit eutils gnome2 python-any-r1 vala virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit gnome2 python-any-r1 vala virtualx
DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service
API"
HOMEPAGE="https://live.gnome.org/Libsecret";
@@ -19,16 +16,11 @@ LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used
for tests only
SLOT="0"
IUSE="+crypt debug +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
COMMON_DEPEND="
- >=dev-libs/glib-2.32.0:2
- crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
+ >=dev-libs/glib-2.38:2
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
introspection? ( >=dev-libs/gobject-introspection-1.29 )
"
RDEPEND="${COMMON_DEPEND}
@@ -38,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
dev-util/gdbus-codegen
- dev-util/gtk-doc-am
+ >=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35.0
sys-devel/gettext
virtual/pkgconfig
@@ -52,22 +44,13 @@ DEPEND="${COMMON_DEPEND}
vala? ( $(vala_depend) )
"
-# Required while regenerating from *.vala *.vapi
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- $(vala_depend)
- doc? ( >=dev-util/gtk-doc-1.9 )"
-fi
-
src_prepare() {
# FIXME: disable failing test
sed -e '/test_get_sync);/d' \
-e '/test_get_async);/d' \
- -i libsecret/tests/test-service.c || die
+ -i "${S}"/libsecret/test-service.c || die
- if use vala || [[ ${PV} = 9999 ]]; then
- vala_src_prepare
- fi
+ use vala && vala_src_prepare
gnome2_src_prepare
}
diff --git a/app-crypt/libsecret/libsecret-9999.ebuild
b/app-crypt/libsecret/libsecret-9999.ebuild
index 0f7631e..c36e3a2 100644
--- a/app-crypt/libsecret/libsecret-9999.ebuild
+++ b/app-crypt/libsecret/libsecret-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: $
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_{6,7} )
VALA_MIN_API_VERSION=0.18
VALA_USE_DEPEND=vapigen
-inherit eutils gnome2 python-any-r1 vala virtualx
+inherit gnome2 python-any-r1 vala virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -23,12 +23,12 @@ if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd"
fi
COMMON_DEPEND="
- >=dev-libs/glib-2.32.0:2
- crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
+ >=dev-libs/glib-2.38:2
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
introspection? ( >=dev-libs/gobject-introspection-1.29 )
"
RDEPEND="${COMMON_DEPEND}
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
dev-util/gdbus-codegen
- dev-util/gtk-doc-am
+ >=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35.0
sys-devel/gettext
virtual/pkgconfig
@@ -63,7 +63,7 @@ src_prepare() {
# FIXME: disable failing test
sed -e '/test_get_sync);/d' \
-e '/test_get_async);/d' \
- -i libsecret/tests/test-service.c || die
+ -i "${S}"/libsecret/test-service.c || die
if use vala || [[ ${PV} = 9999 ]]; then
vala_src_prepare
