gentoo resync : 04.01.2022

4 files changed, 2 insertions, 60 deletions

diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 386fe36a9673..c112efb8f570 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,7 +1,4 @@
-AUX rdiff-backup-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebabcf5683d7dce16a149db67bcdc7307bd2efe8c65668ca2bf2fd5b8dc3f6712bad874c0f4e6e47cd39e0374cb9972fd0317 SHA512 b5e453bdec77602e242436770fa610b85426939bd1625f560ebaee20bfd20b788ab54eefd2461fae62190d72c708487866ae06a1524ec1bbd7327c52522c921b
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
-DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
-EBUILD rdiff-backup-2.0.0.ebuild 887 BLAKE2B 46b346a08129103218be532919628a535a3191bebb0f113e295dd4d5d960f35e1512606995c9a591a975606a59e3d8e99413526daa4171e7264f49802f691fa4 SHA512 704dc8aeae4550d0582554df8d6c2de73ceb68739b3bc3fafbb34d1ccce76b147356a230b7f0504c683971ac9874e7d8c463bf7940c18a5c93ca7c6627a1e1a3
-EBUILD rdiff-backup-2.0.5-r1.ebuild 921 BLAKE2B 6fdbb6d086ed97845010d224d51b560ec2c334820901a0a3ec032264d3587a4a49be29de41baf1bc053ec5d70df2cc4ca307ef86fc9cc0c46868bd9166c6770b SHA512 b4327590c16cb5b7272d10d415b0d024cb8a4836dc6617dc2a0b7f969aa9b92acf2228f491cbc8f5093747fbdc79615a735b2bec1e7cd7da59d91d8d9893f51b
+EBUILD rdiff-backup-2.0.5-r1.ebuild 922 BLAKE2B fe48b041f40de1728ee841df207808737f5a3f941fd5fa7490466629c64d97702b506371a24e92040185a43b14d797f89b308864dfbaa019eb4b3d3c4ba96694 SHA512 a01bfbf3ae92997599312b60442691a94ad2fa6e572b1c18171f127f1ed41e74f61aafc52bf4fc3d270cdb4bd1629464a3c8becea38d7d391cd240b8ba14307a
 MISC metadata.xml 343 BLAKE2B 6ad7958e3c4aea63c7f11fa7810796dc0a83d8bf199e84e44aa3b60f67487cd56ed09ba96c1e7b138ec38b9b812d4b5450a34f81ffd5a5b849c3aad22f1ae38f SHA512 68aad43eb0e9c6e48f3203ad5596384865b0ced8fa46f45aa5214450d6c840cd0ffe90d975435cee4ee2ff58950486430a29ecf37b61e9e539cc8c8300425d53
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch
deleted file mode 100644
index bbac52538303..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur rdiff-backup-2.0.0.orig/setup.py rdiff-backup-2.0.0/setup.py
---- rdiff-backup-2.0.0.orig/setup.py	2020-03-15 08:25:32.000000000 +0100
-+++ rdiff-backup-2.0.0/setup.py	2020-03-18 20:36:48.579570457 +0100
-@@ -194,19 +194,6 @@
-     scripts=["src/rdiff-backup", "src/rdiff-backup-statistics"],
-     data_files=[
-         ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]),
--        (
--            "share/doc/rdiff-backup",
--            [
--                "CHANGELOG",
--                "COPYING",
--                "README.md",
--                "docs/FAQ.md",
--                "docs/examples.md",
--                "docs/DEVELOP.md",
--                "docs/Windows-README.md",
--                "docs/Windows-DEVELOP.md",
--            ],
--        ),
-         ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]),
-     ],
-     # options is a hash of hash with command -> option -> value
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
deleted file mode 100644
index cb96d6900ad8..000000000000
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
-SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${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="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	>=net-libs/librsync-1.0:0="
-RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=net-libs/librsync-1.0:0="
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-no-docs.patch"
-)
-
-python_install_all() {
-	local DOCS=( docs/FAQ.md )
-	use examples && DOCS+=( docs/examples.md )
-	distutils-r1_python_install_all
-}
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
index 63dde15c5ccd..17666aaa7a86 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1