* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-02-15 23:45 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-02-15 23:45 UTC (permalink / raw
To: gentoo-commits
commit: 05a8e0368c45631fc4a79557d31d3396d3f0607c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 22:21:41 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 23:44:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=05a8e036
Add net-im/empathy-2.91.6.1
* IUSE nautilus changed to sendto, new IUSE +gnome for control-center embedding
* GTK3 version
* Needs ~dev-libs/folks-0.3.4 because 0.3.6 broke API
---
net-im/empathy/empathy-2.91.6.1.ebuild | 106 ++++++++++++++++++++++++++++++++
1 files changed, 106 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.6.1.ebuild b/net-im/empathy/empathy-2.91.6.1.ebuild
new file mode 100644
index 0000000..fe64830
--- /dev/null
+++ b/net-im/empathy/empathy-2.91.6.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $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"
+PYTHON_DEPEND="2:2.4"
+
+inherit eutils gnome2 multilib python
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="+gnome eds sendto networkmanager spell test webkit" # map
+
+# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
+# eventually at which point the dep can be dropped
+# XXX: dbus-glib is for dbus-binding-tool, but it's not actually used anywhere?
+# NOTE: ~folks-0.3.4 is required. 0.3.6 broke API.
+RDEPEND=">=dev-libs/glib-2.27.2:2
+ >=x11-libs/gtk+-2.99.0:3
+ >=dev-libs/dbus-glib-0.51
+ >=net-libs/telepathy-glib-0.13.11
+ >=media-libs/libcanberra-0.25[gtk3]
+ >=x11-libs/libnotify-0.7.0
+ >=gnome-base/gnome-keyring-2.91.4-r300
+ >=net-libs/gnutls-2.8.5
+ ~dev-libs/folks-0.3.4
+
+ gnome-base/gsettings-desktop-schemas
+ net-libs/farsight2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10
+ media-libs/gst-plugins-bad
+ >=net-libs/telepathy-farsight-0.0.14
+ dev-libs/libxml2
+ x11-libs/libX11
+ net-voip/telepathy-connection-managers
+ >=net-im/telepathy-logger-0.1.5
+
+ 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 )
+ networkmanager? ( >=net-misc/networkmanager-0.7 )
+ 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.7.1[gtk]
+# >=media-libs/clutter-gtk-0.90.3:1.0 )
+DEPEND="${RDEPEND}
+ app-text/scrollkeeper
+ >=app-text/gnome-doc-utils-0.17.3
+ >=dev-util/intltool-0.35.0
+ >=dev-util/pkgconfig-0.16
+ test? (
+ sys-apps/grep
+ >=dev-libs/check-0.9.4 )
+ dev-libs/libxslt
+"
+PDEPEND=">=net-im/telepathy-mission-control-5"
+
+pkg_setup() {
+ # Build time python tools needs python2
+ python_set_active_version 2
+}
+
+src_prepare() {
+ DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+
+ # Hard disable favourite_contacts and tpl, TpLogger is buggy.
+ G2CONF="${G2CONF}
+ --disable-static
+ --disable-location
+ --disable-map
+ --disable-Werror
+ $(use_enable debug)
+ $(use_enable gnome control-center-embedding)
+ $(use_with eds)
+ $(use_enable sendto nautilus-sendto)
+ $(use_with networkmanager connectivity nm)
+ $(use_enable spell)
+ $(use_enable test coding-style-checks)
+ $(use_enable webkit)"
+
+ python_convert_shebangs -r 2 .
+
+ gnome2_src_prepare
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ emake check || die "emake check failed."
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ elog "Empathy needs telepathy's connection managers to use any IM protocol."
+ elog "See the USE flags on net-voip/telepathy-connection-managers"
+ elog "to install them."
+}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-02-22 20:35 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-02-22 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 6f60d7cd94a2aea38c60b8aa89d7aaa8f8353b2c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 20:11:22 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 20:11:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6f60d7cd
net-im/empathy: add libchamplain (map) support
---
net-im/empathy/empathy-2.91.90.ebuild | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.90.ebuild b/net-im/empathy/empathy-2.91.90.ebuild
index 455079a..f5af662 100644
--- a/net-im/empathy/empathy-2.91.90.ebuild
+++ b/net-im/empathy/empathy-2.91.90.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="+gnome eds sendto networkmanager spell test webkit" # map
+IUSE="+gnome eds +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
@@ -48,10 +48,10 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
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[gtk]:0.10
-# media-libs/clutter-gtk:1.0 )
+ 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
@@ -72,17 +72,18 @@ pkg_setup() {
src_prepare() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
- # TODO: Re-add map/location support
+ # TODO: Re-add location support
G2CONF="${G2CONF}
--disable-static
+ --disable-meego
--disable-location
- --disable-map
--disable-Werror
$(use_enable debug)
$(use_enable gnome control-center-embedding)
$(use_with eds)
- $(use_enable sendto nautilus-sendto)
+ $(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)"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-03-09 11:34 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-03-09 11:34 UTC (permalink / raw
To: gentoo-commits
commit: d63a0657e807183a52f2f97435a1ef437b5255e3
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 05:41:39 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 11:21:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d63a0657
net-im/empathy: 2.91.90.2 → 2.91.91
---
...thy-2.91.90.2.ebuild => empathy-2.91.91.ebuild} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.90.2.ebuild b/net-im/empathy/empathy-2.91.91.ebuild
similarity index 97%
rename from net-im/empathy/empathy-2.91.90.2.ebuild
rename to net-im/empathy/empathy-2.91.91.ebuild
index e9e269b..e6cacc2 100644
--- a/net-im/empathy/empathy-2.91.90.2.ebuild
+++ b/net-im/empathy/empathy-2.91.91.ebuild
@@ -21,9 +21,9 @@ IUSE="+gnome eds +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
RDEPEND=">=dev-libs/glib-2.27.2:2
- >=x11-libs/gtk+-2.99.0:3
+ >=x11-libs/gtk+-3.0.2:3
>=dev-libs/dbus-glib-0.51
- >=net-libs/telepathy-glib-0.13.12
+ >=net-libs/telepathy-glib-0.13.16
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7.0
>=gnome-base/gnome-keyring-2.91.4-r300
@@ -36,7 +36,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
media-libs/gst-plugins-base:0.10
media-libs/gst-plugins-bad
>=net-libs/telepathy-farsight-0.0.14
- dev-libs/libxml2
+ dev-libs/libxml2:2
x11-libs/libX11
net-voip/telepathy-connection-managers
>=net-im/telepathy-logger-0.2.0
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-03-14 21:59 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-03-14 21:59 UTC (permalink / raw
To: gentoo-commits
commit: fd0f825bf03e78f7bc8ab5fc6899d318fa486e54
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 21:51:53 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 21:51:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fd0f825b
net-im/empathy: add live ebuild
---
net-im/empathy/empathy-2.91.91.ebuild | 7 ++++++-
...{empathy-2.91.91.ebuild => empathy-9999.ebuild} | 9 +++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.91.ebuild b/net-im/empathy/empathy-2.91.91.ebuild
index e6cacc2..beb588a 100644
--- a/net-im/empathy/empathy-2.91.91.ebuild
+++ b/net-im/empathy/empathy-2.91.91.ebuild
@@ -14,9 +14,14 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
# 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
+ inherit gnome2-live
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+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
diff --git a/net-im/empathy/empathy-2.91.91.ebuild b/net-im/empathy/empathy-9999.ebuild
similarity index 95%
copy from net-im/empathy/empathy-2.91.91.ebuild
copy to net-im/empathy/empathy-9999.ebuild
index e6cacc2..39e0846 100644
--- a/net-im/empathy/empathy-2.91.91.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -14,9 +14,14 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
# 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
+ inherit gnome2-live
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+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
@@ -28,7 +33,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
>=x11-libs/libnotify-0.7.0
>=gnome-base/gnome-keyring-2.91.4-r300
>=net-libs/gnutls-2.8.5
- >=dev-libs/folks-0.3.5
+ >=dev-libs/folks-0.4.0
gnome-base/gsettings-desktop-schemas
net-libs/farsight2
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-03-23 5:20 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 17460d826e3cbe83d786b951b90fc0c442d0b61e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 02:34:54 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 04:12:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=17460d82
net-im/empathy: 2.91.91.1 → 2.91.92
---
...thy-2.91.91.1.ebuild => empathy-2.91.92.ebuild} | 2 +-
net-im/empathy/empathy-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.91.1.ebuild b/net-im/empathy/empathy-2.91.92.ebuild
similarity index 98%
rename from net-im/empathy/empathy-2.91.91.1.ebuild
rename to net-im/empathy/empathy-2.91.92.ebuild
index 39e0846..6f1a14d 100644
--- a/net-im/empathy/empathy-2.91.91.1.ebuild
+++ b/net-im/empathy/empathy-2.91.92.ebuild
@@ -28,7 +28,7 @@ fi
RDEPEND=">=dev-libs/glib-2.27.2:2
>=x11-libs/gtk+-3.0.2:3
>=dev-libs/dbus-glib-0.51
- >=net-libs/telepathy-glib-0.13.16
+ >=net-libs/telepathy-glib-0.14.1
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7.0
>=gnome-base/gnome-keyring-2.91.4-r300
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 39e0846..6f1a14d 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -28,7 +28,7 @@ fi
RDEPEND=">=dev-libs/glib-2.27.2:2
>=x11-libs/gtk+-3.0.2:3
>=dev-libs/dbus-glib-0.51
- >=net-libs/telepathy-glib-0.13.16
+ >=net-libs/telepathy-glib-0.14.1
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7.0
>=gnome-base/gnome-keyring-2.91.4-r300
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-03-29 8:35 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-03-29 8:35 UTC (permalink / raw
To: gentoo-commits
commit: fbc7c25c5fc1db77b5097e7493d81f91d4f00caf
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:44:32 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fbc7c25c
net-im/empathy: 2.91.92 → 2.91.93
---
...pathy-2.91.92.ebuild => empathy-2.91.93.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.92.ebuild b/net-im/empathy/empathy-2.91.93.ebuild
similarity index 100%
rename from net-im/empathy/empathy-2.91.92.ebuild
rename to net-im/empathy/empathy-2.91.93.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 8d2feb0073e69342d7f26c47fbb513e845ac7f23
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 16:32:50 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 16:32:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8d2feb00
net-im/empathy: 2.91.93 → 3.0.0
---
...empathy-2.91.93.ebuild => empathy-3.0.0.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-2.91.93.ebuild b/net-im/empathy/empathy-3.0.0.ebuild
similarity index 100%
rename from net-im/empathy/empathy-2.91.93.ebuild
rename to net-im/empathy/empathy-3.0.0.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-04-10 21:44 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-10 21:44 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-04-17 21:28 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-17 21:28 UTC (permalink / raw
To: gentoo-commits
commit: ef8e535e2bb3ea2ba220ed8a657175bbef6052de
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 21:16:50 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 21:17:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ef8e535e
net-im/empathy: add preliminary geoclue support
---
net-im/empathy/empathy-3.0.0.ebuild | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-im/empathy/empathy-3.0.0.ebuild b/net-im/empathy/empathy-3.0.0.ebuild
index dc3787e..aca3cd1 100644
--- a/net-im/empathy/empathy-3.0.0.ebuild
+++ b/net-im/empathy/empathy-3.0.0.ebuild
@@ -23,7 +23,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 +gnome +map +geoloc +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
@@ -49,6 +49,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
>=net-im/telepathy-logger-0.2.8
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]
@@ -81,10 +82,10 @@ pkg_setup() {
--disable-schemas-compile
--disable-static
--disable-meego
- --disable-location
--disable-Werror
$(use_enable debug)
$(use_with eds)
+ $(use_enable geoloc location)
$(use_enable gnome control-center-embedding)
$(use_enable map)
$(use_with networkmanager connectivity nm)
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-04-29 17:29 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-04-29 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 301d0b35009d7efb08c39ff81e95ad4848e7c743
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 17:15:41 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 17:15:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=301d0b35
net-im/empathy: 3.0.0 → 3.0.1
---
.../{empathy-3.0.0.ebuild => empathy-3.0.1.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.0.0.ebuild b/net-im/empathy/empathy-3.0.1.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.0.0.ebuild
rename to net-im/empathy/empathy-3.0.1.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-05-30 17:11 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2011-05-30 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 622ebfb4e2cc27b4c3a8d703238c7a3724fb6cb6
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue May 24 02:47:59 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 15:44:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=622ebfb4
net-im/empathy-3.0.2 version bump
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
---
.../{empathy-3.0.1.ebuild => empathy-3.0.2.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.0.1.ebuild b/net-im/empathy/empathy-3.0.2.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.0.1.ebuild
rename to net-im/empathy/empathy-3.0.2.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-07-27 5:51 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2011-07-27 5:51 UTC (permalink / raw
To: gentoo-commits
commit: f588706fccf22ab12e34b0ab13b8481cb713660d
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 04:35:10 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 27 04:35:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f588706f
net-im/empathy: fix gnome-control-center dependency
Requires a gtk3 version of gnome-control-center. Also, will not build
with gnome-control-center-3.1.4 or higher due to removed header files,
but should (probably) continue to run fine.
---
net-im/empathy/empathy-3.0.2.ebuild | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/net-im/empathy/empathy-3.0.2.ebuild b/net-im/empathy/empathy-3.0.2.ebuild
index aca3cd1..78a5dca 100644
--- a/net-im/empathy/empathy-3.0.2.ebuild
+++ b/net-im/empathy/empathy-3.0.2.ebuild
@@ -50,7 +50,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
eds? ( >=gnome-extra/evolution-data-server-1.2 )
geoloc? ( >=app-misc/geoclue-0.11 )
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
+ gnome? ( >=gnome-base/gnome-control-center-3.0.0 )
map? (
media-libs/libchamplain:0.10[gtk]
media-libs/clutter-gtk:1.0 )
@@ -61,11 +61,14 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
>=app-text/iso-codes-0.35 )
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
"
+# Will not build with gnome-control-center-3.1.4 due to removed headers,
+# but should (probably) continue to run
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
>=dev-util/intltool-0.35.0
>=dev-util/pkgconfig-0.16
+ gnome? ( <gnome-base/gnome-control-center-3.1.4 )
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-10-11 6:40 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2011-10-11 6:40 UTC (permalink / raw
To: gentoo-commits
commit: 8054a5a6417a85ed8658494e5e96ce478d0b2390
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 11 04:40:08 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 11 04:55:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8054a5a6
net-im/empathy: 3.2.0 → 3.2.0.1
Bump with various bugfixes. Call channel support is now controlled by a
USE flag since it appears to be an experimental feature, and since
Olivier Crête (the author of tp-farstream) mentioned on IRC that it
should not be enabled by default at this point.
---
...empathy-3.2.0.ebuild => empathy-3.2.0.1.ebuild} | 18 +++++++++++-------
net-im/empathy/empathy-9999.ebuild | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/net-im/empathy/empathy-3.2.0.ebuild b/net-im/empathy/empathy-3.2.0.1.ebuild
similarity index 89%
rename from net-im/empathy/empathy-3.2.0.ebuild
rename to net-im/empathy/empathy-3.2.0.1.ebuild
index 2579f00..8fde2d8 100644
--- a/net-im/empathy/empathy-3.2.0.ebuild
+++ b/net-im/empathy/empathy-3.2.0.1.ebuild
@@ -24,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 +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
+IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -47,23 +47,27 @@ RDEPEND=">=dev-libs/glib-2.28:2
dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
- >=media-libs/clutter-1.7.14: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
- net-libs/telepathy-farstream
net-voip/telepathy-connection-managers
x11-libs/libX11
+ call? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ media-libs/clutter-gst:1.0
+ net-libs/telepathy-farstream )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
geoloc? ( >=app-misc/geoclue-0.11 )
gnome-online-accounts? ( net-libs/gnome-online-accounts )
- map? ( media-libs/libchamplain:0.12[gtk] )
+ map? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ media-libs/libchamplain:0.12[gtk] )
networkmanager? ( >=net-misc/networkmanager-0.7 )
sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
@@ -95,7 +99,7 @@ pkg_setup() {
--disable-static
--disable-meego
--disable-Werror
- --enable-call
+ $(use_enable call)
$(use_enable debug)
$(use_with eds)
$(use_enable geoloc location)
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 2579f00..8fde2d8 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -24,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 +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
+IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -47,23 +47,27 @@ RDEPEND=">=dev-libs/glib-2.28:2
dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
- >=media-libs/clutter-1.7.14: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
- net-libs/telepathy-farstream
net-voip/telepathy-connection-managers
x11-libs/libX11
+ call? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ media-libs/clutter-gst:1.0
+ net-libs/telepathy-farstream )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
geoloc? ( >=app-misc/geoclue-0.11 )
gnome-online-accounts? ( net-libs/gnome-online-accounts )
- map? ( media-libs/libchamplain:0.12[gtk] )
+ map? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ media-libs/libchamplain:0.12[gtk] )
networkmanager? ( >=net-misc/networkmanager-0.7 )
sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
@@ -95,7 +99,7 @@ pkg_setup() {
--disable-static
--disable-meego
--disable-Werror
- --enable-call
+ $(use_enable call)
$(use_enable debug)
$(use_with eds)
$(use_enable geoloc location)
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-10-18 7:37 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 2f604d95701d8fd2dac34491bc7a773d7606a41b
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 05:42:07 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 05:42:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2f604d95
net-im/empathy: 3.2.0.1 → 3.2.1
Fixes numerous crashes and IRC topics. Update telepathy-glib dependency.
---
...empathy-3.2.0.1.ebuild => empathy-3.2.1.ebuild} | 2 +-
net-im/empathy/empathy-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/empathy/empathy-3.2.0.1.ebuild b/net-im/empathy/empathy-3.2.1.ebuild
similarity index 99%
rename from net-im/empathy/empathy-3.2.0.1.ebuild
rename to net-im/empathy/empathy-3.2.1.ebuild
index 8fde2d8..4a160b1 100644
--- a/net-im/empathy/empathy-3.2.0.1.ebuild
+++ b/net-im/empathy/empathy-3.2.1.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=media-libs/libcanberra-0.25[gtk3]
media-sound/pulseaudio[glib]
>=net-libs/gnutls-2.8.5
- >=net-libs/telepathy-glib-0.15.5
+ >=net-libs/telepathy-glib-0.16.0
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 8fde2d8..4a160b1 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=media-libs/libcanberra-0.25[gtk3]
media-sound/pulseaudio[glib]
>=net-libs/gnutls-2.8.5
- >=net-libs/telepathy-glib-0.15.5
+ >=net-libs/telepathy-glib-0.16.0
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2011-11-04 5:12 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2011-11-04 5:12 UTC (permalink / raw
To: gentoo-commits
commit: e6d6e1d3a709d7f5afe0604001f0281141a2a448
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 04:59:40 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Nov 4 05:02:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e6d6e1d3
net-im/empathy: qa + rename video flag to v4l
Move to EAPI4, drop unused eclasses, remove obsolete comments, add
missing dependencies, sync keywords with gx86.
Also, rename the video USE flag to v4l to better describe what it does.
---
net-im/empathy/empathy-3.2.1.1.ebuild | 29 +++++++++++------------------
net-im/empathy/empathy-9999.ebuild | 29 +++++++++++------------------
2 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/net-im/empathy/empathy-3.2.1.1.ebuild b/net-im/empathy/empathy-3.2.1.1.ebuild
index 4a160b1..4bc195d 100644
--- a/net-im/empathy/empathy-3.2.1.1.ebuild
+++ b/net-im/empathy/empathy-3.2.1.1.ebuild
@@ -2,13 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $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"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
PYTHON_DEPEND="2:2.4"
-inherit eutils gnome2 multilib python
+inherit gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -21,10 +20,9 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+ KEYWORDS="~amd64 ~x86 ~x86-linux"
fi
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
+IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -73,8 +71,9 @@ RDEPEND=">=dev-libs/glib-2.28:2
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
- video? (
+ 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}
@@ -92,7 +91,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
--disable-schemas-compile
@@ -108,22 +106,17 @@ pkg_setup() {
$(use_with networkmanager connectivity nm)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_with video cheese)
- $(use_enable video gudev)"
+ $(use_with v4l cheese)
+ $(use_enable v4l gudev)"
- # Build time python tools needs python2
+ # Build time python tools need python2
python_set_active_version 2
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- python_convert_shebangs -r 2 tools
+ python_pkg_setup
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
- emake check || die "emake check failed."
+ emake check
}
pkg_postinst() {
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 4a160b1..4bc195d 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -2,13 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $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"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
PYTHON_DEPEND="2:2.4"
-inherit eutils gnome2 multilib python
+inherit gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -21,10 +20,9 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+ KEYWORDS="~amd64 ~x86 ~x86-linux"
fi
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
+IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
@@ -73,8 +71,9 @@ RDEPEND=">=dev-libs/glib-2.28:2
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
- video? (
+ 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}
@@ -92,7 +91,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
--disable-schemas-compile
@@ -108,22 +106,17 @@ pkg_setup() {
$(use_with networkmanager connectivity nm)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_with video cheese)
- $(use_enable video gudev)"
+ $(use_with v4l cheese)
+ $(use_enable v4l gudev)"
- # Build time python tools needs python2
+ # Build time python tools need python2
python_set_active_version 2
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- python_convert_shebangs -r 2 tools
+ python_pkg_setup
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
- emake check || die "emake check failed."
+ emake check
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-03-26 8:20 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2012-03-26 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 91bd2a961ffc6f0aa48408aaeac4684721a39347
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 05:14:54 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=91bd2a96
Add net-im/empathy-3.3.92
---
.../{empathy-9999.ebuild => empathy-3.3.92.ebuild} | 55 ++++++++++----------
net-im/empathy/empathy-9999.ebuild | 55 ++++++++++----------
2 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-3.3.92.ebuild
similarity index 70%
copy from net-im/empathy/empathy-9999.ebuild
copy to net-im/empathy/empathy-3.3.92.ebuild
index bc68086..0ce449e 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-3.3.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.32.2.ebuild,v 1.6 2011/02/05 17:10:33 ssuominen Exp $
+# $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"
@@ -12,60 +12,61 @@ if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
-DESCRIPTION="Telepathy client and library using GTK+"
+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
-IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
# 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
-RDEPEND=">=dev-libs/glib-2.28:2
+RDEPEND=">=dev-libs/glib-2.30:2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/gtk+-3.3.6:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.6.2
+ >=dev-libs/folks-0.6.6
dev-libs/libgee:0
>=gnome-base/gnome-keyring-2.91.4-r300
>=media-libs/libcanberra-0.25[gtk3]
- media-sound/pulseaudio[glib]
>=net-libs/gnutls-2.8.5
- >=net-libs/telepathy-glib-0.16.0
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
+ >=media-libs/clutter-1.8.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.8
+ >=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
- >=net-im/telepathy-logger-0.2.8
- net-libs/farsight2
- >=net-libs/telepathy-farsight-0.0.14
- net-voip/telepathy-connection-managers
+ media-sound/pulseaudio[glib]
+ net-libs/libsoup:2.4
x11-libs/libX11
+ x11-themes/gnome-icon-theme-symbolic
- call? (
- >=media-libs/clutter-1.7.14:1.0
- >=media-libs/clutter-gtk-0.90.3:1.0
- media-libs/clutter-gst:1.0
- net-libs/telepathy-farstream )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
- geoloc? ( >=app-misc/geoclue-0.11 )
- gnome-online-accounts? ( net-libs/gnome-online-accounts )
+ 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[gtk] )
+ >=media-libs/libchamplain-0.12.1:0.12[gtk] )
networkmanager? ( >=net-misc/networkmanager-0.7 )
sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
@@ -77,11 +78,11 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=media-video/cheese-2.91.91.1 )
"
DEPEND="${RDEPEND}
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.17.3
- >=dev-util/intltool-0.35.0
+ dev-libs/libxml2:2
+ dev-util/itstool
+
+ >=dev-util/intltool-0.40.0
>=dev-util/pkgconfig-0.16
- >=sys-devel/gettext-0.17
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
@@ -97,7 +98,7 @@ pkg_setup() {
--disable-static
--disable-meego
--disable-Werror
- $(use_enable call)
+ $(use_enable legacy-call empathy-av)
$(use_enable debug)
$(use_with eds)
$(use_enable geoloc location)
@@ -122,6 +123,6 @@ src_test() {
pkg_postinst() {
gnome2_pkg_postinst
elog "Empathy needs telepathy's connection managers to use any IM protocol."
- elog "See the USE flags on net-voip/telepathy-connection-managers"
+ 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 bc68086..0ce449e 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.32.2.ebuild,v 1.6 2011/02/05 17:10:33 ssuominen Exp $
+# $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"
@@ -12,60 +12,61 @@ if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
-DESCRIPTION="Telepathy client and library using GTK+"
+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
-IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
# 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
-RDEPEND=">=dev-libs/glib-2.28:2
+RDEPEND=">=dev-libs/glib-2.30:2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/gtk+-3.3.6:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.6.2
+ >=dev-libs/folks-0.6.6
dev-libs/libgee:0
>=gnome-base/gnome-keyring-2.91.4-r300
>=media-libs/libcanberra-0.25[gtk3]
- media-sound/pulseaudio[glib]
>=net-libs/gnutls-2.8.5
- >=net-libs/telepathy-glib-0.16.0
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
+ >=media-libs/clutter-1.8.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.8
+ >=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
- >=net-im/telepathy-logger-0.2.8
- net-libs/farsight2
- >=net-libs/telepathy-farsight-0.0.14
- net-voip/telepathy-connection-managers
+ media-sound/pulseaudio[glib]
+ net-libs/libsoup:2.4
x11-libs/libX11
+ x11-themes/gnome-icon-theme-symbolic
- call? (
- >=media-libs/clutter-1.7.14:1.0
- >=media-libs/clutter-gtk-0.90.3:1.0
- media-libs/clutter-gst:1.0
- net-libs/telepathy-farstream )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
- geoloc? ( >=app-misc/geoclue-0.11 )
- gnome-online-accounts? ( net-libs/gnome-online-accounts )
+ 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[gtk] )
+ >=media-libs/libchamplain-0.12.1:0.12[gtk] )
networkmanager? ( >=net-misc/networkmanager-0.7 )
sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
@@ -77,11 +78,11 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=media-video/cheese-2.91.91.1 )
"
DEPEND="${RDEPEND}
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.17.3
- >=dev-util/intltool-0.35.0
+ dev-libs/libxml2:2
+ dev-util/itstool
+
+ >=dev-util/intltool-0.40.0
>=dev-util/pkgconfig-0.16
- >=sys-devel/gettext-0.17
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
@@ -97,7 +98,7 @@ pkg_setup() {
--disable-static
--disable-meego
--disable-Werror
- $(use_enable call)
+ $(use_enable legacy-call empathy-av)
$(use_enable debug)
$(use_with eds)
$(use_enable geoloc location)
@@ -122,6 +123,6 @@ src_test() {
pkg_postinst() {
gnome2_pkg_postinst
elog "Empathy needs telepathy's connection managers to use any IM protocol."
- elog "See the USE flags on net-voip/telepathy-connection-managers"
+ elog "See the USE flags on net-im/telepathy-connection-managers"
elog "to install them."
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-03-28 19:53 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2012-03-28 19:53 UTC (permalink / raw
To: gentoo-commits
commit: d3e59278d19f0567bf57ef2a651bcea6d1379292
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 19:53:09 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 19:53:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d3e59278
net-im/empathy: 3.3.92 → 3.4.0
---
...{empathy-3.3.92.ebuild => empathy-3.4.0.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.3.92.ebuild b/net-im/empathy/empathy-3.4.0.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.3.92.ebuild
rename to net-im/empathy/empathy-3.4.0.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-03-28 21:00 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2012-03-28 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 400737726f0cb9b0acf809129a6c2707d2c300b9
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 20:48:41 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 20:59:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=40073772
net-im/empathy: bump clutter+folks deps, configure is wrong
---
net-im/empathy/empathy-3.4.0.ebuild | 6 ++++--
net-im/empathy/empathy-9999.ebuild | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/net-im/empathy/empathy-3.4.0.ebuild b/net-im/empathy/empathy-3.4.0.ebuild
index 0ce449e..67b7cf5 100644
--- a/net-im/empathy/empathy-3.4.0.ebuild
+++ b/net-im/empathy/empathy-3.4.0.ebuild
@@ -28,12 +28,14 @@ fi
# 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.6
+ >=dev-libs/folks-0.6.8
dev-libs/libgee:0
>=gnome-base/gnome-keyring-2.91.4-r300
>=media-libs/libcanberra-0.25[gtk3]
@@ -41,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
- >=media-libs/clutter-1.8.0:1.0
+ >=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
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 0ce449e..67b7cf5 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -28,12 +28,14 @@ fi
# 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.6
+ >=dev-libs/folks-0.6.8
dev-libs/libgee:0
>=gnome-base/gnome-keyring-2.91.4-r300
>=media-libs/libcanberra-0.25[gtk3]
@@ -41,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
- >=media-libs/clutter-1.8.0:1.0
+ >=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
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-04-06 3:14 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2012-04-06 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 320ef5ddf35f1bbd8bf274f7a0b9b96cbc7d3acb
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 6 03:08:39 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr 6 03:08:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=320ef5dd
net-im/empathy: 3.4.0 → 3.4.0.1
---
...empathy-3.4.0.ebuild => empathy-3.4.0.1.ebuild} | 2 +-
net-im/empathy/empathy-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/empathy/empathy-3.4.0.ebuild b/net-im/empathy/empathy-3.4.0.1.ebuild
similarity index 99%
rename from net-im/empathy/empathy-3.4.0.ebuild
rename to net-im/empathy/empathy-3.4.0.1.ebuild
index 67b7cf5..e69774a 100644
--- a/net-im/empathy/empathy-3.4.0.ebuild
+++ b/net-im/empathy/empathy-3.4.0.1.ebuild
@@ -48,7 +48,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=media-libs/clutter-gst-1.5.2:1.0
>=net-libs/telepathy-glib-0.17.5
- >=net-im/telepathy-logger-0.2.8
+ >=net-im/telepathy-logger-0.2.13
>=net-libs/telepathy-farstream-0.2.1
net-im/telepathy-connection-managers
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 67b7cf5..e69774a 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=media-libs/clutter-gst-1.5.2:1.0
>=net-libs/telepathy-glib-0.17.5
- >=net-im/telepathy-logger-0.2.8
+ >=net-im/telepathy-logger-0.2.13
>=net-libs/telepathy-farstream-0.2.1
net-im/telepathy-connection-managers
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-04-06 8:38 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2012-04-06 8:38 UTC (permalink / raw
To: gentoo-commits
commit: a51982f4f66e4d8a6b99c56f7f906f4d7e5cd938
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 6 08:14:35 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr 6 08:38:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a51982f4
net-im/empathy: 3.4.0.1 → 3.4.0.2
---
...pathy-3.4.0.1.ebuild => empathy-3.4.0.2.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.4.0.1.ebuild b/net-im/empathy/empathy-3.4.0.2.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.4.0.1.ebuild
rename to net-im/empathy/empathy-3.4.0.2.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-05-02 5:33 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2012-05-02 5:33 UTC (permalink / raw
To: gentoo-commits
commit: ef80dc9b18f2a3a0b80b8b66b00ada3bf6c059d2
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 05:23:59 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed May 2 05:23:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ef80dc9b
net-im/empathy: 3.4.0.2 → 3.4.1
---
...empathy-3.4.0.2.ebuild => empathy-3.4.1.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.4.0.2.ebuild b/net-im/empathy/empathy-3.4.1.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.4.0.2.ebuild
rename to net-im/empathy/empathy-3.4.1.ebuild
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-05-24 9:11 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2012-05-24 9:11 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-07-18 0:59 Alexandre Restovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Restovtsev @ 2012-07-18 0:59 UTC (permalink / raw
To: gentoo-commits
commit: 5e875a9c822b84d141c237f04b48c412196bfb9b
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 00:59:29 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 18 00:59:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5e875a9c
net-im/empathy: sync with gx86
---
net-im/empathy/empathy-9999.ebuild | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index d36c4f8..99f45fb 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -76,10 +76,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
"
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
+# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:0.10
media-libs/gst-plugins-bad
net-im/telepathy-connection-managers
+ !<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )
!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-09-09 12:43 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2012-09-09 12:43 UTC (permalink / raw
To: gentoo-commits
commit: e3cafc570842c9d002f18910aee4612b8b1cdf01
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 06:06:53 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 12:11:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e3cafc57
Add net-im/empathy-3.5.91.1
---
...empathy-9999.ebuild => empathy-3.5.91.1.ebuild} | 45 +++++++------------
net-im/empathy/empathy-9999.ebuild | 45 +++++++------------
2 files changed, 34 insertions(+), 56 deletions(-)
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-3.5.91.1.ebuild
similarity index 75%
copy from net-im/empathy/empathy-9999.ebuild
copy to net-im/empathy/empathy-3.5.91.1.ebuild
index 99f45fb..448f42f 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-3.5.91.1.ebuild
@@ -17,54 +17,50 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
+IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86 ~x86-linux"
fi
-# 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
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
+COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.3.6:3
+ >=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.6.8
+ >=dev-libs/folks-0.7.1
dev-libs/libgee:0
- >=gnome-base/gnome-keyring-2.91.4-r300
+ >=app-crypt/libsecret-0.5
>=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/gstreamer:0.10
>=media-libs/clutter-1.10.0: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.18
- >=net-im/telepathy-logger-0.2.13
>=net-libs/telepathy-farstream-0.2.1
+ >=net-libs/telepathy-glib-0.19.6
+ >=net-im/telepathy-logger-0.2.13
+ app-crypt/gcr
dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
- media-libs/gstreamer:0.10
media-sound/pulseaudio[glib]
net-libs/libsoup:2.4
x11-libs/libX11
- 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 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
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
@@ -72,8 +68,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
v4l? (
media-plugins/gst-plugins-v4l2:0.10
>=media-video/cheese-3.4
- sys-fs/udev[gudev] )
-"
+ 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
# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
@@ -83,38 +78,32 @@ RDEPEND="${COMMON_DEPEND}
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
- gnome? ( gnome-extra/gnome-contacts )
- !legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
-"
+ gnome? ( gnome-extra/gnome-contacts )"
DEPEND="${COMMON_DEPEND}
dev-libs/libxml2:2
- dev-util/itstool
- >=dev-util/intltool-0.40.0
+ >=dev-util/intltool-0.50.0
virtual/pkgconfig
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt
-"
+ dev-libs/libxslt"
PDEPEND=">=net-im/telepathy-mission-control-5.12"
pkg_setup() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
+ --disable-ubuntu-online-accounts
--disable-coding-style-checks
--disable-schemas-compile
--disable-static
- --disable-meego
--disable-Werror
- $(use_enable legacy-call empathy-av)
+ --disable-gst-1.0
$(use_enable debug)
- $(use_with eds)
$(use_enable geocode)
$(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)
@@ -135,4 +124,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
+}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 99f45fb..448f42f 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -17,54 +17,50 @@ HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
+IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86 ~x86-linux"
fi
-# 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
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
+COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.3.6:3
+ >=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.6.8
+ >=dev-libs/folks-0.7.1
dev-libs/libgee:0
- >=gnome-base/gnome-keyring-2.91.4-r300
+ >=app-crypt/libsecret-0.5
>=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/gstreamer:0.10
>=media-libs/clutter-1.10.0: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.18
- >=net-im/telepathy-logger-0.2.13
>=net-libs/telepathy-farstream-0.2.1
+ >=net-libs/telepathy-glib-0.19.6
+ >=net-im/telepathy-logger-0.2.13
+ app-crypt/gcr
dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
- media-libs/gstreamer:0.10
media-sound/pulseaudio[glib]
net-libs/libsoup:2.4
x11-libs/libX11
- 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 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
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
@@ -72,8 +68,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
v4l? (
media-plugins/gst-plugins-v4l2:0.10
>=media-video/cheese-3.4
- sys-fs/udev[gudev] )
-"
+ 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
# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
@@ -83,38 +78,32 @@ RDEPEND="${COMMON_DEPEND}
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
- gnome? ( gnome-extra/gnome-contacts )
- !legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
-"
+ gnome? ( gnome-extra/gnome-contacts )"
DEPEND="${COMMON_DEPEND}
dev-libs/libxml2:2
- dev-util/itstool
- >=dev-util/intltool-0.40.0
+ >=dev-util/intltool-0.50.0
virtual/pkgconfig
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt
-"
+ dev-libs/libxslt"
PDEPEND=">=net-im/telepathy-mission-control-5.12"
pkg_setup() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
+ --disable-ubuntu-online-accounts
--disable-coding-style-checks
--disable-schemas-compile
--disable-static
- --disable-meego
--disable-Werror
- $(use_enable legacy-call empathy-av)
+ --disable-gst-1.0
$(use_enable debug)
- $(use_with eds)
$(use_enable geocode)
$(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)
@@ -135,4 +124,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
+}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-09-10 16:36 Alexandre Rostovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-10 16:36 UTC (permalink / raw
To: gentoo-commits
commit: cb5f7d0d7128a1e1203fbd8751bbc6e29078c243
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 16:36:17 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 16:36:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cb5f7d0d
net-im/empathy: missing farstream dep (bug #434604)
Thanks to Andrea Arteaga.
---
net-im/empathy/empathy-3.5.91.1.ebuild | 1 +
net-im/empathy/empathy-9999.ebuild | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.5.91.1.ebuild b/net-im/empathy/empathy-3.5.91.1.ebuild
index 448f42f..aec8b3a 100644
--- a/net-im/empathy/empathy-3.5.91.1.ebuild
+++ b/net-im/empathy/empathy-3.5.91.1.ebuild
@@ -43,6 +43,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=media-libs/clutter-gtk-1.1.2:1.0
>=media-libs/clutter-gst-1.5.2:1.0
+ net-libs/farstream
>=net-libs/telepathy-farstream-0.2.1
>=net-libs/telepathy-glib-0.19.6
>=net-im/telepathy-logger-0.2.13
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 448f42f..aec8b3a 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -43,6 +43,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=media-libs/clutter-gtk-1.1.2:1.0
>=media-libs/clutter-gst-1.5.2:1.0
+ net-libs/farstream
>=net-libs/telepathy-farstream-0.2.1
>=net-libs/telepathy-glib-0.19.6
>=net-im/telepathy-logger-0.2.13
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-09-21 0:27 Nirbheek Chauhan
0 siblings, 0 replies; 38+ messages in thread
From: Nirbheek Chauhan @ 2012-09-21 0:27 UTC (permalink / raw
To: gentoo-commits
commit: 302e230466ea2694be2c319b4261493e5502dca5
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 22:58:45 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 00:08:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=302e2304
net-im/empathy: 3.5.91.1 → 3.5.92
---
...pathy-3.5.91.1.ebuild => empathy-3.5.92.ebuild} | 9 ++++-----
net-im/empathy/empathy-9999.ebuild | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/net-im/empathy/empathy-3.5.91.1.ebuild b/net-im/empathy/empathy-3.5.92.ebuild
similarity index 96%
rename from net-im/empathy/empathy-3.5.91.1.ebuild
rename to net-im/empathy/empathy-3.5.92.ebuild
index aec8b3a..2c72bec 100644
--- a/net-im/empathy/empathy-3.5.91.1.ebuild
+++ b/net-im/empathy/empathy-3.5.92.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit gnome2 python
+inherit gnome2 python virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -30,7 +30,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.1
+ >=dev-libs/folks-0.7.3
dev-libs/libgee:0
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
@@ -45,7 +45,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
net-libs/farstream
>=net-libs/telepathy-farstream-0.2.1
- >=net-libs/telepathy-glib-0.19.6
+ >=net-libs/telepathy-glib-0.19.9
>=net-im/telepathy-logger-0.2.13
app-crypt/gcr
@@ -116,8 +116,7 @@ pkg_setup() {
}
src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
+ Xemake check
}
pkg_postinst() {
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index aec8b3a..2c72bec 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit gnome2 python
+inherit gnome2 python virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -30,7 +30,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.1
+ >=dev-libs/folks-0.7.3
dev-libs/libgee:0
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
@@ -45,7 +45,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
net-libs/farstream
>=net-libs/telepathy-farstream-0.2.1
- >=net-libs/telepathy-glib-0.19.6
+ >=net-libs/telepathy-glib-0.19.9
>=net-im/telepathy-logger-0.2.13
app-crypt/gcr
@@ -116,8 +116,7 @@ pkg_setup() {
}
src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
+ Xemake check
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-10-27 21:09 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-27 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 34acf6d7cf5180e296e03f25227d55a43c613722
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 21:08:32 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 21:08:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=34acf6d7
net-im/empathy: 3.5.92 → 3.6.1
---
...{empathy-3.5.92.ebuild => empathy-3.6.1.ebuild} | 11 +++++++----
net-im/empathy/empathy-9999.ebuild | 11 +++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/net-im/empathy/empathy-3.5.92.ebuild b/net-im/empathy/empathy-3.6.1.ebuild
similarity index 98%
rename from net-im/empathy/empathy-3.5.92.ebuild
rename to net-im/empathy/empathy-3.6.1.ebuild
index 2c72bec..700621d 100644
--- a/net-im/empathy/empathy-3.5.92.ebuild
+++ b/net-im/empathy/empathy-3.6.1.ebuild
@@ -92,6 +92,12 @@ DEPEND="${COMMON_DEPEND}
PDEPEND=">=net-im/telepathy-mission-control-5.12"
pkg_setup() {
+ # Build time python tools need python2
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-ubuntu-online-accounts
@@ -109,10 +115,7 @@ pkg_setup() {
$(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
+ gnome2_src_configure
}
src_test() {
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 2c72bec..700621d 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -92,6 +92,12 @@ DEPEND="${COMMON_DEPEND}
PDEPEND=">=net-im/telepathy-mission-control-5.12"
pkg_setup() {
+ # Build time python tools need python2
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-ubuntu-online-accounts
@@ -109,10 +115,7 @@ pkg_setup() {
$(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
+ gnome2_src_configure
}
src_test() {
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-11-07 20:07 Alexandre Rostovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Rostovtsev @ 2012-11-07 20:07 UTC (permalink / raw
To: gentoo-commits
commit: c0bd62813e615675864661bd29da227d9cfe8a92
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 7 20:07:13 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 20:07:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c0bd6281
net-im/empathy: slot gst dependency
---
net-im/empathy/empathy-3.6.1.ebuild | 2 +-
net-im/empathy/empathy-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.1.ebuild b/net-im/empathy/empathy-3.6.1.ebuild
index 700621d..50520a4 100644
--- a/net-im/empathy/empathy-3.6.1.ebuild
+++ b/net-im/empathy/empathy-3.6.1.ebuild
@@ -75,7 +75,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad
+ media-libs/gst-plugins-bad:0.10
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 700621d..50520a4 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -75,7 +75,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad
+ media-libs/gst-plugins-bad:0.10
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-11-21 20:51 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-21 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 0f604fc9ef9b74ef05d3a0b7a43efc8dc5f4362c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 20:43:36 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 20:43:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0f604fc9
net-im/empathy: 3.6.1 → 3.6.2
Mostly fixes to gnome-online-account support.
---
.../{empathy-3.6.1.ebuild => empathy-3.6.2.ebuild} | 0
net-im/empathy/metadata.xml | 28 ++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.1.ebuild b/net-im/empathy/empathy-3.6.2.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.6.1.ebuild
rename to net-im/empathy/empathy-3.6.2.ebuild
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
new file mode 100644
index 0000000..a5e8268
--- /dev/null
+++ b/net-im/empathy/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <herd>gnome</herd>
+ <use>
+ <flag name="geocode">Enable translation between addresses and geographic
+ coordinates using <pkg>sci-geosciences/geocode-glib</pkg> and Yahoo!
+ Place Finder</flag>
+ <flag name="geoloc">Enable geolocation support through
+ <pkg>app-misc/geoclue</pkg></flag>
+ <flag name="gnome-online-accounts">Enable using
+ <pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g.
+ for Google Talk)</flag>
+ <flag name="map">Enable world map support through
+ <pkg>media-libs/libchamplain</pkg></flag>
+ <flag name="sendto">Enable support for sending files to various devices
+ using <pkg>gnome-extra/nautilus-sendto</pkg></flag>
+ </use>
+ <longdescription>
+ Empathy consists of a rich set of reusable instant messaging widgets,
+ and a GNOME client using those widgets. It uses Telepathy and Nokia's
+ Mission Control. The main goal is to permit desktop integration by
+ providing libempathy and libempathy-gtk libraries. libempathy-gtk is a
+ set of powerful widgets that can be embeded into any GNOME application.
+ A client application is provided.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-12-08 17:51 Alexandre Rostovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-08 17:51 UTC (permalink / raw
To: gentoo-commits
commit: df263c3e2862f67d04c9d0cb80411ec6b20dab29
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 17:45:49 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 17:45:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=df263c3e
net-im/empathy: disable cheese support
Cheese-3.6 is gst-1.0, while empathy is gst-0.1. We can't update empathy
to gst-1.0 until we have telepathy-farstream-0.6, see bug #446430.
Also, update to EAPI5 and add missing cogl dependency.
---
...mpathy-3.6.2.ebuild => empathy-3.6.2-r1.ebuild} | 16 ++++++++++------
net-im/empathy/empathy-9999.ebuild | 16 ++++++++++------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.2.ebuild b/net-im/empathy/empathy-3.6.2-r1.ebuild
similarity index 92%
rename from net-im/empathy/empathy-3.6.2.ebuild
rename to net-im/empathy/empathy-3.6.2-r1.ebuild
index 983abf4..5a7d10f 100644
--- a/net-im/empathy/empathy-3.6.2.ebuild
+++ b/net-im/empathy/empathy-3.6.2-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
@@ -30,11 +30,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3
- dev-libs/libgee:0
+ >=dev-libs/folks-0.7.3:=
+ dev-libs/libgee:0=
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/gnutls-2.8.5
+ >=net-libs/gnutls-2.8.5:=
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
@@ -42,6 +42,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
>=media-libs/clutter-gst-1.5.2:1.0
+ media-libs/cogl:1.0=
net-libs/farstream
>=net-libs/telepathy-farstream-0.2.1
@@ -68,8 +69,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=app-text/iso-codes-0.35 )
v4l? (
media-plugins/gst-plugins-v4l2:0.10
- >=media-video/cheese-3.4
virtual/udev[gudev] )"
+# >=media-video/cheese-3.4
+
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
@@ -113,8 +115,10 @@ src_configure() {
$(use_enable map)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_with v4l cheese)
+ --without-cheese
$(use_enable v4l gudev)"
+# $(use_with v4l cheese)
+# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
gnome2_src_configure
}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 983abf4..5a7d10f 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
@@ -30,11 +30,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3
- dev-libs/libgee:0
+ >=dev-libs/folks-0.7.3:=
+ dev-libs/libgee:0=
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/gnutls-2.8.5
+ >=net-libs/gnutls-2.8.5:=
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
@@ -42,6 +42,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
>=media-libs/clutter-gst-1.5.2:1.0
+ media-libs/cogl:1.0=
net-libs/farstream
>=net-libs/telepathy-farstream-0.2.1
@@ -68,8 +69,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=app-text/iso-codes-0.35 )
v4l? (
media-plugins/gst-plugins-v4l2:0.10
- >=media-video/cheese-3.4
virtual/udev[gudev] )"
+# >=media-video/cheese-3.4
+
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
# eventually at which point the dep can be dropped
# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
@@ -113,8 +115,10 @@ src_configure() {
$(use_enable map)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- $(use_with v4l cheese)
+ --without-cheese
$(use_enable v4l gudev)"
+# $(use_with v4l cheese)
+# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
gnome2_src_configure
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-12-08 23:06 Alexandre Rostovtsev
0 siblings, 0 replies; 38+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-08 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 8ea377505bc10ea3ae29804cf7d9aa70aac712e4
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 23:03:28 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 23:03:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8ea37750
net-im/empathy: don't require itstool in tarball builds (#446510)
Thanks to Albert W. Hopkins for reporting, bug #446510.
---
net-im/empathy/empathy-3.6.2-r1.ebuild | 1 +
net-im/empathy/empathy-9999.ebuild | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.2-r1.ebuild b/net-im/empathy/empathy-3.6.2-r1.ebuild
index 5a7d10f..9066c88 100644
--- a/net-im/empathy/empathy-3.6.2-r1.ebuild
+++ b/net-im/empathy/empathy-3.6.2-r1.ebuild
@@ -119,6 +119,7 @@ src_configure() {
$(use_enable v4l gudev)"
# $(use_with v4l cheese)
# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
+ [[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 5a7d10f..9066c88 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -119,6 +119,7 @@ src_configure() {
$(use_enable v4l gudev)"
# $(use_with v4l cheese)
# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
+ [[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-12-21 23:27 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-21 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 23:21:27 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 23:21:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=155e6b34
net-im/empathy: switch to gstreamer:1.0
* Switch to python-any-r1 for build env.
* Switch to gstreamer:1.0
* Raise telepathy-mission-control according to mail on distributor
list.
* Add missing folks[telepathy] dependency.
* Add missing licenses.
---
...thy-3.6.2-r1.ebuild => empathy-3.6.2-r2.ebuild} | 53 ++++++++------------
net-im/empathy/empathy-9999.ebuild | 53 ++++++++------------
2 files changed, 42 insertions(+), 64 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.2-r1.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild
similarity index 72%
rename from net-im/empathy/empathy-3.6.2-r1.ebuild
rename to net-im/empathy/empathy-3.6.2-r2.ebuild
index 9066c88..d454a7f 100644
--- a/net-im/empathy/empathy-3.6.2-r1.ebuild
+++ b/net-im/empathy/empathy-3.6.2-r2.ebuild
@@ -5,9 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{5,6,7} )
-inherit gnome2 python virtualx
+inherit gnome2 python-any-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,7 +15,7 @@ fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
@@ -25,12 +25,13 @@ else
fi
# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.33.3:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=
+ >=dev-libs/folks-0.7.3:=[telepathy]
dev-libs/libgee:0=
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
@@ -38,16 +39,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
- media-libs/gstreamer:0.10
+ media-libs/gstreamer:1.0
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
- >=media-libs/clutter-gst-1.5.2:1.0
+ media-libs/clutter-gst:2.0
media-libs/cogl:1.0=
- net-libs/farstream
- >=net-libs/telepathy-farstream-0.2.1
+ net-libs/farstream:0.2
+ >=net-libs/telepathy-farstream-0.5:=
>=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13
+ >=net-im/telepathy-logger-0.2.13:=
app-crypt/gcr
dev-libs/libxml2:2
@@ -68,46 +69,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
- media-plugins/gst-plugins-v4l2:0.10
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4
virtual/udev[gudev] )"
-# >=media-video/cheese-3.4
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad:0.10
+ media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )"
DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPENDS}
dev-libs/libxml2:2
-
+ dev-libs/libxslt
>=dev-util/intltool-0.50.0
virtual/pkgconfig
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt"
-PDEPEND=">=net-im/telepathy-mission-control-5.12"
-
-pkg_setup() {
- # Build time python tools need python2
- python_set_active_version 2
- python_pkg_setup
-}
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-ubuntu-online-accounts
--disable-coding-style-checks
- --disable-schemas-compile
--disable-static
--disable-Werror
- --disable-gst-1.0
+ --enable-gst-1.0
$(use_enable debug)
$(use_enable geocode)
$(use_enable geoloc location)
@@ -115,10 +106,8 @@ src_configure() {
$(use_enable map)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- --without-cheese
+ $(use_with v4l cheese)
$(use_enable v4l gudev)"
-# $(use_with v4l cheese)
-# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
[[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 9066c88..d454a7f 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -5,9 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{5,6,7} )
-inherit gnome2 python virtualx
+inherit gnome2 python-any-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,7 +15,7 @@ fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
@@ -25,12 +25,13 @@ else
fi
# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.33.3:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=
+ >=dev-libs/folks-0.7.3:=[telepathy]
dev-libs/libgee:0=
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
@@ -38,16 +39,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
- media-libs/gstreamer:0.10
+ media-libs/gstreamer:1.0
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
- >=media-libs/clutter-gst-1.5.2:1.0
+ media-libs/clutter-gst:2.0
media-libs/cogl:1.0=
- net-libs/farstream
- >=net-libs/telepathy-farstream-0.2.1
+ net-libs/farstream:0.2
+ >=net-libs/telepathy-farstream-0.5:=
>=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13
+ >=net-im/telepathy-logger-0.2.13:=
app-crypt/gcr
dev-libs/libxml2:2
@@ -68,46 +69,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
- media-plugins/gst-plugins-v4l2:0.10
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4
virtual/udev[gudev] )"
-# >=media-video/cheese-3.4
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad:0.10
+ media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )"
DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPENDS}
dev-libs/libxml2:2
-
+ dev-libs/libxslt
>=dev-util/intltool-0.50.0
virtual/pkgconfig
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt"
-PDEPEND=">=net-im/telepathy-mission-control-5.12"
-
-pkg_setup() {
- # Build time python tools need python2
- python_set_active_version 2
- python_pkg_setup
-}
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-ubuntu-online-accounts
--disable-coding-style-checks
- --disable-schemas-compile
--disable-static
--disable-Werror
- --disable-gst-1.0
+ --enable-gst-1.0
$(use_enable debug)
$(use_enable geocode)
$(use_enable geoloc location)
@@ -115,10 +106,8 @@ src_configure() {
$(use_enable map)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- --without-cheese
+ $(use_with v4l cheese)
$(use_enable v4l gudev)"
-# $(use_with v4l cheese)
-# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
[[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-12-21 23:33 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-21 23:33 UTC (permalink / raw
To: gentoo-commits
commit: 68afbde29a5b90ec039fbe15f1c194de90fd2137
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 23:33:24 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 23:33:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=68afbde2
net-im/empathy: add missing licenses
---
net-im/empathy/empathy-3.6.2-r2.ebuild | 2 +-
net-im/empathy/empathy-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.2-r2.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild
index d454a7f..cb7a953 100644
--- a/net-im/empathy/empathy-3.6.2-r2.ebuild
+++ b/net-im/empathy/empathy-3.6.2-r2.ebuild
@@ -15,7 +15,7 @@ fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index d454a7f..cb7a953 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -15,7 +15,7 @@ fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2012-12-26 23:00 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-26 23:00 UTC (permalink / raw
To: gentoo-commits
commit: 180174dbe4d90740cedfc0420f2c83ed6a49dc55
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 26 23:00:17 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 26 23:00:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=180174db
net-im/empathy: moved to gx86
---
net-im/empathy/empathy-3.6.2-r2.ebuild | 124 --------------------------------
1 files changed, 0 insertions(+), 124 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.2-r2.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild
deleted file mode 100644
index cb7a953..0000000
--- a/net-im/empathy/empathy-3.6.2-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
-
-inherit gnome2 python-any-r1 virtualx
-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 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
- >=dev-libs/glib-2.33.3:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.5.1:3
- x11-libs/pango
- >=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=[telepathy]
- dev-libs/libgee:0=
- >=app-crypt/libsecret-0.5
- >=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/gstreamer:1.0
- >=media-libs/clutter-1.10.0:1.0
- >=media-libs/clutter-gtk-1.1.2:1.0
- media-libs/clutter-gst:2.0
- media-libs/cogl:1.0=
-
- net-libs/farstream:0.2
- >=net-libs/telepathy-farstream-0.5:=
- >=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13:=
-
- app-crypt/gcr
- dev-libs/libxml2:2
- gnome-base/gsettings-desktop-schemas
- media-sound/pulseaudio[glib]
- net-libs/libsoup:2.4
- x11-libs/libX11
-
- geocode? ( sci-geosciences/geocode-glib )
- geoloc? ( >=app-misc/geoclue-0.12 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
- 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] )
- sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
- spell? (
- >=app-text/enchant-1.2
- >=app-text/iso-codes-0.35 )
- v4l? (
- media-plugins/gst-plugins-v4l2:1.0
- >=media-video/cheese-3.4
- virtual/udev[gudev] )"
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:1.0
- net-im/telepathy-connection-managers
- !<net-voip/telepathy-rakia-0.7
- x11-themes/gnome-icon-theme-symbolic
- gnome? ( gnome-extra/gnome-contacts )"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPENDS}
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-util/intltool-0.50.0
- virtual/pkgconfig
- test? (
- sys-apps/grep
- >=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-src_configure() {
- DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- --disable-ubuntu-online-accounts
- --disable-coding-style-checks
- --disable-static
- --disable-Werror
- --enable-gst-1.0
- $(use_enable debug)
- $(use_enable geocode)
- $(use_enable geoloc location)
- $(use_enable gnome-online-accounts goa)
- $(use_enable map)
- $(use_enable sendto nautilus-sendto)
- $(use_enable spell)
- $(use_with v4l cheese)
- $(use_enable v4l gudev)"
- [[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
- gnome2_src_configure
-}
-
-src_test() {
- Xemake 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."
-}
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2013-12-08 21:46 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-08 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 34bd165e1c6bcdf46c6ac71f6a47c12bed873bda
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 23:42:39 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 8 21:46:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=34bd165e
net-im/empathy: 3.8.6 → 3.10.2
---
.../{empathy-9999.ebuild => empathy-3.10.2.ebuild} | 104 ++++++++++-----------
net-im/empathy/empathy-9999.ebuild | 98 ++++++++++---------
net-im/empathy/metadata.xml | 7 +-
3 files changed, 104 insertions(+), 105 deletions(-)
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-3.10.2.ebuild
similarity index 51%
copy from net-im/empathy/empathy-9999.ebuild
copy to net-im/empathy/empathy-3.10.2.ebuild
index cb7a953..e46a5e9 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-3.10.2.ebuild
@@ -1,54 +1,53 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
inherit gnome2 python-any-r1 virtualx
-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"
+HOMEPAGE="https://wiki.gnome.org/Empathy"
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
-IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
+
+# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
+IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
# gdk-pixbuf and pango extensively used in libempathy-gtk
COMMON_DEPEND="
- >=dev-libs/glib-2.33.3:2
+ >=dev-libs/glib-2.37.6:2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.5.1:3
+ >=x11-libs/gtk+-3.9.4:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=[telepathy]
- dev-libs/libgee:0=
+ >=dev-libs/folks-0.9.5:=[telepathy]
+ dev-libs/libgee:0.8=
>=app-crypt/libsecret-0.5
>=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
+ >=net-libs/webkit-gtk-1.9.1:3
+ >=x11-libs/libnotify-0.7:=
media-libs/gstreamer:1.0
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
media-libs/clutter-gst:2.0
- media-libs/cogl:1.0=
+ >=media-libs/cogl-1.14:1.0=
net-libs/farstream:0.2
- >=net-libs/telepathy-farstream-0.5:=
+ >=net-libs/telepathy-farstream-0.6.0:=
>=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13:=
+ >=net-im/telepathy-logger-0.8.0:=
app-crypt/gcr
dev-libs/libxml2:2
@@ -57,30 +56,33 @@ COMMON_DEPEND="
net-libs/libsoup:2.4
x11-libs/libX11
- geocode? ( sci-geosciences/geocode-glib )
- geoloc? ( >=app-misc/geoclue-0.12 )
+ geoloc? (
+ >=app-misc/geoclue-1.99.3
+ >=sci-geosciences/geocode-glib-3.10 )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
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] )
- sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
media-plugins/gst-plugins-v4l2:1.0
- >=media-video/cheese-3.4
- virtual/udev[gudev] )"
+ >=media-video/cheese-3.4:=
+ virtual/udev[gudev] )
+"
+
# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
- gnome? ( gnome-extra/gnome-contacts )"
+ gnome? ( gnome-extra/gnome-contacts )
+"
DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPENDS}
+ ${PYTHON_DEPS}
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-util/intltool-0.50.0
@@ -91,34 +93,30 @@ DEPEND="${COMMON_DEPEND}
"
PDEPEND=">=net-im/telepathy-mission-control-5.14"
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- --disable-ubuntu-online-accounts
- --disable-coding-style-checks
- --disable-static
- --disable-Werror
- --enable-gst-1.0
- $(use_enable debug)
- $(use_enable geocode)
- $(use_enable geoloc location)
- $(use_enable gnome-online-accounts goa)
- $(use_enable map)
- $(use_enable sendto nautilus-sendto)
- $(use_enable spell)
- $(use_with v4l cheese)
- $(use_enable v4l gudev)"
- [[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-Werror \
+ --disable-coding-style-checks \
+ --disable-static \
+ --disable-nautilus-sendto
+ --disable-ubuntu-online-accounts \
+ --enable-gst-1.0 \
+ $(use_enable debug) \
+ $(use_enable geoloc geocode) \
+ $(use_enable geoloc location) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable map) \
+ $(use_enable spell) \
+ $(use_enable v4l gudev) \
+ $(use_with v4l cheese) \
+ ITSTOOL=$(type -P true)
}
src_test() {
Xemake 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 cb7a953..3899a80 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
inherit gnome2 python-any-r1 virtualx
if [[ ${PV} = 9999 ]]; then
@@ -13,42 +13,47 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="http://live.gnome.org/Empathy"
+HOMEPAGE="https://wiki.gnome.org/Empathy"
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
-IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
+
+# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
+IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86 ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
fi
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
# gdk-pixbuf and pango extensively used in libempathy-gtk
COMMON_DEPEND="
- >=dev-libs/glib-2.33.3:2
+ >=dev-libs/glib-2.37.6:2
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.5.1:3
+ >=x11-libs/gtk+-3.9.4:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=[telepathy]
- dev-libs/libgee:0=
+ >=dev-libs/folks-0.9.5:=[telepathy]
+ dev-libs/libgee:0.8=
>=app-crypt/libsecret-0.5
>=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
+ >=net-libs/webkit-gtk-1.9.1:3
+ >=x11-libs/libnotify-0.7:=
media-libs/gstreamer:1.0
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
media-libs/clutter-gst:2.0
- media-libs/cogl:1.0=
+ >=media-libs/cogl-1.14:1.0=
net-libs/farstream:0.2
- >=net-libs/telepathy-farstream-0.5:=
+ >=net-libs/telepathy-farstream-0.6.0:=
>=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13:=
+ >=net-im/telepathy-logger-0.8.0:=
app-crypt/gcr
dev-libs/libxml2:2
@@ -57,30 +62,33 @@ COMMON_DEPEND="
net-libs/libsoup:2.4
x11-libs/libX11
- geocode? ( sci-geosciences/geocode-glib )
- geoloc? ( >=app-misc/geoclue-0.12 )
+ geoloc? (
+ >=app-misc/geoclue-1.99.3
+ >=sci-geosciences/geocode-glib-3.10 )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
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] )
- sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
media-plugins/gst-plugins-v4l2:1.0
- >=media-video/cheese-3.4
- virtual/udev[gudev] )"
+ >=media-video/cheese-3.4:=
+ virtual/udev[gudev] )
+"
+
# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
- gnome? ( gnome-extra/gnome-contacts )"
+ gnome? ( gnome-extra/gnome-contacts )
+"
DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPENDS}
+ ${PYTHON_DEPS}
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-util/intltool-0.50.0
@@ -91,34 +99,32 @@ DEPEND="${COMMON_DEPEND}
"
PDEPEND=">=net-im/telepathy-mission-control-5.14"
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
src_configure() {
+ local myconf=""
+ [[ ${PV} = 9999 ]] || myconf="${myconf} ITSTOOL=$(type -P true)"
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- --disable-ubuntu-online-accounts
- --disable-coding-style-checks
- --disable-static
- --disable-Werror
- --enable-gst-1.0
- $(use_enable debug)
- $(use_enable geocode)
- $(use_enable geoloc location)
- $(use_enable gnome-online-accounts goa)
- $(use_enable map)
- $(use_enable sendto nautilus-sendto)
- $(use_enable spell)
- $(use_with v4l cheese)
- $(use_enable v4l gudev)"
- [[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-Werror \
+ --disable-coding-style-checks \
+ --disable-static \
+ --disable-nautilus-sendto
+ --disable-ubuntu-online-accounts \
+ --enable-gst-1.0 \
+ $(use_enable debug) \
+ $(use_enable geoloc geocode) \
+ $(use_enable geoloc location) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable map) \
+ $(use_enable spell) \
+ $(use_enable v4l gudev) \
+ $(use_with v4l cheese) \
+ ${myconf}
}
src_test() {
Xemake 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/metadata.xml b/net-im/empathy/metadata.xml
index a5e8268..2df8531 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -4,9 +4,6 @@
<herd>net-im</herd>
<herd>gnome</herd>
<use>
- <flag name="geocode">Enable translation between addresses and geographic
- coordinates using <pkg>sci-geosciences/geocode-glib</pkg> and Yahoo!
- Place Finder</flag>
<flag name="geoloc">Enable geolocation support through
<pkg>app-misc/geoclue</pkg></flag>
<flag name="gnome-online-accounts">Enable using
@@ -14,13 +11,11 @@
for Google Talk)</flag>
<flag name="map">Enable world map support through
<pkg>media-libs/libchamplain</pkg></flag>
- <flag name="sendto">Enable support for sending files to various devices
- using <pkg>gnome-extra/nautilus-sendto</pkg></flag>
</use>
<longdescription>
Empathy consists of a rich set of reusable instant messaging widgets,
and a GNOME client using those widgets. It uses Telepathy and Nokia's
- Mission Control. The main goal is to permit desktop integration by
+ Mission Control. The main goal is to permit desktop integration by
providing libempathy and libempathy-gtk libraries. libempathy-gtk is a
set of powerful widgets that can be embeded into any GNOME application.
A client application is provided.
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2014-04-13 0:22 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-13 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 272f3e61163fa0f5e278faac49477eba257ad0e7
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 20:37:02 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 00:20:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=272f3e61
net-im/empathy: 3.10.3 → 3.12.0
---
.../{empathy-9999.ebuild => empathy-3.12.0.ebuild} | 18 ++++--------------
net-im/empathy/empathy-9999.ebuild | 2 +-
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-3.12.0.ebuild
similarity index 87%
copy from net-im/empathy/empathy-9999.ebuild
copy to net-im/empathy/empathy-3.12.0.ebuild
index f9d5bca..06f7955 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-3.12.0.ebuild
@@ -8,9 +8,6 @@ GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
inherit gnome2 python-any-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="https://wiki.gnome.org/Empathy"
@@ -18,13 +15,9 @@ HOMEPAGE="https://wiki.gnome.org/Empathy"
LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
-# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
@@ -52,7 +45,7 @@ COMMON_DEPEND="
net-libs/farstream:0.2
>=net-libs/telepathy-farstream-0.6.0:=
- >=net-libs/telepathy-glib-0.19.9
+ >=net-libs/telepathy-glib-0.23.2
>=net-im/telepathy-logger-0.8.0:=
app-crypt/gcr
@@ -104,14 +97,11 @@ pkg_setup() {
}
src_configure() {
- local myconf=""
- [[ ${PV} = 9999 ]] || myconf="${myconf} ITSTOOL=$(type -P true)"
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
gnome2_src_configure \
--disable-Werror \
--disable-coding-style-checks \
--disable-static \
- --disable-nautilus-sendto
--disable-ubuntu-online-accounts \
--enable-gst-1.0 \
$(use_enable debug) \
@@ -122,7 +112,7 @@ src_configure() {
$(use_enable spell) \
$(use_enable v4l gudev) \
$(use_with v4l cheese) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
src_test() {
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index f9d5bca..e8b8652 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
net-libs/farstream:0.2
>=net-libs/telepathy-farstream-0.6.0:=
- >=net-libs/telepathy-glib-0.19.9
+ >=net-libs/telepathy-glib-0.23.2
>=net-im/telepathy-logger-0.8.0:=
app-crypt/gcr
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2014-04-23 22:14 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-23 22:14 UTC (permalink / raw
To: gentoo-commits
commit: abd33eaaf91068ca9a7d4342cdcb2f5f46cf3b96
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 21:17:37 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 21:17:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=abd33eaa
net-im/empathy: 3.12.0 → 3.12.1
---
net-im/empathy/{empathy-3.12.0.ebuild => empathy-3.12.1.ebuild} | 0
net-im/empathy/empathy-9999.ebuild | 1 -
2 files changed, 1 deletion(-)
diff --git a/net-im/empathy/empathy-3.12.0.ebuild b/net-im/empathy/empathy-3.12.1.ebuild
similarity index 100%
rename from net-im/empathy/empathy-3.12.0.ebuild
rename to net-im/empathy/empathy-3.12.1.ebuild
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index e8b8652..90a8b5d 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -111,7 +111,6 @@ src_configure() {
--disable-Werror \
--disable-coding-style-checks \
--disable-static \
- --disable-nautilus-sendto
--disable-ubuntu-online-accounts \
--enable-gst-1.0 \
$(use_enable debug) \
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
@ 2014-10-25 21:07 Gilles Dartiguelongue
0 siblings, 0 replies; 38+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-25 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 061c1c022cce219a6aac678677e440c3166106b8
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 20:22:40 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 20:22:40 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=061c1c02
net-im/empathy: sync/clean wrt gentoo-x86
---
net-im/empathy/empathy-3.12.1.ebuild | 120 -----------------------------------
net-im/empathy/empathy-9999.ebuild | 7 +-
2 files changed, 4 insertions(+), 123 deletions(-)
diff --git a/net-im/empathy/empathy-3.12.1.ebuild b/net-im/empathy/empathy-3.12.1.ebuild
deleted file mode 100644
index 06f7955..0000000
--- a/net-im/empathy/empathy-3.12.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-
-IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.6:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.4:3
- x11-libs/pango
- >=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.9.5:=[telepathy]
- dev-libs/libgee:0.8=
- >=app-crypt/libsecret-0.5
- >=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/gnutls-2.8.5:=
- >=net-libs/webkit-gtk-1.9.1:3
- >=x11-libs/libnotify-0.7:=
-
- media-libs/gstreamer:1.0
- >=media-libs/clutter-1.10.0:1.0
- >=media-libs/clutter-gtk-1.1.2:1.0
- media-libs/clutter-gst:2.0
- >=media-libs/cogl-1.14:1.0=
-
- net-libs/farstream:0.2
- >=net-libs/telepathy-farstream-0.6.0:=
- >=net-libs/telepathy-glib-0.23.2
- >=net-im/telepathy-logger-0.8.0:=
-
- app-crypt/gcr
- dev-libs/libxml2:2
- gnome-base/gsettings-desktop-schemas
- media-sound/pulseaudio[glib]
- net-libs/libsoup:2.4
- x11-libs/libX11
-
- geoloc? (
- >=app-misc/geoclue-1.99.3:2.0
- >=sci-geosciences/geocode-glib-3.10 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
- 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] )
- spell? (
- >=app-text/enchant-1.2
- >=app-text/iso-codes-0.35 )
- v4l? (
- media-plugins/gst-plugins-v4l2:1.0
- >=media-video/cheese-3.4:=
- virtual/udev[gudev] )
-"
-
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:1.0
- net-im/telepathy-connection-managers
- !<net-voip/telepathy-rakia-0.7
- x11-themes/gnome-icon-theme-symbolic
- gnome? ( gnome-extra/gnome-contacts )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-util/intltool-0.50.0
- virtual/pkgconfig
- test? (
- sys-apps/grep
- >=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
- gnome2_src_configure \
- --disable-Werror \
- --disable-coding-style-checks \
- --disable-static \
- --disable-ubuntu-online-accounts \
- --enable-gst-1.0 \
- $(use_enable debug) \
- $(use_enable geoloc geocode) \
- $(use_enable geoloc location) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable map) \
- $(use_enable spell) \
- $(use_enable v4l gudev) \
- $(use_with v4l cheese) \
- ITSTOOL=$(type -P true)
-}
-
-src_test() {
- Xemake check
-}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 90a8b5d..315965e 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Empathy"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
@@ -76,7 +76,7 @@ COMMON_DEPEND="
v4l? (
media-plugins/gst-plugins-v4l2:1.0
>=media-video/cheese-3.4:=
- virtual/udev[gudev] )
+ virtual/libgudev:= )
"
# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
@@ -101,6 +101,7 @@ PDEPEND=">=net-im/telepathy-mission-control-5.14"
pkg_setup() {
python-any-r1_pkg_setup
+ export PYTHONIOENCODING=UTF-8 # See bug 489774
}
src_configure() {
@@ -125,5 +126,5 @@ src_configure() {
}
src_test() {
- Xemake check
+ dbus-launch Xemake check #504516
}
^ permalink raw reply related [flat|nested] 38+ messages in thread
end of thread, other threads:[~2014-10-25 21:07 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-27 21:09 [gentoo-commits] proj/gnome:master commit in: net-im/empathy/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2014-10-25 21:07 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-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-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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox