| 1 |
commit: ff3746d1c4212f71fda782935920a8dfb9e4eae5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 26 21:34:11 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 26 21:34:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3746d1 |
| 7 |
|
| 8 |
net-vpn/tor: [QA] use Python eclass (python-single-r1) for tests |
| 9 |
|
| 10 |
Python modules may be built during compilation/tests for use |
| 11 |
in later tests. |
| 12 |
|
| 13 |
Using a Python eclass ensures consistency between the Python versions |
| 14 |
used so that the right version of Python is used to test any produced files. |
| 15 |
|
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/20678 |
| 17 |
Closes: https://bugs.gentoo.org/764260 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 20 |
|
| 21 |
net-vpn/tor/tor-0.4.4.8.ebuild | 14 +++++++++++++- |
| 22 |
net-vpn/tor/tor-0.4.5.7.ebuild | 14 +++++++++++++- |
| 23 |
net-vpn/tor/tor-0.4.6.3_rc.ebuild | 14 +++++++++++++- |
| 24 |
3 files changed, 39 insertions(+), 3 deletions(-) |
| 25 |
|
| 26 |
diff --git a/net-vpn/tor/tor-0.4.4.8.ebuild b/net-vpn/tor/tor-0.4.4.8.ebuild |
| 27 |
index 5d70eb67e26..bdb635b7753 100644 |
| 28 |
--- a/net-vpn/tor/tor-0.4.4.8.ebuild |
| 29 |
+++ b/net-vpn/tor/tor-0.4.4.8.ebuild |
| 30 |
@@ -3,7 +3,8 @@ |
| 31 |
|
| 32 |
EAPI="7" |
| 33 |
|
| 34 |
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig |
| 35 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 36 |
+inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig |
| 37 |
|
| 38 |
MY_PV="$(ver_rs 4 -)" |
| 39 |
MY_PF="${PN}-${MY_PV}" |
| 40 |
@@ -40,6 +41,13 @@ RDEPEND=" |
| 41 |
${DEPEND} |
| 42 |
selinux? ( sec-policy/selinux-tor )" |
| 43 |
|
| 44 |
+# bug #764260 |
| 45 |
+DEPEND+=" |
| 46 |
+ test? ( |
| 47 |
+ ${DEPEND} |
| 48 |
+ ${PYTHON_DEPS} |
| 49 |
+ )" |
| 50 |
+ |
| 51 |
PATCHES=( |
| 52 |
"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch |
| 53 |
"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch |
| 54 |
@@ -49,6 +57,10 @@ DOCS=() |
| 55 |
|
| 56 |
RESTRICT="!test? ( test )" |
| 57 |
|
| 58 |
+pkg_setup() { |
| 59 |
+ use test && python-any-r1_pkg_setup |
| 60 |
+} |
| 61 |
+ |
| 62 |
src_configure() { |
| 63 |
use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) |
| 64 |
export ac_cv_lib_cap_cap_init=$(usex caps) |
| 65 |
|
| 66 |
diff --git a/net-vpn/tor/tor-0.4.5.7.ebuild b/net-vpn/tor/tor-0.4.5.7.ebuild |
| 67 |
index afb37f6b7f7..82738f38a28 100644 |
| 68 |
--- a/net-vpn/tor/tor-0.4.5.7.ebuild |
| 69 |
+++ b/net-vpn/tor/tor-0.4.5.7.ebuild |
| 70 |
@@ -3,7 +3,8 @@ |
| 71 |
|
| 72 |
EAPI="7" |
| 73 |
|
| 74 |
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig |
| 75 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 76 |
+inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig |
| 77 |
|
| 78 |
MY_PV="$(ver_rs 4 -)" |
| 79 |
MY_PF="${PN}-${MY_PV}" |
| 80 |
@@ -40,6 +41,13 @@ RDEPEND=" |
| 81 |
${DEPEND} |
| 82 |
selinux? ( sec-policy/selinux-tor )" |
| 83 |
|
| 84 |
+# bug #764260 |
| 85 |
+DEPEND+=" |
| 86 |
+ test? ( |
| 87 |
+ ${DEPEND} |
| 88 |
+ ${PYTHON_DEPS} |
| 89 |
+ )" |
| 90 |
+ |
| 91 |
PATCHES=( |
| 92 |
"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch |
| 93 |
"${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.patch |
| 94 |
@@ -49,6 +57,10 @@ DOCS=() |
| 95 |
|
| 96 |
RESTRICT="!test? ( test )" |
| 97 |
|
| 98 |
+pkg_setup() { |
| 99 |
+ use test && python-any-r1_pkg_setup |
| 100 |
+} |
| 101 |
+ |
| 102 |
src_configure() { |
| 103 |
use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) |
| 104 |
export ac_cv_lib_cap_cap_init=$(usex caps) |
| 105 |
|
| 106 |
diff --git a/net-vpn/tor/tor-0.4.6.3_rc.ebuild b/net-vpn/tor/tor-0.4.6.3_rc.ebuild |
| 107 |
index 50db834736f..b58b53b2f97 100644 |
| 108 |
--- a/net-vpn/tor/tor-0.4.6.3_rc.ebuild |
| 109 |
+++ b/net-vpn/tor/tor-0.4.6.3_rc.ebuild |
| 110 |
@@ -3,7 +3,8 @@ |
| 111 |
|
| 112 |
EAPI="7" |
| 113 |
|
| 114 |
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig |
| 115 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 116 |
+inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig |
| 117 |
|
| 118 |
MY_PV="$(ver_rs 4 -)" |
| 119 |
MY_PF="${PN}-${MY_PV}" |
| 120 |
@@ -40,6 +41,13 @@ RDEPEND=" |
| 121 |
${DEPEND} |
| 122 |
selinux? ( sec-policy/selinux-tor )" |
| 123 |
|
| 124 |
+# bug #764260 |
| 125 |
+DEPEND+=" |
| 126 |
+ test? ( |
| 127 |
+ ${DEPEND} |
| 128 |
+ ${PYTHON_DEPS} |
| 129 |
+ )" |
| 130 |
+ |
| 131 |
PATCHES=( |
| 132 |
"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch |
| 133 |
) |
| 134 |
@@ -48,6 +56,10 @@ DOCS=() |
| 135 |
|
| 136 |
RESTRICT="!test? ( test )" |
| 137 |
|
| 138 |
+pkg_setup() { |
| 139 |
+ use test && python-any-r1_pkg_setup |
| 140 |
+} |
| 141 |
+ |
| 142 |
src_configure() { |
| 143 |
use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) |
| 144 |
export ac_cv_lib_cap_cap_init=$(usex caps) |
Archives