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
}
