1 |
commit: 982bc21809ccdbcbe59692f89bd6b214b73ba0ad |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Fri Aug 19 07:23:31 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 23 04:50:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982bc218 |
7 |
|
8 |
net-im/bitlbee: drop msn and oscar use flags |
9 |
|
10 |
msn[1] and oscar[2] protocols were removed in version 3.6, therefore |
11 |
both use flags do nothing. |
12 |
|
13 |
[1] https://github.com/bitlbee/bitlbee/commit/7ec2ce8fd7d30a536823ef9e08a3dad80ce76d4e |
14 |
[2] https://github.com/bitlbee/bitlbee/commit/e5d2c5607310ef9669a051a1b93e019319495955 |
15 |
|
16 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
net-im/bitlbee/bitlbee-3.6-r2.ebuild | 4 ++-- |
20 |
net-im/bitlbee/bitlbee-3.6-r3.ebuild | 4 ++-- |
21 |
net-im/bitlbee/bitlbee-9999.ebuild | 4 ++-- |
22 |
net-im/bitlbee/metadata.xml | 7 ++----- |
23 |
4 files changed, 8 insertions(+), 11 deletions(-) |
24 |
|
25 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
26 |
index 127f0a88198d..983d5a872b1c 100644 |
27 |
--- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
28 |
+++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild |
29 |
@@ -20,13 +20,13 @@ HOMEPAGE="https://www.bitlbee.org/" |
30 |
|
31 |
LICENSE="GPL-2 BSD-2" |
32 |
SLOT="0" |
33 |
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" |
34 |
+IUSE_PROTOCOLS="purple twitter +xmpp" |
35 |
IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd |
36 |
${IUSE_PROTOCOLS}" |
37 |
RESTRICT="!test? ( test )" |
38 |
|
39 |
REQUIRED_USE=" |
40 |
- || ( purple xmpp msn oscar ) |
41 |
+ || ( purple xmpp ) |
42 |
purple? ( plugins ) |
43 |
test? ( plugins ) |
44 |
xmpp? ( !nss ) |
45 |
|
46 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
47 |
index 72d2a7207ba2..dc1b934e114a 100644 |
48 |
--- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
49 |
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild |
50 |
@@ -20,13 +20,13 @@ HOMEPAGE="https://www.bitlbee.org/" |
51 |
|
52 |
LICENSE="GPL-2" |
53 |
SLOT="0" |
54 |
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" |
55 |
+IUSE_PROTOCOLS="purple twitter +xmpp" |
56 |
IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd |
57 |
${IUSE_PROTOCOLS}" |
58 |
RESTRICT="!test? ( test )" |
59 |
|
60 |
REQUIRED_USE=" |
61 |
- || ( purple xmpp msn oscar ) |
62 |
+ || ( purple xmpp ) |
63 |
purple? ( plugins ) |
64 |
test? ( plugins ) |
65 |
xmpp? ( !nss ) |
66 |
|
67 |
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild |
68 |
index 0a8cc973ae18..c1ec4905594e 100644 |
69 |
--- a/net-im/bitlbee/bitlbee-9999.ebuild |
70 |
+++ b/net-im/bitlbee/bitlbee-9999.ebuild |
71 |
@@ -20,13 +20,13 @@ HOMEPAGE="https://www.bitlbee.org/" |
72 |
|
73 |
LICENSE="GPL-2" |
74 |
SLOT="0" |
75 |
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" |
76 |
+IUSE_PROTOCOLS="purple twitter +xmpp" |
77 |
IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd |
78 |
${IUSE_PROTOCOLS}" |
79 |
RESTRICT="!test? ( test )" |
80 |
|
81 |
REQUIRED_USE=" |
82 |
- || ( purple xmpp msn oscar ) |
83 |
+ || ( purple xmpp ) |
84 |
purple? ( plugins ) |
85 |
test? ( plugins ) |
86 |
xmpp? ( !nss ) |
87 |
|
88 |
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml |
89 |
index a3e4b3e074d2..9dbb1759075c 100644 |
90 |
--- a/net-im/bitlbee/metadata.xml |
91 |
+++ b/net-im/bitlbee/metadata.xml |
92 |
@@ -11,9 +11,7 @@ |
93 |
</maintainer> |
94 |
<use> |
95 |
<flag name="libevent">Use libevent for event handling</flag> |
96 |
- <flag name="msn">Enable MSN Messenger IM protocol support.</flag> |
97 |
- <flag name="nss">Use NSS for SSL support in MSN and Jabber</flag> |
98 |
- <flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag> |
99 |
+ <flag name="nss">Use NSS for SSL support in Jabber</flag> |
100 |
<flag name="otr">Enable support for encrypted conversations</flag> |
101 |
<flag name="plugins">Enable support for plugins</flag> |
102 |
<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag> |
103 |
@@ -21,8 +19,7 @@ |
104 |
</use> |
105 |
<longdescription> |
106 |
Bitlbee as an IRC to IM gateway. It provides an irc server that allows |
107 |
- you to log on and then connect to various instant messaging protocols |
108 |
- (AIM, MSN, Yahoo, Jabber, etc). |
109 |
+ you to log on and then connect to various instant messaging protocols. |
110 |
</longdescription> |
111 |
<upstream> |
112 |
<remote-id type="github">bitlbee/bitlbee</remote-id> |