From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1722A158094 for ; Tue, 23 Aug 2022 05:11:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF676E0843; Tue, 23 Aug 2022 05:11:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98432E0831 for ; Tue, 23 Aug 2022 05:11:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 210D7340E00 for ; Tue, 23 Aug 2022 05:11:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58C2D58A for ; Tue, 23 Aug 2022 05:11:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661230267.2b967f38394043d8cddb92b1008091dc2da64522.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/bitlbee/bitlbee-3.6-r2.ebuild net-im/bitlbee/bitlbee-3.6-r3.ebuild net-im/bitlbee/bitlbee-9999.ebuild X-VCS-Directories: net-im/bitlbee/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2b967f38394043d8cddb92b1008091dc2da64522 X-VCS-Branch: master Date: Tue, 23 Aug 2022 05:11:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f517d77-00cf-4bc7-9094-e994e366acf3 X-Archives-Hash: e9d10fbe9604ce858f1e493e4fff3606 commit: 2b967f38394043d8cddb92b1008091dc2da64522 Author: Petr Vaněk atlas cz> AuthorDate: Thu Aug 18 14:29:08 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 23 04:51:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b967f38 net-im/bitlbee: tests require xmpp enabled not plugins plugins use flag is not required for test to work but xmpp is, because of tests/check_jabber_* tests. The test? ( plugin ) requirement was wrongly introduced in commit eb108d8b5224 ("net-im/bitlbee: force plugins to be enabled for tests") as a solution for bug https://bugs.gentoo.org/617604 which was later reported again in bug https://bugs.gentoo.org/739510 and correctly fixed in commit 05dc33a126ab ("net-im/bitlbee: fix compilation with disabled plugins use"). Bug: https://bugs.gentoo.org/617604 Bug: https://bugs.gentoo.org/739510 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> net-im/bitlbee/bitlbee-3.6-r2.ebuild | 2 +- net-im/bitlbee/bitlbee-3.6-r3.ebuild | 2 +- net-im/bitlbee/bitlbee-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild index 983d5a872b1c..4c086510b8d5 100644 --- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) + test? ( xmpp ) xmpp? ( !nss ) " diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index dc1b934e114a..6e4406af9f57 100644 --- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) + test? ( xmpp ) xmpp? ( !nss ) " diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index c1ec4905594e..58c3144ff8d5 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE=" || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) + test? ( xmpp ) xmpp? ( !nss ) "