gentoo resync : 18.12.2020

14 files changed, 2 insertions, 308 deletions

diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 982bd4138576..5c4db805b489 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -1,21 +1,3 @@
-AUX librsync-0.9.7-fix-testsuite.patch 538 BLAKE2B 2cc5f822ca20a626b571fe6d9e55bc5b95ed55e78100e62f8e8a5735d6e0d62ae5e515ec99e2b61efe61aca118ef98eda19e2d6df81c50aa8b4711ec0ba98577 SHA512 d4a31fbb9b1c9b9e47b32151ae65f0a77e95ab9b8a899db50907cb356544fa065efbecee1133e10c66abada847411377d7b9472fffa8a88839c04728130490c1
-AUX librsync-0.9.7-format-security.patch 679 BLAKE2B e61655858050748a8e6c5aa992c9503a327901746510dc7fe0927da94859450b5e8864ddca28e55b0d79b1c4b17128b7fc5226841ad220e1a39f23bdedd362e0 SHA512 d5dd6e6d088f56d2dda13007f6803984d7fcc51ac660969d093c0e4dc48b828eb5c036cf74a2d8bd13c3f4d2f4af58902f91d2b04c371f82b02cbf6ac2e6ba93
-AUX librsync-0.9.7-getopt.patch 899 BLAKE2B 1a6ff6263ca5635f2e104bc4520ebb65c37c6ddcadd8fe6d3dbd1c9943193ed3afb1e7fac0d05b610a9f8ee4214d9b3b60b1cdc3436547997329bb90767895bd SHA512 6805197797eba2b994ccf79ab31e6a7cd2e607ad7f6d6fa30d68b94d58396ee477d2e3ef54705bf874e0d5a8cc58d96048d89800fbb2afbdaddf469caba7484b
-AUX librsync-0.9.7-huge-files.patch 1022 BLAKE2B ca5a7c8e1932f9dfef882a592a30bce8b780ca1802d5806cb46772ea1b80b616911eb6f9c16f623fac2a6d0258d05da01d2860ed0183b18cbf198dd47f51b23a SHA512 e45d0422f7b0fc092b3e41be4ba29305de4940380f3946551e38516a0ccd314a767c0c91e2e4efcd75c2e3ebe684675dc49c37081fa38036c774a81fc68e8855
-AUX librsync-0.9.7-implicit-declaration.patch 568 BLAKE2B 464ee837c8c4f33601edf7ae083547e9743249f3a55a27d48b2311e20dea99fdaf4a1722676eb6a64bef48dacd05589c29369d16448b83fdc6124ed2749847e2 SHA512 58dafcc71c52bf50e8ffc2729bbe54ba2022e16e851499218c724e101813b957b769511ab83a3f29ab359e3c3b4860867b71f97bd4bfa79d5ee69d53fe369f20
-AUX librsync-2.0.1-libdir.patch 500 BLAKE2B f500f461b0a4308d77b53358701d33bbfa314dd27a0d8d7fca5528c08a5611674821035882462f7e3889407db456f24dc501132db7d8526ac8cd103ed3c04233 SHA512 fcbc5247b6684322517ba048d578817bffd9921630a0cd350256d28a06496ad746548f21507dd687434b50aee6999f5628f235e065fdab633d9800f39c1d3295
-DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
-DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
-DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
-DIST librsync-2.1.0.tar.gz 175630 BLAKE2B effd2a8c79fae202921220db7581be1d9f7d278e6ee5155a23e586d9d4a7a27bbc4a50049ddca3b187a8e08451c6dcde7340d22be9fde0c2c12462392043fd8e SHA512 9b91f4b696c1d1cdacb5c0679c7df7a92641e0a6a599c2e5de2bc0af3052b2045bb16c40b072c40859074d792c78c57afb0817917fa9843b179befa4506ebf04
-DIST librsync-2.2.1.tar.gz 180649 BLAKE2B 6dd97a7f140655317c5258d9588ba831716a8909c0d145665b742640a02b317f8736c05b04106f7a221726680f9ccf0ec1bd9a7f760851a993b7783f93193804 SHA512 6581a4285ebcfa1c4dfecac2d6796dab736a4c66a7fb82863c778506073446d9a113d39de7eb29e845a484646f1d8fec29019338bce31a091b0acdc461ab1bcd
-DIST librsync-2.3.0.tar.gz 192493 BLAKE2B c9bb0f211d0d579bec3b7236cfac0ec1dcca6b87458c823430c588b4398b06a559e55e3b9ff8a9f635f7e79bb9c57fbb4b301b55c51c3a694287051557b45a16 SHA512 49b2243b7515a6e69abce438a27515a35ecfe327aee849514af539975418d24b7be2d2c2f8c753860f43bf9596c6a7833694e7d94c30f14093aa12363e0d7ffc
 DIST librsync-2.3.1.tar.gz 194573 BLAKE2B e18c5d76b45701d881f64bf642ec40844bca507b99ab3161b1bf9446a7a0e2cc954d5d5b37a0d8894fabde2a8f6e2896ef1fc51942cf5c40b2f8a1bb94c20ee0 SHA512 89e5b5ad960b8036acce41df09f5e50601d7eb57d48a2bd21c4ee54a3a375f62ee514036b9a562277b5656735b84cadf6f54cbf48c364bbf0c04f2d95ae3b5a6
-EBUILD librsync-0.9.7-r3.ebuild 876 BLAKE2B 9fdb782c3fb719f663cceb1eb1b75d58dcad0a687e5fe94f25775753a60ec55d02ad879eac6774f7d695fc0240227024b5976bbc23a2029d2843d94709012cb4 SHA512 1c9a485c1f074adac359ce05e72c8108a24e1a57503e8643c63375c9668272eb09493fbe114c3fbf6969b9ec125c6a9216d5b28a7bc31b1ea4c8beab904476b8
-EBUILD librsync-2.0.1-r1.ebuild 665 BLAKE2B 5baee133d997787e922ac979461b6447ac4b6bf41522a5e1fd96f4443fd3673528c9fa0e2bd35c84a83b71e710e772563f6067ae83d725d2bcc22150efaa5e93 SHA512 e0b7d4a56fb01cb4f6767b958f7afe3d1f92afd87b52fc34779ce17a9f579c3a4d6899cdfa183c60afb3023ee550045f29bee3589638b1802f6210c16dcadc4f
-EBUILD librsync-2.0.2.ebuild 608 BLAKE2B 4d452311f2727375b3e4934b6abbddf83c09a13f554a6c2299e23cab6ac18216a53f9c49ac08d22f5768f515a45a19d325cd3f75635ec71564909cff3155418c SHA512 108df8dea5da1f8e7a2b2a380f530f355c0d204c04858ebd5eec8360fbdddf79c7e7ed7e3ebd4cdfcd94a212992b2b728e136b2d8137f05e6ed10cc70eb15218
-EBUILD librsync-2.1.0.ebuild 611 BLAKE2B c7a769d9d594417d1218f13be7aacf42da098a22f2563f19b437d96058c742cc45aca890fc156bd1532f3f722eafae6861e0248eee4f6a96044c1f3a2647a238 SHA512 54155f0e126bea498763f15aa2dc747d1edaba0d84ce6045e386c3acde3306e6d094e16f55e2afee0e97e90330d3ac829e313db0c9ad7214194e6abd2af17347
-EBUILD librsync-2.2.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
-EBUILD librsync-2.3.0.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
-EBUILD librsync-2.3.1.ebuild 605 BLAKE2B cdc704e97ea268cd0ff287bf0f24b4792960d97285e2e83f631df79195d38d8b53cb32d8d40e7f72e2b75df4ebcb399d51b818dab911cfab652dc8cfcf8c0dad SHA512 3722e5b97fedd7ae6e1c7bbfb833ff6d09f53cb8519daff78cf00a26a5cc1d5836476f12d2adf1a72c168d2bbd12be929deb92b7b3971a1d795a55634482edaa
+EBUILD librsync-2.3.1.ebuild 604 BLAKE2B 158d6eb6a1fb05e77df171c1bc5ee18eb0892fcbb41c0f6487ab1fdc04add28d108cec5ddd24a247c88fa9db3277e93218b636dedd93db0247f73d77545e07f6 SHA512 96e64b8132037334a6440de32b9cd1d9c69556c602be64c3e290e5239d0e4edaa1033a344c489bde7c4809decf89184b8b29c9e9201df6a5c4b369b403fd814d
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
deleted file mode 100644
index e87c3d8f67b5..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix running tests with the parallel harness
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Last-Update: 2013-06-26
-
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -29,7 +29,7 @@ isprefix_driver_LDADD = ../isprefix.o # XXX: should link replaced functions
- # failed.  Generally these tests should be ordered so that more basic
- # tests are run first.
- 
--TESTS_ENVIRONMENT = $(SH) $(srcdir)/driver.sh
-+TEST_LOG_COMPILER = $(SH) $(srcdir)/driver.sh
- 
- TESTS = \
- 	signature.test mutate.test sources.test isprefix.test	\
diff --git a/net-libs/librsync/files/librsync-0.9.7-format-security.patch b/net-libs/librsync/files/librsync-0.9.7-format-security.patch
deleted file mode 100644
index e35980a4d7a0..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-format-security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Always use a format string in printf
- Fix the warning: buf.c:216:9: error: format not a string literal and no
- format arguments [-Werror=format-security]
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Forwarded: no
-Last-Update: 2012-02-05
-
-diff --git a/buf.c b/buf.c
-index 7f4e7a0..3a83f2b 100644
---- a/buf.c
-+++ b/buf.c
-@@ -213,7 +213,7 @@ rs_result rs_file_copy_cb(void *arg, rs_long_t pos, size_t *len, void **buf)
- 
-     got = fread(*buf, 1, *len, f);
-     if (got == -1) {
--        rs_error(strerror(errno));
-+        rs_error("%s", strerror(errno));
-         return RS_IO_ERROR;
-     } else if (got == 0) {
-         rs_error("unexpected eof on fd%d", fileno(f));
diff --git a/net-libs/librsync/files/librsync-0.9.7-getopt.patch b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
deleted file mode 100644
index 0859089b970a..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-getopt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch by Daniel Baumann <daniel@debian.org> for librsync >= 0.9.7, which makes
-rdiff aware of -i and -z getopt options mentioned in --help output. For further
-information, please have a look to Debian bug ID #435894.
-
---- librsync-0.9.7/rdiff.c			2004-09-17 23:35:50.000000000 +0200
-+++ librsync-0.9.7/rdiff.c.getopt		2008-12-20 13:45:58.000000000 +0100
-@@ -97,8 +97,8 @@
-     { "sum-size",    'S', POPT_ARG_INT,  &strong_len },
-     { "statistics",  's', POPT_ARG_NONE, &show_stats },
-     { "stats",        0,  POPT_ARG_NONE, &show_stats },
--    { "gzip",         0,  POPT_ARG_NONE, 0,             OPT_GZIP },
--    { "bzip2",        0,  POPT_ARG_NONE, 0,             OPT_BZIP2 },
-+    { "gzip",        'z', POPT_ARG_NONE, 0,             OPT_GZIP },
-+    { "bzip2",       'i', POPT_ARG_NONE, 0,             OPT_BZIP2 },
-     { "paranoia",     0,  POPT_ARG_NONE, &rs_roll_paranoia },
-     { 0 }
- };
diff --git a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch b/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
deleted file mode 100644
index fef08941a44f..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7dev/mdfour.h
---- librsync-0.9.7/mdfour.h	2004-02-07 18:17:57.000000000 -0500
-+++ librsync-0.9.7dev/mdfour.h	2006-03-06 03:21:46.000000000 -0500
-@@ -24,7 +24,7 @@
- #include "types.h"
- 
- struct rs_mdfour {
--    int                 A, B, C, D;
-+    unsigned int        A, B, C, D;
- #if HAVE_UINT64
-     uint64_t            totalN;
- #else
-diff -urN librsync-0.9.7/patch.c librsync-0.9.7dev/patch.c
---- librsync-0.9.7/patch.c	2004-09-17 17:35:50.000000000 -0400
-+++ librsync-0.9.7dev/patch.c	2006-03-06 03:21:06.000000000 -0500
-@@ -214,12 +214,12 @@
-     void            *buf, *ptr;
-     rs_buffers_t    *buffs = job->stream;
- 
--    len = job->basis_len;
--    
-     /* copy only as much as will fit in the output buffer, so that we
-      * don't have to block or store the input. */
--    if (len > buffs->avail_out)
-+    if (job->basis_len > buffs->avail_out)
-         len = buffs->avail_out;
-+    else
-+        len = job->basis_len;
- 
-     if (!len)
-         return RS_BLOCKED;
diff --git a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
deleted file mode 100644
index 782597c8fe2b..000000000000
--- a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix -Wimplicit-function-declaration warning in the test suite
- Fix the warning: isprefix.driver.c:43:5: warning: implicit declaration of
- function ‘strcmp’ [-Wimplicit-function-declaration]
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Forwarded: no
-Last-Update: 2012-02-05
-
-diff --git a/testsuite/isprefix.driver.c b/testsuite/isprefix.driver.c
-index a9fd77b..df558c2 100644
---- a/testsuite/isprefix.driver.c
-+++ b/testsuite/isprefix.driver.c
-@@ -21,6 +21,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "isprefix.h"
- 
diff --git a/net-libs/librsync/files/librsync-2.0.1-libdir.patch b/net-libs/librsync/files/librsync-2.0.1-libdir.patch
deleted file mode 100644
index 50460dfdbf12..000000000000
--- a/net-libs/librsync/files/librsync-2.0.1-libdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f40bf1d..b123d09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -333,5 +333,9 @@ endif (ENABLE_COMPRESSION)
- set_target_properties(rsync PROPERTIES VERSION ${LIBRSYNC_VERSION}
-         SOVERSION ${LIBRSYNC_MAJOR_VERSION})
--install(TARGETS rsync ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION lib)
-+
-+if (NOT TARGET_LIBDIR)
-+  set(TARGET_LIBDIR lib)
-+endif()
-+install(TARGETS rsync ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${TARGET_LIBDIR})
- 
- 
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
deleted file mode 100644
index cb7a0da16ce7..000000000000
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Flexible remote checksum-based differencing"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-huge-files.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-getopt.patch
-	"${FILESDIR}"/${P}-implicit-declaration.patch
-	"${FILESDIR}"/${P}-fix-testsuite.patch
-	)
-
-src_prepare() {
-	sed \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-		-i configure.ac || die
-
-	autotools-utils_src_prepare
-}
diff --git a/net-libs/librsync/librsync-2.0.1-r1.ebuild b/net-libs/librsync/librsync-2.0.1-r1.ebuild
deleted file mode 100644
index 5d28a19d5528..000000000000
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-PATCHES=("${FILESDIR}"/${PN}-2.0.1-libdir.patch)
-
-src_configure() {
-	local mycmakeargs=(
-		-DTARGET_LIBDIR=$(get_libdir)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.0.2.ebuild b/net-libs/librsync/librsync-2.0.2.ebuild
deleted file mode 100644
index 17d5c77e925e..000000000000
--- a/net-libs/librsync/librsync-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_LIBB2=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.1.0.ebuild b/net-libs/librsync/librsync-2.1.0.ebuild
deleted file mode 100644
index 755db27d3f54..000000000000
--- a/net-libs/librsync/librsync-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_LIBB2=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.2.1.ebuild b/net-libs/librsync/librsync-2.2.1.ebuild
deleted file mode 100644
index 4a6965cbd509..000000000000
--- a/net-libs/librsync/librsync-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_LIBB2=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.3.0.ebuild b/net-libs/librsync/librsync-2.3.0.ebuild
deleted file mode 100644
index 4a6965cbd509..000000000000
--- a/net-libs/librsync/librsync-2.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_LIBB2=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
index abd5fbe1e3cd..04df479a54d5 100644
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/popt