From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-507208-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id B0329138200
for <garchives@archives.gentoo.org>; Fri, 21 Sep 2012 00:28:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 140E6E0507;
Fri, 21 Sep 2012 00:27:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id C7FCBE0507
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Sep 2012 00:27:45 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 18F6833D3E0
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Sep 2012 00:27:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 5C950E5448
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Sep 2012 00:27:43 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <1348186100.155c9c0e7a7ba9ec31c1d0dc6b38d158ebd0bb2e.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/folks/
X-VCS-Repository: proj/gnome
X-VCS-Files: dev-libs/folks/folks-0.7.3.ebuild dev-libs/folks/folks-0.7.4.1.ebuild dev-libs/folks/folks-9999.ebuild
X-VCS-Directories: dev-libs/folks/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 155c9c0e7a7ba9ec31c1d0dc6b38d158ebd0bb2e
X-VCS-Branch: master
Date: Fri, 21 Sep 2012 00:27:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 192c56b5-79dc-4535-937d-7426428d12f6
X-Archives-Hash: 8806d6c938c8e15852558a4d5a3db3ac
commit: 155c9c0e7a7ba9ec31c1d0dc6b38d158ebd0bb2e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 22:53:40 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 00:08:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=155c9c0e
dev-libs/folks: 0.7.3 → 0.7.4.1
---
.../{folks-0.7.3.ebuild => folks-0.7.4.1.ebuild} | 37 ++++++++++++--------
dev-libs/folks/folks-9999.ebuild | 37 ++++++++++++--------
2 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/dev-libs/folks/folks-0.7.3.ebuild b/dev-libs/folks/folks-0.7.4.1.ebuild
similarity index 74%
rename from dev-libs/folks/folks-0.7.3.ebuild
rename to dev-libs/folks/folks-0.7.4.1.ebuild
index 145795e..71bae39 100644
--- a/dev-libs/folks/folks-0.7.3.ebuild
+++ b/dev-libs/folks/folks-0.7.4.1.ebuild
@@ -5,8 +5,10 @@
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
-inherit autotools eutils gnome2
+inherit eutils gnome2 vala virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,11 +24,9 @@ else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
fi
# TODO: --enable-profiling
-IUSE="eds socialweb test tracker utils vala"
+IUSE="eds socialweb +telepathy test tracker utils vala"
-COMMON_DEPEND=">=dev-libs/glib-2.26:2
- >=dev-libs/libzeitgeist-0.3.14
- >=net-libs/telepathy-glib-0.19.0
+COMMON_DEPEND=">=dev-libs/glib-2.32:2
dev-libs/dbus-glib
<dev-libs/libgee-0.7:0[introspection]
dev-libs/libxml2
@@ -35,6 +35,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
eds? ( >=gnome-extra/evolution-data-server-3.5.4 )
socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+ telepathy? (
+ >=dev-libs/libzeitgeist-0.3.14
+ >=net-libs/telepathy-glib-0.19.0 )
tracker? ( >=app-misc/tracker-0.14 )"
# telepathy-mission-control needed at runtime; it is used by the telepathy
@@ -53,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
test? ( sys-apps/dbus )
vala? (
- >=dev-lang/vala-0.15.2:0.16[vapigen]
+ $(vala_depend)
>=net-libs/telepathy-glib-0.13.1[vala]
eds? ( >=gnome-extra/evolution-data-server-3.5.4[vala] ) )"
@@ -61,28 +64,32 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="utils? ( vala )"
pkg_setup() {
+ local vala_version=$(vala_best_api_version)
DOCS="AUTHORS ChangeLog NEWS README"
# Rebuilding docs needs valadoc, which has no release
G2CONF="${G2CONF}
$(use_enable eds eds-backend)
$(use_enable socialweb libsocialweb-backend)
+ $(use_enable telepathy telepathy-backend)
$(use_enable tracker tracker-backend)
$(use_enable utils inspect-tool)
$(use_enable vala)
+ $(use_enable test tests)
--enable-import-tool
--disable-docs
--disable-fatal-warnings
- --disable-Werror"
- if use vala; then
- G2CONF="${G2CONF}
- VALAC=$(type -p valac-0.16)
- VAPIGEN=$(type -p vapigen-0.16)"
- fi
+ VALAC=$(type -p valac-${vala_version})
+ VAPIGEN=$(type -p vapigen-${vala_version})"
+}
+
+src_prepare() {
+ # We don't need vala_src_prepare
+ gnome2_src_prepare
}
src_test() {
# FIXME: eds tests often fails for no good reason
- sed -e 's/check: .*/check: /' \
- -i tests/eds/Makefile || die "sed failed"
- default
+ #sed -e 's/check: .*/check: /' \
+ # -i tests/eds/Makefile || die "sed failed"
+ Xemake check
}
diff --git a/dev-libs/folks/folks-9999.ebuild b/dev-libs/folks/folks-9999.ebuild
index 145795e..71bae39 100644
--- a/dev-libs/folks/folks-9999.ebuild
+++ b/dev-libs/folks/folks-9999.ebuild
@@ -5,8 +5,10 @@
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
-inherit autotools eutils gnome2
+inherit eutils gnome2 vala virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,11 +24,9 @@ else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
fi
# TODO: --enable-profiling
-IUSE="eds socialweb test tracker utils vala"
+IUSE="eds socialweb +telepathy test tracker utils vala"
-COMMON_DEPEND=">=dev-libs/glib-2.26:2
- >=dev-libs/libzeitgeist-0.3.14
- >=net-libs/telepathy-glib-0.19.0
+COMMON_DEPEND=">=dev-libs/glib-2.32:2
dev-libs/dbus-glib
<dev-libs/libgee-0.7:0[introspection]
dev-libs/libxml2
@@ -35,6 +35,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
eds? ( >=gnome-extra/evolution-data-server-3.5.4 )
socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+ telepathy? (
+ >=dev-libs/libzeitgeist-0.3.14
+ >=net-libs/telepathy-glib-0.19.0 )
tracker? ( >=app-misc/tracker-0.14 )"
# telepathy-mission-control needed at runtime; it is used by the telepathy
@@ -53,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
test? ( sys-apps/dbus )
vala? (
- >=dev-lang/vala-0.15.2:0.16[vapigen]
+ $(vala_depend)
>=net-libs/telepathy-glib-0.13.1[vala]
eds? ( >=gnome-extra/evolution-data-server-3.5.4[vala] ) )"
@@ -61,28 +64,32 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="utils? ( vala )"
pkg_setup() {
+ local vala_version=$(vala_best_api_version)
DOCS="AUTHORS ChangeLog NEWS README"
# Rebuilding docs needs valadoc, which has no release
G2CONF="${G2CONF}
$(use_enable eds eds-backend)
$(use_enable socialweb libsocialweb-backend)
+ $(use_enable telepathy telepathy-backend)
$(use_enable tracker tracker-backend)
$(use_enable utils inspect-tool)
$(use_enable vala)
+ $(use_enable test tests)
--enable-import-tool
--disable-docs
--disable-fatal-warnings
- --disable-Werror"
- if use vala; then
- G2CONF="${G2CONF}
- VALAC=$(type -p valac-0.16)
- VAPIGEN=$(type -p vapigen-0.16)"
- fi
+ VALAC=$(type -p valac-${vala_version})
+ VAPIGEN=$(type -p vapigen-${vala_version})"
+}
+
+src_prepare() {
+ # We don't need vala_src_prepare
+ gnome2_src_prepare
}
src_test() {
# FIXME: eds tests often fails for no good reason
- sed -e 's/check: .*/check: /' \
- -i tests/eds/Makefile || die "sed failed"
- default
+ #sed -e 's/check: .*/check: /' \
+ # -i tests/eds/Makefile || die "sed failed"
+ Xemake check
}