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 332A6138359 for ; Thu, 24 Sep 2020 14:32:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A121E0824; Thu, 24 Sep 2020 14:32:09 +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 5366BE0824 for ; Thu, 24 Sep 2020 14:32:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E376133FAD1 for ; Thu, 24 Sep 2020 14:32:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56E68353 for ; Thu, 24 Sep 2020 14:32:04 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1600957918.e478a13a27b62a57e98fba0644de56084fd4f64c.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnome-keyring/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild X-VCS-Directories: gnome-base/libgnome-keyring/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: e478a13a27b62a57e98fba0644de56084fd4f64c X-VCS-Branch: master Date: Thu, 24 Sep 2020 14:32:04 +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: 23c60d70-72e1-47ad-be6e-e6b1ce1c8124 X-Archives-Hash: d33943fe474b08daa929856413cd5e88 commit: e478a13a27b62a57e98fba0644de56084fd4f64c Author: Pacho Ramos gentoo org> AuthorDate: Thu Sep 24 14:31:47 2020 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Sep 24 14:31:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e478a13a gnome-base/libgnome-keyring: Drop python2 usage Restrict tests as they need python2 Closes: https://bugs.gentoo.org/735346 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Pacho Ramos gentoo.org> .../libgnome-keyring-3.12.0-r1.ebuild | 35 +++++----------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild index 30c0398c00e..7a5b74562aa 100644 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild @@ -1,25 +1,24 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -GCONF_DEBUG="yes" +EAPI="6" GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.16" VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python2_7 ) -inherit gnome2 python-any-r1 vala multilib-minimal +inherit gnome2 vala multilib-minimal DESCRIPTION="Compatibility library for accessing secrets" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 SLOT="0" -IUSE="debug +introspection test vala" -RESTRICT="!test? ( test )" +IUSE="debug +introspection vala" REQUIRED_USE="vala? ( introspection )" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" +# tests need python2 +RESTRICT="test" + RDEPEND=" >=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}] >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] @@ -32,25 +31,11 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig - test? ( ${PYTHON_DEPS} $(python_gen_any_dep ' - dev-python/pygobject:2[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " -python_check_deps() { - if use test; then - has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { - epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch + eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch use vala && vala_src_prepare gnome2_src_prepare @@ -62,6 +47,7 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" gnome2_src_configure \ + $(usex debug --enable-debug=yes ' ') \ $(multilib_native_use_enable vala) if multilib_is_native_abi; then @@ -72,8 +58,3 @@ multilib_src_configure() { multilib_src_install() { gnome2_src_install } - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS - dbus-launch emake check || die "tests failed" -}