From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
Date: Sun, 10 Apr 2011 21:44:12 +0000 (UTC) [thread overview]
Message-ID: <45d118a48dfcd8979d3c300b68bc4b27e5eba17c.eva@gentoo> (raw)
commit: 45d118a48dfcd8979d3c300b68bc4b27e5eba17c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 21:42:48 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 21:43:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=45d118a4
net-im/empathy: QAed
* Sync with gentoo-x86
* Sort USE flags dependencies
* Split pkg_setup and src_prepare again
* Raise telepathy-mission-control and telepathy-logger per NEWS
---
net-im/empathy/empathy-3.0.0.ebuild | 45 ++++++++++++++++++----------------
net-im/empathy/empathy-9999.ebuild | 45 ++++++++++++++++++----------------
2 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/net-im/empathy/empathy-3.0.0.ebuild b/net-im/empathy/empathy-3.0.0.ebuild
index dd302a4..dc3787e 100644
--- a/net-im/empathy/empathy-3.0.0.ebuild
+++ b/net-im/empathy/empathy-3.0.0.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.6 2011/02/05 17:10:33 ssuominen Exp $
EAPI="3"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.4"
@@ -17,13 +17,13 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="+gnome eds +map +networkmanager sendto spell test webkit"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
fi
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="debug eds +gnome +map +networkmanager sendto spell test webkit"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -32,10 +32,10 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
>=dev-libs/dbus-glib-0.51
>=net-libs/telepathy-glib-0.14.1
>=media-libs/libcanberra-0.25[gtk3]
- >=x11-libs/libnotify-0.7.0
+ >=x11-libs/libnotify-0.7
>=gnome-base/gnome-keyring-2.91.4-r300
>=net-libs/gnutls-2.8.5
- >=dev-libs/folks-0.4.0
+ >=dev-libs/folks-0.4
gnome-base/gsettings-desktop-schemas
net-libs/farsight2
@@ -46,19 +46,20 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
dev-libs/libxml2:2
x11-libs/libX11
net-voip/telepathy-connection-managers
- >=net-im/telepathy-logger-0.2.0
+ >=net-im/telepathy-logger-0.2.8
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
- sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
+ gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
+ map? (
+ media-libs/libchamplain:0.10[gtk]
+ media-libs/clutter-gtk:1.0 )
networkmanager? ( >=net-misc/networkmanager-0.7 )
+ sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
- map? (
- media-libs/libchamplain:0.10[gtk]
- media-libs/clutter-gtk:1.0 )"
+"
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
@@ -67,36 +68,38 @@ DEPEND="${RDEPEND}
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt"
-PDEPEND=">=net-im/telepathy-mission-control-5"
+ dev-libs/libxslt
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
pkg_setup() {
- # Build time python tools needs python2
- python_set_active_version 2
-}
-
-src_prepare() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
# TODO: Re-add location support
G2CONF="${G2CONF}
+ --disable-coding-style-checks
+ --disable-schemas-compile
--disable-static
--disable-meego
--disable-location
--disable-Werror
$(use_enable debug)
- $(use_enable gnome control-center-embedding)
$(use_with eds)
+ $(use_enable gnome control-center-embedding)
$(use_enable map)
$(use_with networkmanager connectivity nm)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_enable test coding-style-checks)
$(use_enable webkit)"
- python_convert_shebangs -r 2 tools
+ # Build time python tools needs python2
+ python_set_active_version 2
+}
+src_prepare() {
gnome2_src_prepare
+
+ python_convert_shebangs -r 2 tools
}
src_test() {
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index dd302a4..dc3787e 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.6 2011/02/05 17:10:33 ssuominen Exp $
EAPI="3"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.4"
@@ -17,13 +17,13 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="+gnome eds +map +networkmanager sendto spell test webkit"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
fi
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="debug eds +gnome +map +networkmanager sendto spell test webkit"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -32,10 +32,10 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
>=dev-libs/dbus-glib-0.51
>=net-libs/telepathy-glib-0.14.1
>=media-libs/libcanberra-0.25[gtk3]
- >=x11-libs/libnotify-0.7.0
+ >=x11-libs/libnotify-0.7
>=gnome-base/gnome-keyring-2.91.4-r300
>=net-libs/gnutls-2.8.5
- >=dev-libs/folks-0.4.0
+ >=dev-libs/folks-0.4
gnome-base/gsettings-desktop-schemas
net-libs/farsight2
@@ -46,19 +46,20 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
dev-libs/libxml2:2
x11-libs/libX11
net-voip/telepathy-connection-managers
- >=net-im/telepathy-logger-0.2.0
+ >=net-im/telepathy-logger-0.2.8
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
- sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
+ gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
+ map? (
+ media-libs/libchamplain:0.10[gtk]
+ media-libs/clutter-gtk:1.0 )
networkmanager? ( >=net-misc/networkmanager-0.7 )
+ sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
- map? (
- media-libs/libchamplain:0.10[gtk]
- media-libs/clutter-gtk:1.0 )"
+"
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
@@ -67,36 +68,38 @@ DEPEND="${RDEPEND}
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt"
-PDEPEND=">=net-im/telepathy-mission-control-5"
+ dev-libs/libxslt
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
pkg_setup() {
- # Build time python tools needs python2
- python_set_active_version 2
-}
-
-src_prepare() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
# TODO: Re-add location support
G2CONF="${G2CONF}
+ --disable-coding-style-checks
+ --disable-schemas-compile
--disable-static
--disable-meego
--disable-location
--disable-Werror
$(use_enable debug)
- $(use_enable gnome control-center-embedding)
$(use_with eds)
+ $(use_enable gnome control-center-embedding)
$(use_enable map)
$(use_with networkmanager connectivity nm)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_enable test coding-style-checks)
$(use_enable webkit)"
- python_convert_shebangs -r 2 tools
+ # Build time python tools needs python2
+ python_set_active_version 2
+}
+src_prepare() {
gnome2_src_prepare
+
+ python_convert_shebangs -r 2 tools
}
src_test() {
next reply other threads:[~2011-04-10 21:44 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 21:44 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-25 21:07 [gentoo-commits] proj/gnome:master commit in: net-im/empathy/ Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2014-04-13 0:22 Gilles Dartiguelongue
2013-12-08 21:46 Gilles Dartiguelongue
2012-12-26 23:00 Gilles Dartiguelongue
2012-12-21 23:33 Gilles Dartiguelongue
2012-12-21 23:27 Gilles Dartiguelongue
2012-12-08 23:06 Alexandre Rostovtsev
2012-12-08 17:51 Alexandre Rostovtsev
2012-11-21 20:51 Gilles Dartiguelongue
2012-11-07 20:07 Alexandre Rostovtsev
2012-10-27 21:09 Gilles Dartiguelongue
2012-09-21 0:27 Nirbheek Chauhan
2012-09-10 16:36 Alexandre Rostovtsev
2012-09-09 12:43 Nirbheek Chauhan
2012-07-18 0:59 Alexandre Restovtsev
2012-05-24 9:11 Alexandre Restovtsev
2012-05-02 5:33 Alexandre Restovtsev
2012-04-06 8:38 Alexandre Restovtsev
2012-04-06 3:14 Alexandre Restovtsev
2012-03-28 21:00 Nirbheek Chauhan
2012-03-28 19:53 Nirbheek Chauhan
2012-03-26 8:20 Nirbheek Chauhan
2011-11-04 5:12 Alexandre Restovtsev
2011-10-18 7:37 Alexandre Restovtsev
2011-10-11 6:40 Alexandre Restovtsev
2011-07-27 5:51 Alexandre Restovtsev
2011-05-30 17:11 Nirbheek Chauhan
2011-04-29 17:29 Nirbheek Chauhan
2011-04-17 21:28 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-03-29 8:35 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-03-14 21:59 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-02-22 20:35 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=45d118a48dfcd8979d3c300b68bc4b27e5eba17c.eva@gentoo \
--to=eva@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