gentoo auto-resync : 28:12:2022 - 20:13:25

5 files changed, 14 insertions, 53 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 14c88ee40869..23e6ea7cce27 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 4f05e6c5ed44..a008e60ab2a0 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,8 +1,10 @@
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
-AUX rdiff-backup-2.2.0-no-manpages.patch 1627 BLAKE2B 5662aa2a29199150fe78da472638edf3df20532274e3b077e752e6a14471c63c104bbb51661335a739961f4df43475a4ec1eca2c2c89c955c10dc9b508bb2e02 SHA512 f40f377372bc0cf83d8cabdae573828675ea36352345ecd2cf5ccff8a1da9da0dafd76aee9e8195fcce4acb9172efcc1a33f4bd594c590b19d96574f66d9597d
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
-DIST rdiff-backup-2.2.0-manpages.tar.gz 30062 BLAKE2B 88a9afa238e7a1551aed5f60801d5445a268a6a0e80035564a8a37379f2e356a7eb8f9f39180948a7fd12ba153e08f400c77fa5badc61f79f322054842cad81a SHA512 23f2112b16e4d3340a15be3c58f2a716177268a2d38e5ba28eb72230522a25799ae3a8faf5ffc777777fd262023b2b2dfab09198112bb24751a3a8c4766e85af
-DIST rdiff-backup-2.2.0.tar.gz 903121 BLAKE2B 53adaa64842609e40bbc7aafc14b9a2b062fb5aae17ee6eb5c649a93f7dddc99e3ba681587aad2f9e1adb7fc8191073ccbbcb9e26bf09a90274740b013fd10e3 SHA512 3cae2ada5766c85c7aa1d1c15bd4068e406f524143abcae58775ef24b022ceec499c3262e54bef184f70a1c22c4eb2ce3fb06babbaea64dc0a9115b80831fde5
+DIST rdiff-backup-2.2.1.tar.gz 912681 BLAKE2B 5eb5a2aebb60bac84b836fc76a687695ccde679e6f7eabf22c948f38575f50b83aae339ee77c5e8b6c119e9dff6b4357324908b2e31cef3e32980e2016ff4477 SHA512 f57431cf3478791d2a5b6ef970768c99490737da811237b8c45a0adde8f4ee44ca17fc77ae39f73d0ff2587f089b6f8cd7d21f364323618b24c52bcf1d3864af
+DIST rdiff-backup-delete.1 1957 BLAKE2B c270afbdba56776e1e9449af03bd9a9903219fe04e2eb7ee5695bf59a35ce13da690e14286fbda1e9120ee0bad733fd4baa7271406c457f91a04bed85f598232 SHA512 97eeb64e800aea0653fc1d5a3b517db74b7d95dce8bbd8a406a9dfc3687a207193f7f289e8fd77837419a1c9e796e5446d83147597b9998978426a6c9b86e318
+DIST rdiff-backup-old.1 41328 BLAKE2B dacbf5ae1313dc4596124ef4d5887cdaf75c0c15be6a76239668ae60ea6a6dc65089f99fa6f02bc858d339b8b0466fac3dd8b5992d01ca42f9641e40465ca552 SHA512 cf07b579393bde71cda7da74fea7d974346ea9366ff51af4c24d6215fb2978bd925b4d64a8a1008e5b292d23529ac8499e407cf17590c7e9876d737d42651c72
+DIST rdiff-backup-statistics.1 3961 BLAKE2B 9be7c279d3f24e7c4a391046a027d5b2ef03653d6079176f648e0359c12f6811809859cd67c5bfd1d01b271409cdaf64c69f44d11d47d1e612456a3402531fdd SHA512 b31efbf32538fc2d3c65be2d7fb1166a7a13ca66449fea38d08b00d3dca79e436df930f81e0bd9a3f8fa16ebf30633a82962f7e37376b12ab87544d8103b5290
+DIST rdiff-backup.1 53335 BLAKE2B 996ba1ef156171d64e4b909e4dab9d2d94998fad555a1460f4d0b97ea937ed9f236a63cf84e2f4641a0b5c78ab66bd6e58695168c168d4f24b2b9c379a9def3c SHA512 9fcc0e94b03d539b0ed9326186abd73a9417f5feda9dce924961726865998b0d69076d8823a7b2ae72e1bec108b6714fb664f269ff7d8e19293e55c5779b7d72
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B c1ef8d9afb892cb47dee4e2201953467f56faf7751ae477d23ecfb34a846b28c7bb0f0624728f2c03d343c592a07e67cd0b0b8e553193fb45b5b561f2f3b34b7 SHA512 4007839a1cf39081ed66a5de4de32bf189b313d370c8934c865f1f81745e8d7e4fcac1c6b7c6a716a9bed463d10f0cf08b8a0d689ea9566caf014efac8b207d2
-EBUILD rdiff-backup-2.2.0.ebuild 1155 BLAKE2B dfef04919ccb2a2b9f1624dc97771a7b9597c75f6dfaca5e44bf15e55291f21746dc552032137685d95be0e6c93f818c4287a59cb3a0b1c2ea0cc7cb08890155 SHA512 4bb52a1f69ade65750d97f48921935309fc78a513e587e1d08bfc04b3778ec907820868b61b9099b47ea46712421a9306fb114acf6621a98b293624fbb5cd74d
-MISC metadata.xml 343 BLAKE2B 6ad7958e3c4aea63c7f11fa7810796dc0a83d8bf199e84e44aa3b60f67487cd56ed09ba96c1e7b138ec38b9b812d4b5450a34f81ffd5a5b849c3aad22f1ae38f SHA512 68aad43eb0e9c6e48f3203ad5596384865b0ced8fa46f45aa5214450d6c840cd0ffe90d975435cee4ee2ff58950486430a29ecf37b61e9e539cc8c8300425d53
+EBUILD rdiff-backup-2.2.1.ebuild 1221 BLAKE2B 499334725cf73b06e2bf05657a4ee22e7570bb9327ae4e6328634e67131b213d690332a79e13a93859351b498ef856ee9529f5802b7a698e9c1afa7a56188279 SHA512 0ebe0846324e4890c28e6e7341bdb0c8c12a33ec23236c9d1ca1c96f0d4182d6b67eaab2d1b7b2d6e488ca648191be92797fc376bfd2d0ff886ed60baf180162
+MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
deleted file mode 100644
index 207bf6cfe106..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur rdiff-backup-2.2.0.orig/setup.py rdiff-backup-2.2.0/setup.py
---- rdiff-backup-2.2.0.orig/setup.py	2022-12-18 09:19:30.000000000 +0100
-+++ rdiff-backup-2.2.0/setup.py	2022-12-19 22:00:43.289239007 +0100
-@@ -283,10 +283,7 @@
-         ),
-     ],
-     data_files=[
--        ("share/man/man1", ["build/rdiff-backup.1",
--                            "build/rdiff-backup-old.1",
--                            "build/rdiff-backup-delete.1",
--                            "build/rdiff-backup-statistics.1"]),
-+        ("share/man/man1", ["build/rdiff-backup-old.1"]),
-         (
-             "share/doc/rdiff-backup", [
-                 "CHANGELOG.adoc",
-@@ -311,19 +308,6 @@
-             ("tools/rdiff-backup.spec.template-fedora", "build/rdiff-backup.fedora.spec"),
-             ("docs/rdiff-backup-old.1", "build/rdiff-backup-old.1"),
-         ]},
--        "build_exec": {"commands": [
--            ("asciidoctor -b manpage -a revdate=\"{date}\" "
--             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
--             ("docs", "rdiff-backup.1.adoc"), ("build", "rdiff-backup.1")),
--            ("asciidoctor -b manpage -a revdate=\"{date}\" "
--             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
--             ("docs", "rdiff-backup-statistics.1.adoc"),
--             ("build", "rdiff-backup-statistics.1")),
--            ("asciidoctor -b manpage -a revdate=\"{date}\" "
--             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
--             ("docs", "rdiff-backup-delete.1.adoc"),
--             ("build", "rdiff-backup-delete.1")),
--        ]},
-     },
-     cmdclass={
-         'build_exec': build_exec,
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index 48db65ba4e09..2da39cb8a8f0 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rdiff-backup/rdiff-backup</remote-id>
+		<remote-id type="pypi">rdiff-backup</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.1.ebuild
index b65b8b6ec227..e479d6ae0ef7 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.1.ebuild
@@ -9,10 +9,11 @@ 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
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.gz"
-# Manpages need dev-ruby/asciidoctor
-
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}-old.1
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}-delete.1
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}-statistics.1
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}.1"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -26,16 +27,8 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-no-manpages.patch"
-)
-
 src_prepare() {
+	cp -L "${DISTDIR}"/*.1 dist || die
 	sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
 	default
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman "${S}"-manpages/*.1
-}