gentoo resync : 16.02.1018

5 files changed, 13 insertions, 58 deletions

diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 918ebd0ce7ae..70ac64cc1eb4 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,8 +1,6 @@
-DIST borgbackup-1.1.6.tar.gz 3441523 BLAKE2B 13b1892774e857432a77d1f67d981046a0670b4ba2f3665502f7b729a211fc47e10a87feca308d5089c984cfe4665e7e70ca68bb9aa6e188893a0d088e84df93 SHA512 5741c48bdb70a26d40bd583f207460e35bb7dd560424889d37eb4d90ee96947457faf09bae0fa2b26b42ec71ef6eeaec1b770ba3257223a2637fcb55266e4a17
-DIST borgbackup-1.1.7.tar.gz 3446832 BLAKE2B c4e2ce7c08f0df479d3333e5766ea070d0c1e18abc88fc8787e4212eff27e8e4505759f80f3bdda80d2b9a737241b907a41749edca9a6138eae2a5620913908d SHA512 586420b9cad7e731f2f1b8b05f3cd3dc606691c5a5ec307e887035d941ac5ac6d4c988783660969960a1221e4d9f2b865ee5558d4007ea7524632d0a50a8a402
 DIST borgbackup-1.1.8.tar.gz 3456058 BLAKE2B cad55216f92025418e1a427f4b578d6b7eafa03f6b3e9c4fccb148dd3856c4f6649928fb4227249c534add125f9b3a2a0b6ed808ae12c5e60a28f9df4fb0031a SHA512 1455e68bcedab8f35f9426dc73958c6a6565ad1f1cc274ce59d34a12e3a7bfa1d12fa2b8e8dd3e71824e1cd0927babf79f4e99d4e516454ed12dbd3970d0e921
-EBUILD borgbackup-1.1.6.ebuild 1088 BLAKE2B b89c1c7d27543d4b83d8c00b29e45b0602a6c6c27c5d04ed8309d0701bc37470b09befcaa33304124235ca37d83e84809f077027eb9eca333f78ade8e1bd63e6 SHA512 5a679f0db9dd1fb59f7c6c97c180e55289b3e175c3920e81956b34870a95349023d65165f1c7f3156df1dc8fc40801184a57380684d6fba18df42e018e063c71
-EBUILD borgbackup-1.1.7.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
-EBUILD borgbackup-1.1.8.ebuild 1087 BLAKE2B 90935501258bb349c0c96960d29906d35b4188fa153c64a610ec9a699fe6a1fcb24d24c43a84cc0076e4bfacce23b2db37fa52c91bdbc8ee51b148e821126dec SHA512 20ad7b217f80a05ae404b9e27af123db10be43b55edba61ac8a9025832058b56bf23ec6a4651fcb1a817c5447562f677fdfdce9ef161eb6e42b26dcad58629e6
-EBUILD borgbackup-9999.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
+DIST borgbackup-1.1.9.tar.gz 3468259 BLAKE2B 91c89304cf22328a0bd74583c22370343915209a204f52c65290dbec0cb688392c2e80b946a55317f8c58ef23099e710c16a34c6bfbbfb547a3e4b38c3c81c37 SHA512 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
+EBUILD borgbackup-1.1.8.ebuild 1098 BLAKE2B 6e895efce696d6a149b9c063e336986f50e72832bfcbfe691db09ed623bd3beb511c12fad7fd607e2ef024a2373bbfd37448e5313b8f9898d56f3d284442f35a SHA512 feb2ce7ddd4a315330fd50154f07e94be146abe4e467ac32f6729f4bbfb0f28f8a60492ec42a8ee57a52ea2262c0a1d7f3d06116f6c03c60f5a53175f0b373f3
+EBUILD borgbackup-1.1.9.ebuild 1100 BLAKE2B ad3e554828e9dfd8fc2b1485c854a9e3070351bce7376c73bfe36f732e4e6b49f8627a4858d6304b024558865714f741a4a518850a58943f5da05af1ece9029a SHA512 5142d4e783354d1d126b0db9406520b855622c93a86e8c9e8e9475a770538087ad45e1d17438e79022d35d5225b8bbf0f756c7e627665b5960b827207365409b
+EBUILD borgbackup-9999.ebuild 1100 BLAKE2B ad3e554828e9dfd8fc2b1485c854a9e3070351bce7376c73bfe36f732e4e6b49f8627a4858d6304b024558865714f741a4a518850a58943f5da05af1ece9029a SHA512 5142d4e783354d1d126b0db9406520b855622c93a86e8c9e8e9475a770538087ad45e1d17438e79022d35d5225b8bbf0f756c7e627665b5960b827207365409b
 MISC metadata.xml 380 BLAKE2B 2ac9cd2f49c605955fb4133ff30d52e578bb45b0717348e6909cf7cd172ce9a7436d30394466ece7d889d02802f500f86297072a755b24905c17342cd7aee5e4 SHA512 4160c5674dbb51e9e3fa3c0d29fca6b7ab4073f2e2be1a2eca88ff049b4b5f066d04c747130c45d31a9c63ee2fe3bcb5f521017a581e7f6b69eb07fb94b83661
diff --git a/app-backup/borgbackup/borgbackup-1.1.6.ebuild b/app-backup/borgbackup/borgbackup-1.1.6.ebuild
deleted file mode 100644
index c94a558657c3..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,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
-	dev-python/llfuse[${PYTHON_USEDEP}]
-	dev-python/msgpack[${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
-}
diff --git a/app-backup/borgbackup/borgbackup-1.1.8.ebuild b/app-backup/borgbackup/borgbackup-1.1.8.ebuild
index 15ee3092744c..9cdb1a9c1ce8 100644
--- a/app-backup/borgbackup/borgbackup-1.1.8.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
@@ -26,6 +26,7 @@ IUSE="libressl"
 RDEPEND="
 	!!app-office/borg
 	app-arch/lz4
+	virtual/acl
 	dev-python/llfuse[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
diff --git a/app-backup/borgbackup/borgbackup-1.1.7.ebuild b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
index fdd80a89ecd9..dc020049d631 100644
--- a/app-backup/borgbackup/borgbackup-1.1.7.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
@@ -26,6 +26,7 @@ IUSE="libressl"
 RDEPEND="
 	!!app-office/borg
 	app-arch/lz4
+	virtual/acl
 	dev-python/llfuse[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index fdd80a89ecd9..dc020049d631 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
@@ -26,6 +26,7 @@ IUSE="libressl"
 RDEPEND="
 	!!app-office/borg
 	app-arch/lz4
+	virtual/acl
 	dev-python/llfuse[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]