| 1 |
commit: 2b967f38394043d8cddb92b1008091dc2da64522 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Thu Aug 18 14:29:08 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 23 04:51:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b967f38 |
| 7 |
|
| 8 |
net-im/bitlbee: tests require xmpp enabled not plugins |
| 9 |
|
| 10 |
plugins use flag is not required for test to work but xmpp is, because of |
| 11 |
tests/check_jabber_* tests. |
| 12 |
|
| 13 |
The test? ( plugin ) requirement was wrongly introduced in commit |
| 14 |
eb108d8b5224 ("net-im/bitlbee: force plugins to be enabled for tests") |
| 15 |
as a solution for bug https://bugs.gentoo.org/617604 which was later |
| 16 |
reported again in bug https://bugs.gentoo.org/739510 and correctly fixed |
| 17 |
in commit 05dc33a126ab ("net-im/bitlbee: fix compilation with disabled |
| 18 |
plugins use"). |
| 19 |
|
| 20 |
Bug: https://bugs.gentoo.org/617604 |
| 21 |
Bug: https://bugs.gentoo.org/739510 |
| 22 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 23 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 24 |
|
| 25 |
net-im/bitlbee/bitlbee-3.6-r2.ebuild | 2 +- |
| 26 |
net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- |
| 27 |
net-im/bitlbee/bitlbee-9999.ebuild | 2 +- |
| 28 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 29 |
|
| 30 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
| 31 |
index 983d5a872b1c..4c086510b8d5 100644 |
| 32 |
--- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
| 33 |
+++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
| 34 |
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" |
| 35 |
REQUIRED_USE=" |
| 36 |
|| ( purple xmpp ) |
| 37 |
purple? ( plugins ) |
| 38 |
- test? ( plugins ) |
| 39 |
+ test? ( xmpp ) |
| 40 |
xmpp? ( !nss ) |
| 41 |
" |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
| 45 |
index dc1b934e114a..6e4406af9f57 100644 |
| 46 |
--- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
| 47 |
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
| 48 |
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" |
| 49 |
REQUIRED_USE=" |
| 50 |
|| ( purple xmpp ) |
| 51 |
purple? ( plugins ) |
| 52 |
- test? ( plugins ) |
| 53 |
+ test? ( xmpp ) |
| 54 |
xmpp? ( !nss ) |
| 55 |
" |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild |
| 59 |
index c1ec4905594e..58c3144ff8d5 100644 |
| 60 |
--- a/net-im/bitlbee/bitlbee-9999.ebuild |
| 61 |
+++ b/net-im/bitlbee/bitlbee-9999.ebuild |
| 62 |
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" |
| 63 |
REQUIRED_USE=" |
| 64 |
|| ( purple xmpp ) |
| 65 |
purple? ( plugins ) |
| 66 |
- test? ( plugins ) |
| 67 |
+ test? ( xmpp ) |
| 68 |
xmpp? ( !nss ) |
| 69 |
" |
Archives