5 files changed, 2 insertions, 75 deletions
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index cb067d52ded2..1274a3144892 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -3,15 +3,11 @@ AUX librsync-0.9.7-format-security.patch 679 BLAKE2B e61655858050748a8e6c5aa992c
 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.0-search.patch 358 BLAKE2B ffd694420fc4b320bb260866ffd95ab5876e758bebba7aa319992ea80a5ee8ef2f200b0a870e033a858282b6cd483754d3cb9e095045872f906369dad4d888dd SHA512 06f64c2d95fde23cda01c35d39e0d4d7e81b10750e0e23f87751a356fff7707bfe8481788aef14649875ff65f900c254f612217ee0bf3ddbc06d0471cc5106d7
 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.0.tar.gz 155049 BLAKE2B ca1d938cc8a60ffe5b16b804344164c69296738f6d01adb991a7d0f9685544c8be77608cd17aa269f14bd92cf7390896caa94c84e95313f17e6fa36a4c0e2a46 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0
 DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
 DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
 EBUILD librsync-0.9.7-r3.ebuild 880 BLAKE2B 92da9999000bae998ed7761373ec8d5dca977280cfc713d600de73ba4a9b6c186503cb9c7149d9167bf24b931e4decd2cf87c3bcb3f155ee0196ab0517f3f7ae SHA512 0096c65f111f796ee1ff6ffc26053bcce03c65eeda12fa7bf36c038768fe027587e0666104f66f107784cf1680810da28b2b620c4710a5df2032cd7e5a4c2806
-EBUILD librsync-2.0.0-r1.ebuild 821 BLAKE2B 7b5205c78edb58f35f15d286d17d61792bcca6d78cf19b788f8d1713e571e61cfea97054e3a7122d91c2dd864c69ff3dba06f6f1b5d56b437b44ec0aaf376e88 SHA512 17e51cf4bbac0e4b07de4e73a87786b191b87f2ba8b8f2170cb73af8186027dfe5ba95cc37e96a66f206a807f795538634a433a46dbb1dfb33bbb6afc1038574
-EBUILD librsync-2.0.0.ebuild 760 BLAKE2B 72253c352dcf02c9fda1e338bc65a5c3964e0e622ec61977e7c91f8121e373a4c2cfc0b250fa73fba400298187d05e18a178a87a4885c4ee3c147d8158fbd68d SHA512 d80266085dbc6282cd0ad1399879db63f42034c5d49e4274581f4f82c6ae25e152fc155e06e42a33c274ae2cbf3ca3d4b67c787e243f2bae84a19cc7807cb562
-EBUILD librsync-2.0.1-r1.ebuild 671 BLAKE2B 01fdb985ea603c3ab83be937adb13af69eead3897b43780841ad784b4b23adbc366b3f5d76c682a12bf41ffcd855d4eb53e6eb903c41606dfaf12500d6964f33 SHA512 86b38c4470282ec53dfa1232c6080d8ab15b9d98c22395675bf5c2c26e77875d6310d5c1922c721a15003d1856530ec27a408a93bd4a8eadbbe1d1132f275e78
+EBUILD librsync-2.0.1-r1.ebuild 670 BLAKE2B 4ce6598ddb823e0fffcf09097b226820dee13699b15e0df10481394014f803279674195f5781a17e4a417967f4acc86102ef69ab3c2f87b0169ddf677b9a8b52 SHA512 bb4ae215c3680313652ac5e919eb3c3458f9ab42b968b33b29fa250537bac4de32fe6522e122787a42c5991091cbd1f0459f2bddac48601762324570dc41d253
 EBUILD librsync-2.0.2.ebuild 615 BLAKE2B 884a1929b644cf41e4caa4d11ded0a6b7318c76e95e0f8bb1ac539b2411441b02753eafedb31ad04dd58da1f13cc7a9c22e6c14322d574fc30bb47113f932b9e SHA512 80cf4f2a7edc12be596a3005a89ca34649d94cefe7a4faa7a62da6411d1281ebd936d7304e1a3b54c6839c8cbed59633282e9d30cf048054ff95cee093364603
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/files/librsync-2.0.0-search.patch b/net-libs/librsync/files/librsync-2.0.0-search.patch
deleted file mode 100644
index 93b4106ee8b5..000000000000
--- a/net-libs/librsync/files/librsync-2.0.0-search.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/search.c b/src/search.c
---- a/src/search.c	2015-11-29 21:43:12.000000000 +0100
-+++ b/src/search.c	2016-01-31 19:11:54.847933060 +0100
-@@ -218,7 +218,7 @@
- 	    r = m;
-     }
- 
--    if (l == r) {
-+    if ((l == r) && (l <= bucket->r)) {
- 	int i = sig->targets[l].i;
- 	rs_block_sig_t *b = &(sig->block_sigs[i]);
- 	if (weak_sum != b->weak_sum)
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
deleted file mode 100644
index ff95ffa9ab15..000000000000
--- a/net-libs/librsync/librsync-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# isprefix_test does not work in portage environment
-	sed -i '169 s/^/#/' CMakeLists.txt || die
-
-	# fix compiling with multilib-strict feature enabled
-	sed -i "242 s/lib/$(get_libdir)/" CMakeLists.txt || die
-
-	# fix bug 573144
-	epatch "${FILESDIR}/${P}-search.patch"
-
-	cmake-utils_src_prepare
-}
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
deleted file mode 100644
index d36f0754d76c..000000000000
--- a/net-libs/librsync/librsync-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# isprefix_test does not work in portage environment
-	sed -i '169 s/^/#/' CMakeLists.txt || die
-
-	# fix compiling with multilib-strict feature enabled
-	sed -i "242 s/lib/$(get_libdir)/" CMakeLists.txt || die
-
-	cmake-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
index e082d6abcc7f..c79a64554adb 100644
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.1-r1.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"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"