From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
Date: Thu, 24 May 2012 09:11:59 +0000 (UTC) [thread overview]
Message-ID: <1337849331.3e16dac0b4b9cc42450416d5dfd29890de6e445b.tetromino@gentoo> (raw)
commit: 3e16dac0b4b9cc42450416d5dfd29890de6e445b
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 08:48:51 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 08:48:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e16dac0
net-im/empathy: moved to gx86; update live ebuild
---
net-im/empathy/empathy-3.4.1.ebuild | 130 -----------------------------------
net-im/empathy/empathy-9999.ebuild | 38 ++++++----
2 files changed, 22 insertions(+), 146 deletions(-)
diff --git a/net-im/empathy/empathy-3.4.1.ebuild b/net-im/empathy/empathy-3.4.1.ebuild
deleted file mode 100644
index 115b710..0000000
--- a/net-im/empathy/empathy-3.4.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2.ebuild,v 1.3 2012/02/14 04:57:56 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug eds +map +geoloc gnome-online-accounts legacy-call +networkmanager sendto spell test +v4l"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# libgee extensively used in libempathy
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-# clutter-1.10 dep is missing in configure, newer API is used
-# folks-0.6.8 is needed to load the contacts list, configure is wrong again
-RDEPEND=">=dev-libs/glib-2.30:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.3.6:3
- x11-libs/pango
- >=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.6.8
- dev-libs/libgee:0
- >=gnome-base/gnome-keyring-2.91.4-r300
- >=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/gnutls-2.8.5
- >=net-libs/webkit-gtk-1.3.13:3
- >=x11-libs/libnotify-0.7
-
- >=media-libs/clutter-1.10.0:1.0
- >=media-libs/clutter-gtk-0.90.3:1.0
- >=media-libs/clutter-gst-1.5.2:1.0
-
- >=net-libs/telepathy-glib-0.17.5
- >=net-im/telepathy-logger-0.2.13
- >=net-libs/telepathy-farstream-0.2.1
- net-im/telepathy-connection-managers
-
- dev-libs/libxml2:2
- gnome-base/gsettings-desktop-schemas
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad
- media-sound/pulseaudio[glib]
- net-libs/libsoup:2.4
- x11-libs/libX11
- x11-themes/gnome-icon-theme-symbolic
-
- eds? ( >=gnome-extra/evolution-data-server-1.2 )
- geoloc? ( >=app-misc/geoclue-0.12 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 )
- map? (
- >=media-libs/clutter-1.7.14:1.0
- >=media-libs/clutter-gtk-0.90.3:1.0
- >=media-libs/libchamplain-0.12.1:0.12[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 )
- v4l? (
- || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
- media-plugins/gst-plugins-v4l2:0.10
- >=media-video/cheese-2.91.91.1 )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- dev-util/itstool
-
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- test? (
- sys-apps/grep
- >=dev-libs/check-0.9.4 )
- dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
-
-pkg_setup() {
- DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- --disable-coding-style-checks
- --disable-schemas-compile
- --disable-static
- --disable-meego
- --disable-Werror
- $(use_enable legacy-call empathy-av)
- $(use_enable debug)
- $(use_with eds)
- $(use_enable geoloc location)
- $(use_enable gnome-online-accounts goa)
- $(use_enable map)
- $(use_with networkmanager connectivity nm)
- $(use_enable sendto nautilus-sendto)
- $(use_enable spell)
- $(use_with v4l cheese)
- $(use_enable v4l gudev)"
-
- # Build time python tools need python2
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- elog "Empathy needs telepathy's connection managers to use any IM protocol."
- elog "See the USE flags on net-im/telepathy-connection-managers"
- elog "to install them."
-}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 115b710..d36c4f8 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2.ebuild,v 1.3 2012/02/14 04:57:56 tetromino Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="no"
@@ -17,20 +17,18 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug eds +map +geoloc gnome-online-accounts legacy-call +networkmanager sendto spell test +v4l"
+IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86 ~x86-linux"
fi
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
# libgee extensively used in libempathy
# gdk-pixbuf and pango extensively used in libempathy-gtk
# clutter-1.10 dep is missing in configure, newer API is used
# folks-0.6.8 is needed to load the contacts list, configure is wrong again
-RDEPEND=">=dev-libs/glib-2.30:2
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.3.6:3
x11-libs/pango
@@ -44,25 +42,22 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=x11-libs/libnotify-0.7
>=media-libs/clutter-1.10.0:1.0
- >=media-libs/clutter-gtk-0.90.3:1.0
+ >=media-libs/clutter-gtk-1.1.2:1.0
>=media-libs/clutter-gst-1.5.2:1.0
- >=net-libs/telepathy-glib-0.17.5
+ >=net-libs/telepathy-glib-0.18
>=net-im/telepathy-logger-0.2.13
>=net-libs/telepathy-farstream-0.2.1
- net-im/telepathy-connection-managers
dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad
media-sound/pulseaudio[glib]
net-libs/libsoup:2.4
x11-libs/libX11
- x11-themes/gnome-icon-theme-symbolic
eds? ( >=gnome-extra/evolution-data-server-1.2 )
+ geocode? ( sci-geosciences/geocode-glib )
geoloc? ( >=app-misc/geoclue-0.12 )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 )
map? (
@@ -75,11 +70,21 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
- || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
media-plugins/gst-plugins-v4l2:0.10
- >=media-video/cheese-2.91.91.1 )
+ >=media-video/cheese-3.4
+ sys-fs/udev[gudev] )
+"
+# 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="${COMMON_DEPEND}
+ media-libs/gst-plugins-base:0.10
+ media-libs/gst-plugins-bad
+ net-im/telepathy-connection-managers
+ x11-themes/gnome-icon-theme-symbolic
+ gnome? ( gnome-extra/gnome-contacts )
+ !legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-libs/libxml2:2
dev-util/itstool
@@ -90,7 +95,7 @@ DEPEND="${RDEPEND}
>=dev-libs/check-0.9.4 )
dev-libs/libxslt
"
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
+PDEPEND=">=net-im/telepathy-mission-control-5.12"
pkg_setup() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
@@ -103,6 +108,7 @@ pkg_setup() {
$(use_enable legacy-call empathy-av)
$(use_enable debug)
$(use_with eds)
+ $(use_enable geocode)
$(use_enable geoloc location)
$(use_enable gnome-online-accounts goa)
$(use_enable map)
@@ -127,4 +133,4 @@ pkg_postinst() {
elog "Empathy needs telepathy's connection managers to use any IM protocol."
elog "See the USE flags on net-im/telepathy-connection-managers"
elog "to install them."
-}
+}
\ No newline at end of file
next reply other threads:[~2012-05-24 9:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 9:11 Alexandre Restovtsev [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-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-10 21:44 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=1337849331.3e16dac0b4b9cc42450416d5dfd29890de6e445b.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