From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 271E7138350 for ; Sun, 1 Mar 2020 16:18:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9D51E0991; Sun, 1 Mar 2020 16:18:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6BE1E0991 for ; Sun, 1 Mar 2020 16:18:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE4BB34F14F for ; Sun, 1 Mar 2020 16:18:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F302173 for ; Sun, 1 Mar 2020 16:18:48 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1583079461.1d8530706e7610f2ddd3a7d5488fbcaf16c25358.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 1d8530706e7610f2ddd3a7d5488fbcaf16c25358 X-VCS-Branch: master Date: Sun, 1 Mar 2020 16:18:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f9c72f9-733d-4bb6-a3a2-e3a2106114cd X-Archives-Hash: 31ee426b1e67c64d8458f17cc7bcd580 commit: 1d8530706e7610f2ddd3a7d5488fbcaf16c25358 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Mar 1 15:41:00 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Mar 1 16:17:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d853070 gnome-base/gnome-control-center: fix dbusmock test dep handling Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> .../gnome-control-center-3.32.2.ebuild | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild index 70a11f09240..9441fe8260d 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +PYTHON_COMPAT=( python3_{6,7,8} ) -inherit gnome.org gnome2-utils meson xdg +inherit gnome.org gnome2-utils meson python-any-r1 xdg DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" @@ -11,7 +12,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="GPL-2+" SLOT="2" -IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd v4l wayland" +IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland" +RESTRICT="!test? ( test )" REQUIRED_USE=" flickr? ( gnome-online-accounts ) ^^ ( elogind systemd ) @@ -115,6 +117,9 @@ DEPEND="${COMMON_DEPEND} dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig + test? ( $(python_gen_any_dep ' + dev-python/dbusmock[${PYTHON_USEDEP}] + ') ) " PATCHES=( @@ -127,6 +132,22 @@ PATCHES=( "${FILESDIR}"/${PN}-3.32.2-fix-gcc10-fno-common.patch # fixed in 3.35.90 ) +python_check_deps() { + use test && \ + has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + # Mark python tests with shebang executable, so that meson will launch them directly, instead + # of via its own python-single-r1 version, which might not match what we get from python_check_deps + chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die +} + src_configure() { local emesonargs=( $(meson_use bluetooth)