From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: net-im/empathy/
Date: Wed, 27 Jul 2011 02:43:08 +0000 (UTC) [thread overview]
Message-ID: <9e8ebf42a4cfbd4579b0cf5947d139f6f27e8a5b.tetromino@gentoo> (raw)
commit: 9e8ebf42a4cfbd4579b0cf5947d139f6f27e8a5b
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 01:57:15 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 27 02:41:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9e8ebf42
net-im/empathy: 3.1.3 → 3.1.4
Version bump. Sort the dependency list a bit so it's easier to manage;
update the telepathy-glib dep; clutter is now required for making
calls. Add a video USE flag for webcam features (pulls in cheese and
gudev). Since gnome-control-center upstream has dropped support for
third-party panels, disable control-center-embedding for now.
---
.../{empathy-3.1.3.ebuild => empathy-3.1.4.ebuild} | 34 +++++++++++-------
net-im/empathy/empathy-9999.ebuild | 38 ++++++++++++-------
2 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/net-im/empathy/empathy-3.1.3.ebuild b/net-im/empathy/empathy-3.1.4.ebuild
similarity index 81%
rename from net-im/empathy/empathy-3.1.3.ebuild
rename to net-im/empathy/empathy-3.1.4.ebuild
index fa73205..9d31916 100644
--- a/net-im/empathy/empathy-3.1.3.ebuild
+++ b/net-im/empathy/empathy-3.1.4.ebuild
@@ -24,44 +24,48 @@ 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 +geoloc +networkmanager sendto spell test webkit"
+IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video webkit" # gnome
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
RDEPEND=">=dev-libs/glib-2.28:2
>=x11-libs/gtk+-3.0.2:3
>=dev-libs/dbus-glib-0.51
- >=net-libs/telepathy-glib-0.15.2
+ >=net-libs/telepathy-glib-0.15.3
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7
>=gnome-base/gnome-keyring-2.91.4-r300
>=net-libs/gnutls-2.8.5
>=dev-libs/folks-0.5.1
+ dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
- net-libs/farsight2
+ media-libs/clutter:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ media-libs/clutter-gst:1.0
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10
media-libs/gst-plugins-bad
+ >=net-im/telepathy-logger-0.2.8
+ net-libs/farsight2
>=net-libs/telepathy-farsight-0.0.14
- dev-libs/libxml2:2
- x11-libs/libX11
net-voip/telepathy-connection-managers
- >=net-im/telepathy-logger-0.2.8
+ x11-libs/libX11
eds? ( >=gnome-extra/evolution-data-server-1.2 )
geoloc? ( >=app-misc/geoclue-0.11 )
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
- map? (
- media-libs/libchamplain:0.10[gtk]
- media-libs/clutter-gtk:1.0 )
+ map? ( media-libs/libchamplain:0.10[gtk] )
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 )
+ video? (
+ || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+ >=media-video/cheese-2.91.91.1 )
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
"
+ # gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
@@ -76,7 +80,6 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
pkg_setup() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
# TODO: Re-add location support
G2CONF="${G2CONF}
--disable-coding-style-checks
@@ -84,15 +87,20 @@ pkg_setup() {
--disable-static
--disable-meego
--disable-Werror
+ --enable-call
$(use_enable debug)
$(use_with eds)
$(use_enable geoloc location)
- $(use_enable gnome control-center-embedding)
$(use_enable map)
$(use_with networkmanager connectivity nm)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_enable webkit)"
+ $(use_with video cheese)
+ $(use_enable video gudev)
+ $(use_enable webkit)
+ --disable-control-center-embedding"
+ # $(use_enable gnome control-center-embedding)
+ # gnome-control-center-3.1.4 dropped support for third-party panels
# Build time python tools needs python2
python_set_active_version 2
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index cd9dbf8..9d31916 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -5,6 +5,7 @@
EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="xz"
PYTHON_DEPEND="2:2.4"
inherit eutils gnome2 multilib python
@@ -23,7 +24,7 @@ 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"
+IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video webkit" # gnome
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -35,31 +36,36 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=x11-libs/libnotify-0.7
>=gnome-base/gnome-keyring-2.91.4-r300
>=net-libs/gnutls-2.8.5
- >=dev-libs/folks-0.5.2
+ >=dev-libs/folks-0.5.1
+ dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
- net-libs/farsight2
+ media-libs/clutter:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ media-libs/clutter-gst:1.0
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10
media-libs/gst-plugins-bad
+ >=net-im/telepathy-logger-0.2.8
+ net-libs/farsight2
>=net-libs/telepathy-farsight-0.0.14
- dev-libs/libxml2:2
- x11-libs/libX11
net-voip/telepathy-connection-managers
- >=net-im/telepathy-logger-0.2.10
+ x11-libs/libX11
eds? ( >=gnome-extra/evolution-data-server-1.2 )
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
- map? (
- media-libs/libchamplain:0.10[gtk]
- media-libs/clutter-gtk:1.0 )
+ geoloc? ( >=app-misc/geoclue-0.11 )
+ map? ( media-libs/libchamplain:0.10[gtk] )
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 )
+ video? (
+ || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+ >=media-video/cheese-2.91.91.1 )
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
"
+ # gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
@@ -74,23 +80,27 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
pkg_setup() {
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
+ --enable-call
$(use_enable debug)
$(use_with eds)
- $(use_enable gnome control-center-embedding)
+ $(use_enable geoloc location)
$(use_enable map)
$(use_with networkmanager connectivity nm)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_enable webkit)"
+ $(use_with video cheese)
+ $(use_enable video gudev)
+ $(use_enable webkit)
+ --disable-control-center-embedding"
+ # $(use_enable gnome control-center-embedding)
+ # gnome-control-center-3.1.4 dropped support for third-party panels
# Build time python tools needs python2
python_set_active_version 2
next reply other threads:[~2011-07-27 2:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 2:43 Alexandre Restovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-27 5:58 [gentoo-commits] proj/gnome:gnome-next commit in: net-im/empathy/ Alexandre Restovtsev
2011-09-11 9:13 Alexandre Restovtsev
2011-08-30 9:21 Alexandre Restovtsev
2011-08-22 18:29 Alexandre Restovtsev
2011-08-21 6:16 Alexandre Restovtsev
2011-07-16 18:24 Priit Laes
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=9e8ebf42a4cfbd4579b0cf5947d139f6f27e8a5b.tetromino@gentoo \
--to=tetromino@gmail.com \
--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