commit: ff3746d1c4212f71fda782935920a8dfb9e4eae5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed May 26 21:34:11 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <sam <AT> gentoo.org> Signed-off-by: David Seifert <soap <AT> 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)
