commit: cee66297da54773c75c75e0fa71860271e7c7aa0
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 16:15:04 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 23:55:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee66297
net-im/empathy: Bump to EAPI=8
Notably fix src_test() to use dbus-run-session instead of dbus-launch.
Appears to have been broken since 2014.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-im/empathy/empathy-3.12.14-r1.ebuild | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/net-im/empathy/empathy-3.12.14-r1.ebuild
b/net-im/empathy/empathy-3.12.14-r1.ebuild
index 551946b73396..4cebea65eb10 100644
--- a/net-im/empathy/empathy-3.12.14-r1.ebuild
+++ b/net-im/empathy/empathy-3.12.14-r1.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome2 python-any-r1 virtualx
@@ -68,24 +67,24 @@ COMMON_DEPEND="
>=media-video/cheese-3.4:= )
"
-# >=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/adwaita-icon-theme
gnome? ( gnome-extra/gnome-contacts )
"
DEPEND="${COMMON_DEPEND}
+ test? (
+ sys-apps/grep
+ >=dev-libs/check-0.9.4 )
+"
+BDEPEND="
${PYTHON_DEPS}
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-util/intltool-0.50.0
dev-util/itstool
virtual/pkgconfig
- test? (
- sys-apps/grep
- >=dev-libs/check-0.9.4 )
"
PDEPEND=">=net-im/telepathy-mission-control-5.14"
@@ -112,5 +111,5 @@ src_configure() {
}
src_test() {
- dbus-launch virtx emake check #504516
+ virtx dbus-run-session emake check
}
