gentoo resync : 17.07.2021

3 files changed, 2 insertions, 26 deletions

diff --git a/dev-perl/Net-Jabber/Manifest b/dev-perl/Net-Jabber/Manifest
index 186674f7f306..f8ed5fff7a62 100644
--- a/dev-perl/Net-Jabber/Manifest
+++ b/dev-perl/Net-Jabber/Manifest
@@ -1,6 +1,5 @@
 AUX Net-Jabber-2.0-hash.patch 680 BLAKE2B 869fabdc2d107a8a64d606d2ba4d712fa334bae08b0a32760263b4ee2be7427e51ee0204b6736b44461c56e2d39932656aa3c5ac2491bf957d1bdcb00690889c SHA512 55500cd592d028f3ae211ec441ebb246265bb25d1a34122afcd14bf5b5aee93aad1d07e5b7a787f4d2a717058d95bd41ad5add930c69e3aa9e4bcc7a3bbcf3ee
 AUX Net-Jabber-2.0-no-dot-inc.patch 18091 BLAKE2B c22754f61e5467d0a1464181d529cf3cb57f28e3f2ffff071b8b3a7b71087204e996dbde35087998f04130744b525463ec67bd436b62302e5c64893e9aabec51 SHA512 8c31a256e6c8d638f7f01d8490a2c3c5ea813d55aece342317b114ceaf0c3b5a27779002483005f3d37efe2c95ade2c59f7fb894d5991bf38cabd660efe290a1
 DIST Net-Jabber-2.0.tar.gz 112416 BLAKE2B c8cd86949a934650464ce8dc4e5eb5c12bdd0323caf18773a73df31f72ee6a185d963e43ade22c15d5f7da73f0c5a52ab2e67da478157d7829ab2aa83610fe47 SHA512 2ad275fdef8a7ed17dc464f692b974e71bc3a5df5239943cceaec9509e6454945023e220ddfb42763e18813124f6b7f2d6d43faf3059e0680b753486961a1b4c
-EBUILD Net-Jabber-2.0.0-r1.ebuild 480 BLAKE2B 3e4037b067f6e274b365a4f6ae581d61b66dd0873d634f115b0d0b49871c7c2b8eca85e6d280c4b7e1195370614d8ca5c685555331ef401854d658b6d2a42db3 SHA512 f06358b9f4ad55a42b2194b98f2923efecd72f7024d2fd8d41c268dbaa6da41cb8906f53d0fcc97fea8dbcb35319e62ca9f287c9d33cadba4773ee319512c099
-EBUILD Net-Jabber-2.0.0-r2.ebuild 507 BLAKE2B 75c39cba403f4cf138f62a9c3b52c2b3c2fefad623621794d91ff502df5935ab213c78881a4cdee8bcf52a5be40ccb4b315a8c34b91df603b9facdff92bf4c6a SHA512 a6b1aaed5d09a485828c1218c73fe51f3857fbb579d16b7c6e103a2597ca445b96a504080585a06596dc97eea1f6b2030a6531c104c1ba5765b3a0b38084aa15
+EBUILD Net-Jabber-2.0.0-r2.ebuild 502 BLAKE2B 334c4161b8e1edf66ad8bf4ec6185640d82b10df2b44331093d538e37275122f5b527c94ecbd5aee85c6173faedd7b5b52d721f7192d0c0a1d72b1f2c8cbed81 SHA512 3024fb4f4b952894c4963881e0b2eb474a9125777bda35938f24115dd036a6c7afd3c5d99d964f2cec41404409b7d72c994729f2d48f7e712a141a0ff1faa174
 MISC metadata.xml 1595 BLAKE2B 298932e0ffa8ac325be6fcea585343bd9855292e170e8483d8a1f53965807f21705e452dc64a524c302cecc8088149165e4e99dcd84cee2fa47a0c8ddc66e50f SHA512 9738ba4fca9b95a23888d6936b0837e08e91fae227209e1bf4b73331544ce8b17c5551bc382779a892cbb00df56bcf525a66d1921e99ac43abced1d846deca85
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
deleted file mode 100644
index ccb1434eb2ce..000000000000
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=REATMON
-MODULE_VERSION=2.0
-inherit perl-module
-
-DESCRIPTION="Jabber Perl library"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-perl/XML-Stream
-	dev-perl/Net-XMPP
-	dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0-no-dot-inc.patch" )
-
-SRC_TEST="do"
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
index 196dd0b47c8c..487c56d1b317 100644
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="