gentoo resync : 28.04.2021

4 files changed, 63 insertions, 4 deletions

diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index c13bf8b4285f..87086629e7b2 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,9 +1,10 @@
 AUX bitlbee-3.5-libcheck.patch 17203 BLAKE2B 14cb1ba02178e89ed098518a8fb48b6f3124c197422acf3332c1fe579fb34ffd63e2fc377a6eea93cbe14a91129d22884eae7760fb6e8090afa8245c9f958f2a SHA512 25ea4be83cce5d2ccc1a5e6655e468678a26b570a3efb7b19429ee379987efce54d32864508ed36644bbcf351cc1b5e4b750a2824b7a0b7e7df711262bbf5e2c
 AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e7c5c3177ae8aaf3223ac3f0979b9650cefcbb000d5e4ccc9ecb8fdab97173ad59022453c5b13c8486fb095b4ff14 SHA512 b8937c542eda36aa5dcdd3213513f6dd5a928166f1017ef370a78765dbc511552072fe46d8322dea27ee716126fd859245e6c2fa713f6b255fb6e7a4ce2c1328
 AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd
+AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc39c2156322eb040683ad0ee6894a4c9d189868e9af126c6530ff46879d48878771007c76c1e77b266ea3bcfdba5fc2fe7121ac7ac SHA512 9e7f2a25c70a0d2eca9b6731f568fc3b639b057bebf8131aa9f4089f0ce28761cd03035320cd88ba58c622ec342d08946f31fdec20e45d3b25fb316ac4fe0dfc
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r1.ebuild 3334 BLAKE2B 74b9f18f647d3f45d5a2e9eabe95fdecbb1d40cd458f7293fdc34cb918087ac64c711829a12c7f27c0f692c54f2ba85dd6e99d515ad1f4d87155f4bfca4bcb1b SHA512 164c1274d5b942cf86e84b8c2d14d4ea9ea2e6832e83a91f163469a35a246e930af752675a3be921e98ef31b5a373b035310895e4f695a5fea880e9ff1b93b7c
-EBUILD bitlbee-9999.ebuild 3257 BLAKE2B 3c171f48cc946d80c83861c51b906b13844bebcff744c869cd7650254b503f19b8be71f0607b40df877612793e5d5b853290ba7e8ace3c8022f4c6e8396b8c88 SHA512 0720afc3a251ca06127a9cb8ab322d8a6e0a63dad53d60549ffb24f96492639165b98d17b40a8d7d3c5d8cad16552d95099fd109e1a0829c31b8d06c491521a8
+EBUILD bitlbee-3.6-r1.ebuild 3402 BLAKE2B 06b1190172f199cad20186d00398277590023e23e9845a4b3c5a0f50237cb38932dabb04c24a761a2888ac459c362e6ec5aebec60bedcff25540cd05dd51bec6 SHA512 500bc7cd6535c0df95d2e744134362777cb274f048b5c93acf92b4e29077d8f8ce81fbdaa6c4775d5d9249b279f03c4c5a58ba8e4b93a9c92301720ef7d6b979
+EBUILD bitlbee-9999.ebuild 3278 BLAKE2B fe852f341161c46bb6e09f8160866928cc494cbb6cf0ddacd8544a8ec65cd4932c4a30bacd14b2b2be5106c4a5f587015515bda870b95e312c54b55b82e243d9 SHA512 3bd79912676d08ee353eecb7d8e84275da68910e9fb98c491a896d408099bb1267b955cf650281968d7443ab25e104d3ed4a210d56b009cabcc770db31bac7c3
 MISC metadata.xml 1168 BLAKE2B ad0a883cef4404c3a6ddec5951a009330b02396072691968834d3de0d2fdb1aa05ccaa3e819c2c9d3b89cbd0266782902f5fbc8c2fa97a49049b49d8e6f8913e SHA512 0093ff572bae101bcb8cf375f5b95609d0550f77150ec98cbc4a5d62f0006c6439647c528c45309351083b886d4bd95a556957c6ddaf4b2a0a34fa7f87cfa9ea
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 126e7ae66fc7..0411dc061d1b 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -27,8 +27,9 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
+	purple? ( plugins )
 	test? ( plugins )
+	xmpp? ( !nss )
 "
 
 COMMON_DEPEND="
@@ -64,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
 	"${FILESDIR}"/${PN}-3.5-libcheck.patch
 	"${FILESDIR}"/${PN}-3.5-libevent.patch
+	"${FILESDIR}"/${P}-disabled-plugins-use.patch
 )
 
 src_configure() {
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 220b6904f2d3..b1eb2f2c62c0 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -27,8 +27,9 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
+	purple? ( plugins )
 	test? ( plugins )
+	xmpp? ( !nss )
 "
 
 COMMON_DEPEND="
diff --git a/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch
new file mode 100644
index 000000000000..0973bd4bd5fa
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch
@@ -0,0 +1,55 @@
+This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156
+where it was already merged.
+
+From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Tue, 23 Mar 2021 13:07:18 +0100
+Subject: [PATCH] root_commands: prevent linker error when plugins are disabled
+
+This commit fixes compilation issue with disabled plugin support
+(./configure --plugins=0), where get_plugins function is unavailable.
+The problem has been introduced with addition of new 'plugins info'
+subcommand, where get_plugins is used in cmd_plugins_info function,
+which should be conditionally available only if WITH_PLUGINS is defined.
+
+Bug: https://bugs.gentoo.org/739510
+Bug: https://bugs.gentoo.org/617604
+Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there")
+Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
+---
+ root_commands.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/root_commands.c b/root_commands.c
+index 8358c030..a4e72f83 100644
+--- a/root_commands.c
++++ b/root_commands.c
+@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr)
+ 	g_list_free(prpls);
+ }
+ 
++#ifdef WITH_PLUGINS
+ static void cmd_plugins_info(irc_t *irc, char **cmd)
+ {
+ 	GList *l;
+@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd)
+ 		irc_rootmsg(irc, "  URL: %s", info->url);
+ 	}
+ }
++#endif
+ 
+ static void cmd_plugins(irc_t *irc, char **cmd)
+ {
+@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd)
+ 	GString *gstr;
+ 
+ 	if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) {
++#ifdef WITH_PLUGINS
+ 		cmd_plugins_info(irc, cmd);
++#endif
+ 		return;
+ 	}
+ 
+-- 
+2.26.3
+