gentoo auto-resync : 20:12:2022 - 01:49:56

4 files changed, 46 insertions, 4 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 38fecccd2ee0..24aff0357434 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 3fea224d618e..4f05e6c5ed44 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,7 +1,8 @@
 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
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B c1ef8d9afb892cb47dee4e2201953467f56faf7751ae477d23ecfb34a846b28c7bb0f0624728f2c03d343c592a07e67cd0b0b8e553193fb45b5b561f2f3b34b7 SHA512 4007839a1cf39081ed66a5de4de32bf189b313d370c8934c865f1f81745e8d7e4fcac1c6b7c6a716a9bed463d10f0cf08b8a0d689ea9566caf014efac8b207d2
-EBUILD rdiff-backup-2.2.0.ebuild 1069 BLAKE2B 9ccf23b9d656872c16d6f3a506d577a4c2e95be1302801608983afc62ef740c38be48c58efdda89ecc00deecf8adcc06ffc4a9d7b38231949935050940eac0df SHA512 044562d11deb61657b47b890aea69307b4984eec26280adb39444c840128706e975f5be73f1fe50c36e1608b8a25b56b653a5757a84e621dede25260f665bca3
+EBUILD rdiff-backup-2.2.0.ebuild 1155 BLAKE2B dfef04919ccb2a2b9f1624dc97771a7b9597c75f6dfaca5e44bf15e55291f21746dc552032137685d95be0e6c93f818c4287a59cb3a0b1c2ea0cc7cb08890155 SHA512 4bb52a1f69ade65750d97f48921935309fc78a513e587e1d08bfc04b3778ec907820868b61b9099b47ea46712421a9306fb114acf6621a98b293624fbb5cd74d
 MISC metadata.xml 343 BLAKE2B 6ad7958e3c4aea63c7f11fa7810796dc0a83d8bf199e84e44aa3b60f67487cd56ed09ba96c1e7b138ec38b9b812d4b5450a34f81ffd5a5b849c3aad22f1ae38f SHA512 68aad43eb0e9c6e48f3203ad5596384865b0ced8fa46f45aa5214450d6c840cd0ffe90d975435cee4ee2ff58950486430a29ecf37b61e9e539cc8c8300425d53
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
new file mode 100644
index 000000000000..207bf6cfe106
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
@@ -0,0 +1,35 @@
+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/rdiff-backup-2.2.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
index 398e35fac70f..b65b8b6ec227 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
@@ -26,10 +26,16 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 
-src_prepare() {
-	mkdir build || die
-	cp "${S}"-manpages/*.1 build || die
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-no-manpages.patch"
+)
 
+src_prepare() {
 	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
+}