From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20219158003 for ; Wed, 28 Dec 2022 18:59:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6639EE0863; Wed, 28 Dec 2022 18:59:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48978E0863 for ; Wed, 28 Dec 2022 18:59:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6123F33EDD8 for ; Wed, 28 Dec 2022 18:59:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB71B21 for ; Wed, 28 Dec 2022 18:59:18 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1672253956.5c993050352ad30ebbfbf41c106dd445f04026ee.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/rdiff-backup/files/, app-backup/rdiff-backup/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/rdiff-backup/Manifest app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch app-backup/rdiff-backup/metadata.xml app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild app-backup/rdiff-backup/rdiff-backup-2.2.1.ebuild X-VCS-Directories: app-backup/rdiff-backup/files/ app-backup/rdiff-backup/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 5c993050352ad30ebbfbf41c106dd445f04026ee X-VCS-Branch: master Date: Wed, 28 Dec 2022 18:59:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4353ea68-6eac-498a-95c4-220835800779 X-Archives-Hash: fc624f774bf836addb80a3f66c4f1566 commit: 5c993050352ad30ebbfbf41c106dd445f04026ee Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Dec 28 18:58:53 2022 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Dec 28 18:59:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c993050 app-backup/rdiff-backup: add 2.2.1, drop 2.2.0 Signed-off-by: Bernard Cafarelli gentoo.org> app-backup/rdiff-backup/Manifest | 7 +++-- .../files/rdiff-backup-2.2.0-no-manpages.patch | 35 ---------------------- app-backup/rdiff-backup/metadata.xml | 1 + ...ckup-2.2.0.ebuild => rdiff-backup-2.2.1.ebuild} | 19 ++++-------- 4 files changed, 12 insertions(+), 50 deletions(-) diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest index 6871763398d0..5247d1216fb5 100644 --- a/app-backup/rdiff-backup/Manifest +++ b/app-backup/rdiff-backup/Manifest @@ -1,3 +1,6 @@ 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 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 @@ rdiff-backup/rdiff-backup + rdiff-backup diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.1.ebuild similarity index 67% rename from app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild rename to 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 -}