gentoo resync : 20.01.2020

4 files changed, 7 insertions, 12 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index c3d122f28558..56e84b815834 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,6 +7,6 @@ AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f066
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.13.0-r1.ebuild 7925 BLAKE2B 73185de07111b59d16c7c51828ec58b56c28dab15adc426f71c743f505cdc4c4f3a7c0c2e698ab2a3f2cb17993605d51f480d394663cf83a6a8dd22ab79a4083 SHA512 20618c8d0015ff6fc5e7fae3e170afe35eced970d6955b2dcd761086ad8beb1f0f161f691e447975b94d11873c2c782926560e2bf587b5b9b9e90a6a7d8e6897
-EBUILD pidgin-2.13.0.ebuild 7815 BLAKE2B f5c2f89ff8bd9e0730db470e7b99426437442c1288a978fd5d71a79782a86a237eeeb4548345505c05d7f4facd95a2cd473b66ca4dfe6618813cb1b849926315 SHA512 60d6ddc707040b6ef41e7dd57cc5906434665732a81c3265f6dfa6fc030da61cd5394d637e53b523513f2ef7f1205aa3cd3434534ccd2c95c869c64f2bef822c
-MISC metadata.xml 1480 BLAKE2B 09a69fc87ec34ef69c1862ba62eefabdde0cc806e47e005d2e13cfd639c6cd0d7f7ec6ac5e9a9d2b438c29d98caaf613b472e41ede2cef93de303da15c553e43 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00
+EBUILD pidgin-2.13.0-r2.ebuild 7734 BLAKE2B 1cc69fef8e2369cdcf856ac9c2ac0d110309636ec536150c992fb86db08824511ab71cfd12e529d3d250e9e2e2e4602b72116cf306e99e6cbd6d65cc6f2e01d3 SHA512 cce04ae27fa68f36eaca99284aa1cfce96f22724b1d49a866c832483ebcee75092fb800407511a19027746170e3f1888ce47a25391a450e8e233fd859cde1cd6
+EBUILD pidgin-2.13.0-r3.ebuild 7844 BLAKE2B d9966063b1e20a3fad5c473b6ec84e48d960c60c5207d5c3d7fd2feed4a9ad9eaf124052f0aaa61df802f417c78d8972a164729c767d370e97a93f6379ac9d5b SHA512 998748e0b41562bcbeeb5c18569f3a0de02ccdba7cd8a6e90754649898cee3ce3edccf741402d6919b679c827ab8f6c4ab5bf542f726c9689824cac6a2508cde
+MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 718b51ce3ea3..c7542a5eab79 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Lars Wendler</name>
 	</maintainer>
 	<longdescription>
-	Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
+	Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE, and Zephyr.
 	</longdescription>
 	<use>
 		<flag name="gadu">Enable Gadu Gadu protocol support</flag>
@@ -17,7 +17,6 @@
 		<flag name="ncurses">Build finch, console interface</flag>
 		<flag name="prediction">Enable Contact Availability Prediction plugin</flag>
 		<flag name="python">Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support</flag>
-		<flag name="silc">Enable SILC protocol support</flag>
 		<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
 		<flag name="zephyr">Enable Zephyr protocol support</flag>
 	</use>
diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0-r2.ebuild
index 940a4d414de2..7b1541443e6f 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" networkmanager nls perl tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
 IUSE+=" aqua"
 
@@ -70,7 +70,6 @@ RDEPEND="
 		dev-libs/nss
 	)
 	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	sasl? ( dev-libs/cyrus-sasl:2 )
@@ -179,7 +178,6 @@ src_configure() {
 
 	use gadu 	&& DYNAMIC_PRPLS+=",gg"
 	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use silc 	&& DYNAMIC_PRPLS+=",silc"
 	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
 	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
 	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
diff --git a/net-im/pidgin/pidgin-2.13.0-r1.ebuild b/net-im/pidgin/pidgin-2.13.0-r3.ebuild
index bf8576fd7109..632e0faa952e 100644
--- a/net-im/pidgin/pidgin-2.13.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0-r3.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" networkmanager nls perl tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
 IUSE+=" aqua"
 
@@ -70,7 +70,6 @@ RDEPEND="
 		dev-libs/nss
 	)
 	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	sasl? ( dev-libs/cyrus-sasl:2 )
@@ -183,7 +182,6 @@ src_configure() {
 
 	use gadu 	&& DYNAMIC_PRPLS+=",gg"
 	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use silc 	&& DYNAMIC_PRPLS+=",silc"
 	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
 	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
 	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"