gentoo resync : 06.08.2019

8 files changed, 66 insertions, 6 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ec1d9818baa3..1febf2ccd768 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 25567065d27c..c463a9bfaf50 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,8 +1,9 @@
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
 DIST borgbackup-1.1.8.tar.gz 3456058 BLAKE2B cad55216f92025418e1a427f4b578d6b7eafa03f6b3e9c4fccb148dd3856c4f6649928fb4227249c534add125f9b3a2a0b6ed808ae12c5e60a28f9df4fb0031a SHA512 1455e68bcedab8f35f9426dc73958c6a6565ad1f1cc274ce59d34a12e3a7bfa1d12fa2b8e8dd3e71824e1cd0927babf79f4e99d4e516454ed12dbd3970d0e921
 DIST borgbackup-1.1.9.tar.gz 3468259 BLAKE2B 91c89304cf22328a0bd74583c22370343915209a204f52c65290dbec0cb688392c2e80b946a55317f8c58ef23099e710c16a34c6bfbbfb547a3e4b38c3c81c37 SHA512 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
+EBUILD borgbackup-1.1.10-r1.ebuild 1168 BLAKE2B 4e52665dc7d0528d5803205543f9e8eccb620a45d8d843c80af67051cc62089929576666dd91699bbde010234e89d7a98ac88d6402370929f4db23663095ecd4 SHA512 d13bae6850a120269a4744b3beee3948759d6304126486e219c6adb3075fdaafbc3ce2155ef7bc74e20d9643c7cada906d1dcfb9ffe2f6a2f85fee038a716bbf
 EBUILD borgbackup-1.1.10.ebuild 1105 BLAKE2B f44a4ce67b66d92c93f292076300033a68f9eb7cac4b22ee8f73926d366cc503283bac05423d4b0f6bbfd4773af66cc85105bc4f30171e37145ae02962dfe25d SHA512 29542266432fc3a13e0df8845a177ee8773f422320a2f030fb812eb067d0c8d16456104ae43df1ba7ed959213aa668dc8bd14f1afeda5562d9691f5067c00901
 EBUILD borgbackup-1.1.8.ebuild 1103 BLAKE2B e190ec23ed8f61a795c48a5754b33b01b31afe3e12f90dedd757476e0364a12dcea9968e84c69c206680767364c74eef4ae0da795098fa823589d2bae17787d5 SHA512 2283bbd7d91e5caf2e46d935c7f5caa4dac432a722516954224987129182ebdecdcd53fb7504c5f6f35d84acfea9eefb01912d6bb13d2c7ddf523c5e8f47c78e
 EBUILD borgbackup-1.1.9.ebuild 1103 BLAKE2B bde3f74d6c6005f31f2d62263233501a124e0ded9231c3d555a9a99558333df17080bd72190bfbf1c167cb08b2500ebbf7ba873f52c502283aa243ba59f3f09f SHA512 d2dc1e3f4a72f18641754e634a4ec9d9dcda2c9852694b7fe5afa7d913ecadaf077899e467ee6155e7ca4df0305b8a795ddc753314fabea00fe6a1c16ba3c20b
-EBUILD borgbackup-9999.ebuild 1098 BLAKE2B 3be2da264d309189c1f5ffe1f2c0f172492792aa17cd61a676cd03179089897a727f31d75f52a659552cb789fd6cab4e73c1122495dc102018a5cf51ada3c90d SHA512 51922f942a6962abd188548d6d736d8545766d0d2ba2d2ccc095facde0aacb10103015fa5ad33302a8380c709b60b0ba72c08b9a42c037abb2c1815177d45a35
+EBUILD borgbackup-9999.ebuild 1193 BLAKE2B dd45787526507ca7970f4ea756ae61e52a1eb83ef99ddff50dab51447520676cb7f1e571036437bcdce109f6a38fa3f3d4dbf469e6d5cee919eeed86c8d6fde6 SHA512 2b5019a7d1d08bb8e54de01922c42307ae4e22ac33f0fa1493a098f306e2048a9dd4ee8b33ef33fd29696d60290afa5c80723b7ff90f1e2e14961e96d6b2836e
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..6b88a3e3c19c
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index aaf19c457431..81920946717e 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -40,8 +40,15 @@ DEPEND="
 	${RDEPEND}
 "
 
+BDEPEND="dev-python/pkgconfig"
+
 python_prepare_all() {
 	# allow use of new (renamed) msgpack
 	sed -i "s|'msgpack-python.*',||g" setup.py || die
 	distutils-r1_python_prepare_all
 }
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index adfc214b5250..b22dd16afe9d 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -2,4 +2,4 @@ AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f
 AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
 DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
 EBUILD rdiff-backup-1.3.3-r3.ebuild 885 BLAKE2B 7cec61669c41764cfcc41f96c8f7cf072bd85a8754fd302234e43ddb96713dbca3037a127c0efec71a8c4cca2d9ac95cab684c53435fee135ddaaadf3351f1fb SHA512 f6305f4e4d309559b68adabaf3219689edaa29bf7dfa8aea76dcc4e9da00c4cd977b04e1b1d90352e470515b80e88590c718090e92d17537a14407e8c79ff085
-MISC metadata.xml 335 BLAKE2B f427a882be2c0152b97b9807660ba4b2b1113708f1cca3b86f42256e72845841f3f17d9646d996c4add83a44c5cfd29430323d6012592dc76420f8af0bc3e083 SHA512 ee210d45a15817b3fa09e4c41577bf499ffcf52bd6298429fceaa566f7edf0c17cc1016ecdf5893fcbc39a10410b7104a2c72ee035f30799058e52e48feb55da
+MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index f7741b77b9fc..8c94752564ce 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">sol1/rdiff-backup</remote-id>
+		<remote-id type="github">rdiff-backup/rdiff-backup</remote-id>
 	</upstream>
 </pkgmetadata>
 
diff --git a/app-backup/rdumpfs/Manifest b/app-backup/rdumpfs/Manifest
index c2fb5545137b..9ae1e193fe28 100644
--- a/app-backup/rdumpfs/Manifest
+++ b/app-backup/rdumpfs/Manifest
@@ -1,3 +1,3 @@
 DIST rdumpfs-0.1.tar.gz 3054 BLAKE2B 6ac78101003dbecb8920c52bc1c4a0bd902b2f4805cfd004665edef4488bb766c57d0328a6bd23413e88e8d8202348e0e10d1012e731eab9dab150188598a2e0 SHA512 54add203d09bff1190c3bd292bd5fde3b81f4b6810f4dc8d1be18f9abfb5334bcbca1aebc00795f4bdce861f356a7b9e5d809cd80475a3c50a21752380570853
-EBUILD rdumpfs-0.1.ebuild 600 BLAKE2B 6f922bce1ddfeb541d5a1d3e242ee93207bad8a18e8d47537a3bdd23d1a6a3339f89cbd1e85f61a4b49e56217d2de882c10036457a7ef1d11aca8222aab4656a SHA512 08bf572651ee56734f09d1c77b3ac69d4f87217bfefc80b425d1a6909073c5387fb8480892ec867ba6693f0052ae0e0a79b91fde03f02ba05629186314326e2f
+EBUILD rdumpfs-0.1.ebuild 625 BLAKE2B f16c95a0f165f140f2f1c0f461d3c9cb43f7390de4786745a146e59cc316e4e906b8cef1d4cabd4cba01f54aa5d82fc00cd4dccde1f0a06e7fd54b81c5dd7cea SHA512 bfafd561c9bae860a49524958cbbe5281cc95cc900227c645ae687ed9fcb2a740914e27016d0967405858d8858d53e2f61de3cf61514f8a190a1d7129398c8f1
 MISC metadata.xml 348 BLAKE2B 0c9eb156e54b8439196c31723fa3c29212a761f66351c3dbc867a33226431172fca6f95aaeea2874ee8be3d914ab5684569a0559be9e29637e0cb06a0267e293 SHA512 106211864b1adb098cd8728facf25fc9103ebc6fcc2478b038864c82e8af8b9c41599e0dee4b4f479e4d9c3caceeaaf34f2f3c241e2334a5357a9e0ed2c0e479
diff --git a/app-backup/rdumpfs/rdumpfs-0.1.ebuild b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
index ee61a90de855..2b6b21577956 100644
--- a/app-backup/rdumpfs/rdumpfs-0.1.ebuild
+++ b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit vcs-snapshot
 COMMIT="b7e8e7b0efd9d73344e022e204f2e99e6321136e"
 DESCRIPTION="a rsync-based dump file system backup tool"
 HOMEPAGE="https://github.com/chneukirchen/rdumpfs"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/chneukirchen/rdumpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"