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 DB5621382C5 for ; Wed, 26 May 2021 21:34:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E29D4E15B9; Wed, 26 May 2021 21:34:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CA8EFE15B9 for ; Wed, 26 May 2021 21:34:34 +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 1D813335D56 for ; Wed, 26 May 2021 21:34:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67CD4793 for ; Wed, 26 May 2021 21:34:31 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1622064851.ff3746d1c4212f71fda782935920a8dfb9e4eae5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/tor/tor-0.4.4.8.ebuild net-vpn/tor/tor-0.4.5.7.ebuild net-vpn/tor/tor-0.4.6.3_rc.ebuild X-VCS-Directories: net-vpn/tor/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ff3746d1c4212f71fda782935920a8dfb9e4eae5 X-VCS-Branch: master Date: Wed, 26 May 2021 21:34:31 +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: beecd665-4505-42c5-9ac0-da1305425b5a X-Archives-Hash: e55a163ee1d4ad3a0c56f7fd05ba91c8 commit: ff3746d1c4212f71fda782935920a8dfb9e4eae5 Author: Sam James gentoo org> AuthorDate: Wed May 26 21:34:11 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Wed May 26 21:34:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3746d1 net-vpn/tor: [QA] use Python eclass (python-single-r1) for tests Python modules may be built during compilation/tests for use in later tests. Using a Python eclass ensures consistency between the Python versions used so that the right version of Python is used to test any produced files. Closes: https://github.com/gentoo/gentoo/pull/20678 Closes: https://bugs.gentoo.org/764260 Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> net-vpn/tor/tor-0.4.4.8.ebuild | 14 +++++++++++++- net-vpn/tor/tor-0.4.5.7.ebuild | 14 +++++++++++++- net-vpn/tor/tor-0.4.6.3_rc.ebuild | 14 +++++++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/net-vpn/tor/tor-0.4.4.8.ebuild b/net-vpn/tor/tor-0.4.4.8.ebuild index 5d70eb67e26..bdb635b7753 100644 --- a/net-vpn/tor/tor-0.4.4.8.ebuild +++ b/net-vpn/tor/tor-0.4.4.8.ebuild @@ -3,7 +3,8 @@ EAPI="7" -inherit flag-o-matic readme.gentoo-r1 systemd verify-sig +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" MY_PF="${PN}-${MY_PV}" @@ -40,6 +41,13 @@ RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-tor )" +# bug #764260 +DEPEND+=" + test? ( + ${DEPEND} + ${PYTHON_DEPS} + )" + PATCHES=( "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch @@ -49,6 +57,10 @@ DOCS=() RESTRICT="!test? ( test )" +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_configure() { use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) export ac_cv_lib_cap_cap_init=$(usex caps) diff --git a/net-vpn/tor/tor-0.4.5.7.ebuild b/net-vpn/tor/tor-0.4.5.7.ebuild index afb37f6b7f7..82738f38a28 100644 --- a/net-vpn/tor/tor-0.4.5.7.ebuild +++ b/net-vpn/tor/tor-0.4.5.7.ebuild @@ -3,7 +3,8 @@ EAPI="7" -inherit flag-o-matic readme.gentoo-r1 systemd verify-sig +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" MY_PF="${PN}-${MY_PV}" @@ -40,6 +41,13 @@ RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-tor )" +# bug #764260 +DEPEND+=" + test? ( + ${DEPEND} + ${PYTHON_DEPS} + )" + PATCHES=( "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch "${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.patch @@ -49,6 +57,10 @@ DOCS=() RESTRICT="!test? ( test )" +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_configure() { use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) export ac_cv_lib_cap_cap_init=$(usex caps) diff --git a/net-vpn/tor/tor-0.4.6.3_rc.ebuild b/net-vpn/tor/tor-0.4.6.3_rc.ebuild index 50db834736f..b58b53b2f97 100644 --- a/net-vpn/tor/tor-0.4.6.3_rc.ebuild +++ b/net-vpn/tor/tor-0.4.6.3_rc.ebuild @@ -3,7 +3,8 @@ EAPI="7" -inherit flag-o-matic readme.gentoo-r1 systemd verify-sig +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" MY_PF="${PN}-${MY_PV}" @@ -40,6 +41,13 @@ RDEPEND=" ${DEPEND} selinux? ( sec-policy/selinux-tor )" +# bug #764260 +DEPEND+=" + test? ( + ${DEPEND} + ${PYTHON_DEPS} + )" + PATCHES=( "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch ) @@ -48,6 +56,10 @@ DOCS=() RESTRICT="!test? ( test )" +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_configure() { use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) export ac_cv_lib_cap_cap_init=$(usex caps)