commit: c91e5a92d0c814abe968fbddbdab397494101bb1
Author: Alessandro Calorì <axelgenus <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 18:35:51 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 14:27:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91e5a92
app-backup/rdiff-backup: clean up, fix #568800
app-backup/rdiff-backup/Manifest | 4 +++
.../files/rdiff-backup-1.2.8-popen2.patch | 16 ----------
.../files/rdiff-backup-1.3.3-librsync-1.0.0.patch | 16 ++++++++++
app-backup/rdiff-backup/metadata.xml | 11 ++++++-
.../rdiff-backup/rdiff-backup-1.3.3-r1.ebuild | 12 ++++----
.../rdiff-backup/rdiff-backup-1.3.3-r2.ebuild | 35 ++++++++++++++++++++++
6 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 71bad4b..d13fdb3 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1 +1,5 @@
+AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 SHA256
1211ad1019df0b30d4f4a3e364a67f5977d17424c605f00383c686dd1b22cd0a SHA512
2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f
WHIRLPOOL
0a2bf4003f0cfb5fc83b78d0d3c05cff6e28b8b4850a525550e0db39fa97edc71bc7ed9fb79e108912917a8e212ed3126e6ca60f8eb7f9299bad5db56d28fdc8
DIST rdiff-backup-1.3.3.tar.gz 198412 SHA256
ee030ce638df0eb1047cf72578e0de15d9a3ee9ab24da2dc0023e2978be30c06 SHA512
e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
WHIRLPOOL
04f3257c8a1dd6b8c81ec1f7d3fb7d1e4bba9bb97020b0932d2a72d9279924147ec98c74e5f9952b5c14c50675ac03f7d7956875ce58c1e677571c9cfab57f89
+EBUILD rdiff-backup-1.3.3-r1.ebuild 818 SHA256
9b4a4f99dd470e24af3c314ecd2dfa45ee5f6c5e175e963a66ac0acedfadc5ef SHA512
a07a56d62b38b69c2209a66dd4923b84f165e3480f0edb9d271946efa961bae0637d022f7500a34ee30d719147f04b3e18b4a73737c285222fffd6cf02ef3619
WHIRLPOOL
375ad41959ae48b091f79854fda6091548ec951e97a3883e3a2972e065392874280eab2e886443bea0c57a42ee3f6d6da479b650ead3dced88e2ce56f436fd6f
+EBUILD rdiff-backup-1.3.3-r2.ebuild 878 SHA256
d5f684f3e347a138390ef7a0dffc5e0190ec2c8c4e9e61d14a8d92ba6e3c4ff8 SHA512
2a8f3af4172abea7bf2589602b1565704f24255903040b57bb79845ad6dd89c4c23db25ac2ebeb9467afd68739161c8798e23a052df88e84e2a1760f5991fbce
WHIRLPOOL
e33becdc25897e285a1c8a39cc57ea4704c4f99f0da404d3e932101f0cca451e95c55a3ab2822a7311ed0707a6f0b3b11ddc2c34c3d9bded7b1449957fbf606e
+MISC metadata.xml 528 SHA256
df5f0b98cce36fcc75c0a4bc9f20f5267a7d09ea707c279974b46512fa339dbe SHA512
6ed247ca5297a4ebe7586a6e6e0437368d781c20c18774bdf55b96adb78e6ed5916b18810ba04025805def8dc07ca7dff0d1ea66b5c8f3ed099ae5084f025f35
WHIRLPOOL
57b7130a085f954cd6060fe0a8d22e38a34794a8af80679d3bcc2b997c96213ff1c1aae7cc91c0d9cfb8da718e7cfa7bb1dafa0327f27850acdadfed7863d9c1
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
b/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
deleted file mode 100644
index f9cad9a..0000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.2.8-popen2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py
rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
---- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py 2009-03-16
15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2009-10-03
19:27:54.935647306 +0200
-@@ -135,10 +135,10 @@
- if not remote_cmd: return Globals.local_connection
-
- Log("Executing " + remote_cmd, 4)
-- if os.name == "nt":
-+ if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
- import subprocess
- try:
-- process = subprocess.Popen(remote_cmd, shell=False,
bufsize=0,
-+ process = subprocess.Popen(remote_cmd, shell=True,
bufsize=0,
-
stdin=subprocess.PIPE,
-
stdout=subprocess.PIPE)
- (stdin, stdout) = (process.stdin, process.stdout)
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/metadata.xml
b/app-backup/rdiff-backup/metadata.xml
index defaad0..7297ecd 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -2,6 +2,15 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<maintainer type="person">
- <email>[email protected]</email>
+ <email>[email protected]</email>
+ <name>Alessandro Calorì</name>
+ <description>Proxied maintainer; set to assignee in all
bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">sol1/rdiff-backup</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
index 408a8cb..8f603b0 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
+inherit distutils-r1 versionator
+
+UPSTREAM_PV=$(replace_all_version_separators '-')
DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="http://rdiff-backup.nongnu.org/";
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz";
+HOMEPAGE="https://github.com/sol1/rdiff-backup";
+SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -17,7 +19,7 @@ KEYWORDS="alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86
~x86-interix ~amd64-linu
IUSE="examples"
DEPEND="
- ~net-libs/librsync-0.9.7
+ net-libs/librsync:0/1
"
RDEPEND="
dev-python/pyxattr[${PYTHON_USEDEP}]
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
new file mode 100644
index 0000000..95544cb
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+UPSTREAM_PV=$(replace_all_version_separators '-')
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/sol1/rdiff-backup";
+SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+ net-libs/librsync:0/2
+"
+RDEPEND="
+ dev-python/pyxattr[${PYTHON_USEDEP}]
+ dev-python/pylibacl[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-librsync-1.0.0.patch" )
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples.html )
+
+ distutils-r1_python_install_all
+}
