gentoo resync : 07.08.2021

7 files changed, 4 insertions, 26 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 19e2407b174b..6f1627d5c040 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index e29cf6f742cf..29bd712e4aac 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
 EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
-EBUILD pidgin-sipe-1.25.0-r1.ebuild 1366 BLAKE2B 0167ab57a1fb8e372b1db35f6e3b4a6d42653457dd93c057b82b7b6f8080276b95c94208d0ea54a9f464bf9c4367e5ad71edc60b3979035215c39c5f3809bf58 SHA512 d204faf98046a446260bec28df6986af207377ec4bcfdac7d0def55b4dea8366e6335d998fb346b679e232e91b7dfb2b8350aa81c85bce0ed1790ce8014696b1
+EBUILD pidgin-sipe-1.25.0-r1.ebuild 1365 BLAKE2B b02343bb14a30ecd1d1abc4b2e9d8704aa1c46ee0480cebf428c7be9ed75d72a4e3501985859d9e50ed47674dc249280182e098336908e425881e644a02228d4 SHA512 b7e502cd5805bc62b8dde5ea48a29efbae3a8c15b59d2869c27eb8cf88c86dbd4825ac0ee93b5b2516acfba9cc0a60eeea3feb4e9c8572945b832516f9ff7e0f
 MISC metadata.xml 778 BLAKE2B 8128c3886d6f8ab54d3636954904e30fe4da25bf4bd7268fad499842cadd4a2c5104617b32fedcaaceb93c3a44691bb0815cf8d451e0c26a3380b5a4a2953b54 SHA512 e0d5228e0585c317f635838a2905a0354ecc3af1311e817fbdd0ba1703a13e9d4070a9f9db31891bcb819ac03dc93b2764e2f73bacdffb8318c599612b0cb21f
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
index 6d8c1c1b9068..4b73a6e3e9c1 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 650c6010e861..50f6e8fd69c0 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -1,4 +1,3 @@
 DIST pidgin-skypeweb-1.7.tar.gz 297565 BLAKE2B 94d4fe7b6408fe054bdb79729493929551aabce03c9157992c7cab283c360adfa20c0b9775d82ec7017d762e208259fbf365e6311df566eda033f5a8c71ce20a SHA512 0981aefe23a7bce423fbc447ae22f79077742ac5cc1fd235611acc34175b4a6d9fd4a4af38f7fc3aa7ff7442be71a70c68ca8c271adbe39c085d6ae599cb0871
 EBUILD pidgin-skypeweb-1.7.ebuild 667 BLAKE2B 99582ccea996c734104be87d4ae604288edf1590266538dec9eee721893d79cec8213b9cef244af8bcffad9edff862c9971fccd134e2efb2b99a0b186ead27ea SHA512 a92e21392bed475a432f7e80438947f866dae146a7ea18d03df229957c55dc5617c98f649dbedad154aaf6ff09856bc9a6d56f2f5c5385c3a2ec623cb49e7248
-EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
 MISC metadata.xml 474 BLAKE2B 05aefac276394efa2739064dd4d97db4cca210c8cf8dc6032516f8a0d8596b8fe872004e5dfd50c24b2e695cc50f67da54718e1d03fcc6301f758cfd255864d3 SHA512 9e69489e9875db0978a1ba735b8a653f94f9345e62eddce5930081fcf8b9bfee80c5c555dfa8ce85371e508841cdd0193c2221a5bfdd3cf830ef7a53a3836eac
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
deleted file mode 100644
index 667cb2b00445..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit git-r3
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-EGIT_REPO_URI="https://github.com/EionRobb/skype4pidgin"
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="$S/skypeweb"
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index 01fd28dd5e39..b76e6fd32cd3 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,3 +1,3 @@
 DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
 EBUILD pidgin-window_merge-0.3-r1.ebuild 774 BLAKE2B d9dadf3a1574d3fff4a4aa31e02f1a23b2bb9a61578acd93092a1bae48cdd496cd8fb20b6508f40c23fb6ce7fa18a41a9d94e6b50e500b66d00ca9677cd05f8a SHA512 5f12a0ac477e1032f40a0ddfd4f24e548c31016d22d4565ccbe86d42a3af32ff4e0193dce771a480ab570b99d01577e3595ae0058105fc8a8d1dbb7d60a13ac1
-MISC metadata.xml 333 BLAKE2B 254ce7c009bb5e0034835e975d04ff077bbe0e24e6d226c0381a91a087ce16fcd815cd411db181a8b34463f903fc4afd624a7531c340c083ffe1982c20b6cd33 SHA512 9865a245036486f3b8a82077de63f67f7c37d73fc13c3b385103166610bd45e1d284d96b0358ca1fb84d7aaf15b111e12a59e6fdf3984ae9d0fb145b5e89871c
+MISC metadata.xml 249 BLAKE2B 94d5431cd82044b604295ac9e438c8c5ede013e4bed633193ab92dddd898d04be5478e5a753e3fe80cd758c8856a3ed319d2abb0ad3b0a6218f79a614a83f4c3 SHA512 f4d5fa086ce26ff784f5a2d50f5763e582e2d6bb391ee80184069dc9544e2824ac37ad5efb88d95b46926ebea3d3329912adccae98c93b4183fcb1edccfbbb2a
diff --git a/x11-plugins/pidgin-window_merge/metadata.xml b/x11-plugins/pidgin-window_merge/metadata.xml
index 62c054355ebc..b8624a921df9 100644
--- a/x11-plugins/pidgin-window_merge/metadata.xml
+++ b/x11-plugins/pidgin-window_merge/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dm0-/window_merge</remote-id>
 	</upstream>