aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstroFloyd <AstroFloyd@gmail.com>2020-04-14 13:50:33 +0200
committerAstroFloyd <AstroFloyd@gmail.com>2020-04-14 13:50:33 +0200
commitb0f22854469d7d0e6f2f303cce3d3d6b3ace0793 (patch)
tree9f8c3baf19688ac92af7e299a34b62a473776a0c
parentnet-im/skypeforlinux: add v8.56.0.103-r2 to repo for use w/o USER_NS (diff)
downloadAstroFloyd-b0f22854469d7d0e6f2f303cce3d3d6b3ace0793.tar.gz
AstroFloyd-b0f22854469d7d0e6f2f303cce3d3d6b3ace0793.tar.bz2
AstroFloyd-b0f22854469d7d0e6f2f303cce3d3d6b3ace0793.zip
app-backup/rdiff-backup: copy rdiff-backup-1.3.3-r3.ebuild from portage
Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: AstroFloyd <AstroFloyd@gmail.com>
-rw-r--r--app-backup/rdiff-backup/ChangeLog11
-rw-r--r--app-backup/rdiff-backup/Manifest7
-rw-r--r--app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch16
-rw-r--r--app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch13
-rw-r--r--app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch23
-rw-r--r--app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild (renamed from app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild)27
6 files changed, 82 insertions, 15 deletions
diff --git a/app-backup/rdiff-backup/ChangeLog b/app-backup/rdiff-backup/ChangeLog
index 1d4b207..b4c227a 100644
--- a/app-backup/rdiff-backup/ChangeLog
+++ b/app-backup/rdiff-backup/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for app-backup/rdiff-backup
-# Copyright 1999-2018 Gentoo Authors; Distributed under the GPL v2
+# Copyright 1999-2020 Gentoo Authors; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/ChangeLog,v 1.62 2012/09/23 04:27:40 mattst88 Exp $
+*rdiff-backup-1.3.3-r3 (14 Apr 2020)
+
+ 14 Apr 2020; AstroFloyd <AstroFloyd@gmail.com>
+ +files/rdiff-backup-1.3.3-librsync-1.0.0.patch,
+ +files/rdiff-backup-1.3.3-no-docs.patch,
+ +files/rdiff-backup-2.0.0-no-docs.patch, +rdiff-backup-1.3.3-r3.ebuild,
+ -rdiff-backup-1.3.3-r2.ebuild:
+ app-backup/rdiff-backup: copy rdiff-backup-1.3.3-r3.ebuild from portage
+
07 Oct 2018; AstroFloyd <AstroFloyd@gmail.com> rdiff-backup-1.3.3-r1.ebuild,
rdiff-backup-1.3.3-r2.ebuild:
app-backup/rdiff-backup: fix most issues
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 1e28656..593d843 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,5 +1,8 @@
+AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f21fcb047c213c442f211570602f7cb3dbc8bc30d29a877bcb99a95c500257fd838ea3514b5cd985ab8d94e2ebc4b453adb8587d9 SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f
+AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
+AUX rdiff-backup-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebabcf5683d7dce16a149db67bcdc7307bd2efe8c65668ca2bf2fd5b8dc3f6712bad874c0f4e6e47cd39e0374cb9972fd0317 SHA512 b5e453bdec77602e242436770fa610b85426939bd1625f560ebaee20bfd20b788ab54eefd2461fae62190d72c708487866ae06a1524ec1bbd7327c52522c921b
DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
EBUILD rdiff-backup-1.3.3-r1.ebuild 686 BLAKE2B 29c0737053e4f1d0a36e78d3f0838eaa2aca4a7cd680cb93c49a3a01521482c9c463f19143f19de93725847953304195ee55c7241336bf555dfc69c728c9ea9a SHA512 5789ce278dff1e4befc716f225bf3767df58233b63ce59c69b1e1ff886b590e0f7e2e1d8038026dba006a0a6e6b0ca297f5790e06064335a929072115a312194
-EBUILD rdiff-backup-1.3.3-r2.ebuild 855 BLAKE2B 320091756a7e42efda669e9eca57a27884e3b0e7271287dceace61dc5acc981d8386c91d5a65bd77222a04cc6b636f44502320caf1713726a05ff8868c512e53 SHA512 37404f63fad8a6ba45bb36ff83e99c1f7a6ae5f0937422cf6b214b7cf826842ee12e546472564973b0b8bc30093fbdbca84476353a564a737791e24df5f31b08
-MISC ChangeLog 13547 BLAKE2B c52244d24e41f5d33282257418156ad3f5743f9336c315ce9810023f6754c539b73b5d73eb63cb78d682bd12c43f67ab39e99b7dc4d4ff074f00633132984900 SHA512 55f93af6f3c5014f9a029e6eeb40e5009e2bf32a71b00ccb41d0c2b318eac59079bfdd2536961e62f9e3aad02dfe7b9d6196f20eed1e57557ab272a68c3e905d
+EBUILD rdiff-backup-1.3.3-r3.ebuild 885 BLAKE2B 86ff121f643a4eb951d144194f4c5a41ac3426fb55d95acbebb5f939aac88e0e4a8808b575ec7bd9d585c04c23a91f37f85c9e45923c304ac8bf3da01deea944 SHA512 7d28a3395fc02086924b1a83c35f1c853bc78b75559df4b60351b802bdb0aa086c5392b736578834180ac9018b6e73ea63f39d23490f118d56c64b5fea134a19
+MISC ChangeLog 13909 BLAKE2B a002ee541dbdd62641488f7c9812e948bc42ae5af7d0b5d5e080599078655163ced3a313903a43e4cd919adaf5f5d01376b78e91de66de2a62fffc6a47997704 SHA512 86508e67604175a51ea468f58634816fae3e69b242742c228f06df0d2bc2606015d6339ee78e635c9962688e415e2290a7d4bbd6b9568280a84bb28e084e855a
MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
new file mode 100644
index 0000000..16b97ab
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
@@ -0,0 +1,16 @@
+--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+ if (sm == NULL) return NULL;
+ sm->x_attr = NULL;
+
++#ifdef RS_DEFAULT_STRONG_LEN
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
+ (size_t)RS_DEFAULT_STRONG_LEN);
++#else
++ sm->sig_job = rs_sig_begin((size_t)blocklen,
++ (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+ return (PyObject*)sm;
+ }
+
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
new file mode 100644
index 0000000..9d69bba
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
@@ -0,0 +1,13 @@
+--- a/setup.py 2009-03-16 15:45:54.000000000 +0100
++++ b/setup.py 2018-06-16 18:23:29.689677175 +0200
+@@ -73,9 +73,6 @@
+ libraries=libname,
+ extra_link_args=lflags_arg)],
+ scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
+- data_files = [('share/man/man1', ['rdiff-backup.1',
+- 'rdiff-backup-statistics.1']),
+- ('share/doc/rdiff-backup-%s' % (version_string,),
+- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
++ data_files = [('share/man/man1', ['rdiff-backup.1','rdiff-backup-statistics.1'])],
+ **extra_options)
+
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
new file mode 100644
index 0000000..bbac525
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch
@@ -0,0 +1,23 @@
+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-1.3.3-r2.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
index 1c92722..3fa967c 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
-inherit distutils-r1 versionator
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
-UPSTREAM_PV=$(replace_all_version_separators '-')
+UPSTREAM_PV=$(ver_rs 0 '-')
DESCRIPTION="Local/remote mirroring+incremental backup"
HOMEPAGE="https://github.com/sol1/rdiff-backup"
@@ -14,21 +14,24 @@ SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="examples"
DEPEND="
- net-libs/librsync:0/2
+ net-libs/librsync:0=
"
-RDEPEND="
- dev-python/pyxattr[${PYTHON_USEDEP}]
+RDEPEND="${DEPEND}
dev-python/pylibacl[${PYTHON_USEDEP}]
+ dev-python/pyxattr[${PYTHON_USEDEP}]
"
-PATCHES=( "${FILESDIR}/${P}-librsync-1.0.0.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-librsync-1.0.0.patch"
+ "${FILESDIR}/${P}-no-docs.patch"
+)
python_install_all() {
- use examples && local EXAMPLES=( examples.html )
-
+ local HTML_DOCS=( FAQ.html )
+ use examples && HTML_DOCS+=( examples.html )
distutils-r1_python_install_all
}