| 1 |
commit: cee66297da54773c75c75e0fa71860271e7c7aa0 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 27 16:15:04 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 23:55:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee66297 |
| 7 |
|
| 8 |
net-im/empathy: Bump to EAPI=8 |
| 9 |
|
| 10 |
Notably fix src_test() to use dbus-run-session instead of dbus-launch. |
| 11 |
Appears to have been broken since 2014. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
net-im/empathy/empathy-3.12.14-r1.ebuild | 17 ++++++++--------- |
| 16 |
1 file changed, 8 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-im/empathy/empathy-3.12.14-r1.ebuild b/net-im/empathy/empathy-3.12.14-r1.ebuild |
| 19 |
index 551946b73396..4cebea65eb10 100644 |
| 20 |
--- a/net-im/empathy/empathy-3.12.14-r1.ebuild |
| 21 |
+++ b/net-im/empathy/empathy-3.12.14-r1.ebuild |
| 22 |
@@ -1,9 +1,8 @@ |
| 23 |
# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=6 |
| 27 |
-GNOME2_LA_PUNT="yes" |
| 28 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 29 |
+EAPI=8 |
| 30 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 31 |
|
| 32 |
inherit gnome2 python-any-r1 virtualx |
| 33 |
|
| 34 |
@@ -68,24 +67,24 @@ COMMON_DEPEND=" |
| 35 |
>=media-video/cheese-3.4:= ) |
| 36 |
" |
| 37 |
|
| 38 |
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 |
| 39 |
RDEPEND="${COMMON_DEPEND} |
| 40 |
media-libs/gst-plugins-base:1.0 |
| 41 |
net-im/telepathy-connection-managers |
| 42 |
- !<net-voip/telepathy-rakia-0.7 |
| 43 |
x11-themes/adwaita-icon-theme |
| 44 |
gnome? ( gnome-extra/gnome-contacts ) |
| 45 |
" |
| 46 |
DEPEND="${COMMON_DEPEND} |
| 47 |
+ test? ( |
| 48 |
+ sys-apps/grep |
| 49 |
+ >=dev-libs/check-0.9.4 ) |
| 50 |
+" |
| 51 |
+BDEPEND=" |
| 52 |
${PYTHON_DEPS} |
| 53 |
dev-libs/libxml2:2 |
| 54 |
dev-libs/libxslt |
| 55 |
>=dev-util/intltool-0.50.0 |
| 56 |
dev-util/itstool |
| 57 |
virtual/pkgconfig |
| 58 |
- test? ( |
| 59 |
- sys-apps/grep |
| 60 |
- >=dev-libs/check-0.9.4 ) |
| 61 |
" |
| 62 |
PDEPEND=">=net-im/telepathy-mission-control-5.14" |
| 63 |
|
| 64 |
@@ -112,5 +111,5 @@ src_configure() { |
| 65 |
} |
| 66 |
|
| 67 |
src_test() { |
| 68 |
- dbus-launch virtx emake check #504516 |
| 69 |
+ virtx dbus-run-session emake check |
| 70 |
} |
Archives