commit: d49ed7e9a94fe41be0ef8324d27ef745a69dcd20 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Mon Dec 19 21:16:58 2022 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Mon Dec 19 21:18:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49ed7e9
app-backup/rdiff-backup: manually install manpages Using build/ generates errors when multiple python version are enabled Closes: https://bugs.gentoo.org/887261 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> .../files/rdiff-backup-2.2.0-no-manpages.patch | 35 ++++++++++++++++++++++ app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild | 12 ++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) 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 +}
