gentoo resync : 25.04.2020

5 files changed, 2 insertions, 72 deletions

diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index ec20e7337171..0d091524131b 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,8 +1,4 @@
-AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f21fcb047c213c442f211570602f7cb3dbc8bc30d29a877bcb99a95c500257fd838ea3514b5cd985ab8d94e2ebc4b453adb8587d9 SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f
-AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
 AUX rdiff-backup-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebabcf5683d7dce16a149db67bcdc7307bd2efe8c65668ca2bf2fd5b8dc3f6712bad874c0f4e6e47cd39e0374cb9972fd0317 SHA512 b5e453bdec77602e242436770fa610b85426939bd1625f560ebaee20bfd20b788ab54eefd2461fae62190d72c708487866ae06a1524ec1bbd7327c52522c921b
-DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
 DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
-EBUILD rdiff-backup-1.3.3-r3.ebuild 879 BLAKE2B 80a2b02bd30860e07010f7fdfa44587045cf980c9f16950212117e1791d86e70a22f7c1bf6da9aecfecd61a2895f7ddbd07607666c2dcb595899cd593fe85fac SHA512 b104e0bc85fd1eae58e0b06c4793d1ad694baa202c5ade3d0a70874dad773fa76693608b5d7d26808abbeae6f63a6f3e670c82a57ba2fe73213d0f36ba91becf
-EBUILD rdiff-backup-2.0.0.ebuild 891 BLAKE2B 7990c253df50f530f515252116b1d72806134631c687dad76785babaabc2fef750cb9ec1ff124179d03f3f04b1965d28dcce193b30395ba23da9295e370ac8b1 SHA512 52dc74292414c8c9e9217fb2ba5acf23dc85f345a1265ab35608169a2abc2d0e439382aa96fec7e4b5226db6fbd7451af964ffaf9e63ae2361b216f24893308b
+EBUILD rdiff-backup-2.0.0.ebuild 889 BLAKE2B 0708e964f2800cd15bebc1bf24955f7734ac0a691a08ace915e048fca68a3c929053240eb7145ca677eafc7d2cb0f393695183e7846e7196331cd921fce20af0 SHA512 6e82c511c23355b00b912b65df12c73b3a91ac0541d781d0e746b745b25dea1a127e5dcb80a8cab8d57da1967fa496ca0f9fafce9318e19f9b2c0471e630bcb9
 MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
deleted file mode 100644
index 16b97ab1c011..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
-@@ -59,8 +59,13 @@
-   if (sm == NULL) return NULL;
-   sm->x_attr = NULL;
- 
-+#ifdef RS_DEFAULT_STRONG_LEN
-   sm->sig_job = rs_sig_begin((size_t)blocklen,
- 							 (size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+  sm->sig_job = rs_sig_begin((size_t)blocklen,
-+							 (size_t)8, RS_MD4_SIG_MAGIC);
-+#endif
-   return (PyObject*)sm;
- }
- 
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
deleted file mode 100644
index 9d69bba9ea2e..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py	2009-03-16 15:45:54.000000000 +0100
-+++ b/setup.py	2018-06-16 18:23:29.689677175 +0200
-@@ -73,9 +73,6 @@
- 							   libraries=libname,
- 							   extra_link_args=lflags_arg)],
- 	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
--	  data_files = [('share/man/man1', ['rdiff-backup.1',
--										'rdiff-backup-statistics.1']),
--					('share/doc/rdiff-backup-%s' % (version_string,),
--					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
-+	  data_files = [('share/man/man1', ['rdiff-backup.1','rdiff-backup-statistics.1'])],
- 					**extra_options)
- 
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
deleted file mode 100644
index 07a46592840d..000000000000
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-UPSTREAM_PV=$(ver_rs 0 '-')
-
-DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="https://github.com/sol1/rdiff-backup"
-SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	net-libs/librsync:0=
-"
-RDEPEND="${DEPEND}
-	dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-librsync-1.0.0.patch"
-	"${FILESDIR}/${P}-no-docs.patch"
-)
-
-python_install_all() {
-	local HTML_DOCS=( FAQ.html )
-	use examples && HTML_DOCS+=( examples.html )
-	distutils-r1_python_install_all
-}
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
index 43f0e6566f9c..bde2048ab84e 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]