1 |
commit: b2cdfd96e3450154b38fa6b7a62ef42f817c7f5d |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Fri Aug 19 10:54:33 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 23 04:51:18 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2cdfd96 |
7 |
|
8 |
net-im/bitlbee: remove obsolete xmpp? ( !nss ) requirement |
9 |
|
10 |
This requirement was basically introduced with 1.2 release in commit [1] |
11 |
in order to solve https://bugs.gentoo.org/213958#c8 issue (the xmpp use |
12 |
flag was called jabber back then). The requirement was later transformed |
13 |
to REQUIRED_USE in commit [2]. However, this requirement seems no longer |
14 |
be valid. |
15 |
|
16 |
The nss use description in metadata was also bogus, it is changed to |
17 |
more generic form. |
18 |
|
19 |
[1] https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e |
20 |
[2] https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=65aa90800da80b1fbffc36c7b15c3503c37d7fd0 |
21 |
|
22 |
Bug: https://bugs.gentoo.org/213958 |
23 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
24 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
25 |
|
26 |
net-im/bitlbee/bitlbee-3.6-r2.ebuild | 1 - |
27 |
net-im/bitlbee/bitlbee-3.6-r3.ebuild | 1 - |
28 |
net-im/bitlbee/bitlbee-9999.ebuild | 1 - |
29 |
net-im/bitlbee/metadata.xml | 2 +- |
30 |
4 files changed, 1 insertion(+), 4 deletions(-) |
31 |
|
32 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
33 |
index 4c086510b8d5..26f201ce42fd 100644 |
34 |
--- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
35 |
+++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
36 |
@@ -29,7 +29,6 @@ REQUIRED_USE=" |
37 |
|| ( purple xmpp ) |
38 |
purple? ( plugins ) |
39 |
test? ( xmpp ) |
40 |
- xmpp? ( !nss ) |
41 |
" |
42 |
|
43 |
COMMON_DEPEND=" |
44 |
|
45 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
46 |
index 6e4406af9f57..01b8a33d3618 100644 |
47 |
--- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
48 |
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
49 |
@@ -29,7 +29,6 @@ REQUIRED_USE=" |
50 |
|| ( purple xmpp ) |
51 |
purple? ( plugins ) |
52 |
test? ( xmpp ) |
53 |
- xmpp? ( !nss ) |
54 |
" |
55 |
|
56 |
COMMON_DEPEND=" |
57 |
|
58 |
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild |
59 |
index 58c3144ff8d5..8d4f88ddc3d1 100644 |
60 |
--- a/net-im/bitlbee/bitlbee-9999.ebuild |
61 |
+++ b/net-im/bitlbee/bitlbee-9999.ebuild |
62 |
@@ -29,7 +29,6 @@ REQUIRED_USE=" |
63 |
|| ( purple xmpp ) |
64 |
purple? ( plugins ) |
65 |
test? ( xmpp ) |
66 |
- xmpp? ( !nss ) |
67 |
" |
68 |
|
69 |
COMMON_DEPEND=" |
70 |
|
71 |
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml |
72 |
index 9dbb1759075c..0541d2f03527 100644 |
73 |
--- a/net-im/bitlbee/metadata.xml |
74 |
+++ b/net-im/bitlbee/metadata.xml |
75 |
@@ -11,7 +11,7 @@ |
76 |
</maintainer> |
77 |
<use> |
78 |
<flag name="libevent">Use libevent for event handling</flag> |
79 |
- <flag name="nss">Use NSS for SSL support in Jabber</flag> |
80 |
+ <flag name="nss">Prefer <pkg>dev-libs/nss</pkg> as SSL/TLS provider</flag> |
81 |
<flag name="otr">Enable support for encrypted conversations</flag> |
82 |
<flag name="plugins">Enable support for plugins</flag> |
83 |
<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag> |