From b2cdfd96e3450154b38fa6b7a62ef42f817c7f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Fri, 19 Aug 2022 12:54:33 +0200 Subject: [PATCH] net-im/bitlbee: remove obsolete xmpp? ( !nss ) requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This requirement was basically introduced with 1.2 release in commit [1] in order to solve https://bugs.gentoo.org/213958#c8 issue (the xmpp use flag was called jabber back then). The requirement was later transformed to REQUIRED_USE in commit [2]. However, this requirement seems no longer be valid. The nss use description in metadata was also bogus, it is changed to more generic form. [1] https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e [2] https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=65aa90800da80b1fbffc36c7b15c3503c37d7fd0 Bug: https://bugs.gentoo.org/213958 Signed-off-by: Petr Vaněk Signed-off-by: Sam James --- net-im/bitlbee/bitlbee-3.6-r2.ebuild | 1 - net-im/bitlbee/bitlbee-3.6-r3.ebuild | 1 - net-im/bitlbee/bitlbee-9999.ebuild | 1 - net-im/bitlbee/metadata.xml | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild index 4c086510b8d53..26f201ce42fd5 100644 --- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild @@ -29,7 +29,6 @@ REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) test? ( xmpp ) - xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 6e4406af9f57e..01b8a33d3618e 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -29,7 +29,6 @@ REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) test? ( xmpp ) - xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index 58c3144ff8d57..8d4f88ddc3d13 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.ebuild @@ -29,7 +29,6 @@ REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) test? ( xmpp ) - xmpp? ( !nss ) " COMMON_DEPEND=" diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 9dbb1759075c6..0541d2f035278 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -11,7 +11,7 @@ Use libevent for event handling - Use NSS for SSL support in Jabber + Prefer dev-libs/nss as SSL/TLS provider Enable support for encrypted conversations Enable support for plugins Use libpurple instead of the built-in IM protocol support