From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/folks/
Date: Fri, 21 Sep 2012 00:27:43 +0000 (UTC) [thread overview]
Message-ID: <1348186100.155c9c0e7a7ba9ec31c1d0dc6b38d158ebd0bb2e.nirbheek@gentoo> (raw)
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
}
next reply other threads:[~2012-09-21 0:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 0:27 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-12-11 13:23 [gentoo-commits] proj/gnome:master commit in: dev-libs/folks/ Gilles Dartiguelongue
2018-12-11 13:23 Gilles Dartiguelongue
2015-06-09 13:48 Gilles Dartiguelongue
2015-05-28 21:27 Gilles Dartiguelongue
2015-05-17 15:39 Gilles Dartiguelongue
2015-05-12 22:44 Gilles Dartiguelongue
2014-04-20 22:57 Gilles Dartiguelongue
2013-12-18 22:49 Gilles Dartiguelongue
2013-12-08 21:46 Gilles Dartiguelongue
2012-12-18 23:32 Gilles Dartiguelongue
2012-12-01 14:17 Gilles Dartiguelongue
2012-10-28 10:19 Gilles Dartiguelongue
2012-08-11 21:18 Priit Laes
2012-05-02 4:46 Alexandre Restovtsev
2011-10-19 8:24 Alexandre Restovtsev
2011-10-02 6:53 Alexandre Restovtsev
2011-03-26 20:22 Gilles Dartiguelongue
2011-03-23 22:07 Nirbheek Chauhan
2011-03-18 22:41 Gilles Dartiguelongue
2011-03-14 21:59 Nirbheek Chauhan
2011-03-14 19:42 Nirbheek Chauhan
2011-02-15 23:45 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348186100.155c9c0e7a7ba9ec31c1d0dc6b38d158ebd0bb2e.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox