gentoo Easter resync : 12.04.2020

5 files changed, 213 insertions, 11 deletions

diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index ecc53d63b3e6..3ba7e5461fe6 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,4 +1,8 @@
+AUX borgbackup-1.1.11-unbundle-msgpack.patch 4540 BLAKE2B 7b1da72db127c03f8ab78008b58db122f3257e44d6cd4abd41bb45d333280fe0ac6373fa02eba423b714f760562e76b6ec6433ce4057b50c79ce3d4b4213e8ee SHA512 24f42a0d60266896901f7a37037c1ebce088e82bb46c8077b64fc44e9ee4a4dd96fa6efe91fa4d6d967829c8cf58ed8a0877200b73c76dd4047eeaf3dc1d1bdb
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
+DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
 EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B ae27cdf2189b79b8f92b81fae737864cf1060760794309bdd8b2b7e58b8145f543540018846c2389fe67da3a8f2dc03358c58643883547e0a095a9dc57183156 SHA512 b73ff4cb83104d0b1f262ec6c663d7282f9508538d901e8956705326419fb5eba2019ad914015f15b9fa228885f42409aa8a11a1f22fe214eb847839d73f8364
-EBUILD borgbackup-9999.ebuild 1189 BLAKE2B 9feb65668e744f9731af3a4336f95b3d19a8e9dab8fa34250d2304e4ae1a1c8575da83fd6194849abd0b436d7c44d2084368460fbe4f11aff84307f5c45fd91e SHA512 a042d878db9bde0efb0d6ab6029217fe32a5061653d1112a6d9354d2440e4a8f21f5f44008e6732f4ed57365f43505d0e49c7a61051aa40bc94989881856f052
+EBUILD borgbackup-1.1.11-r1.ebuild 1165 BLAKE2B 3f60fbeb5a6f9006ab18e289ec4a3ff93d97260d9e17aea0dbf50f23a30392d67f47ad4c287199750de76ab8148ea8b78817668b5374f6c6c2f82e330d2f03f4 SHA512 a986e0948aae26c29f11548bb6791c19f8688ad7d30b6ba7c6b1b1d467c9d9aabc10e3cf7f6a81ed3324d8eaf47326e18ef39d194410e8c5be6cd4cf55eb4616
+EBUILD borgbackup-1.1.11-r2.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2
+EBUILD borgbackup-9999.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild
new file mode 100644
index 000000000000..822bb8bafab7
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+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() {
+	rm -rf src/borg/algorithms/msgpack
+	eapply "${FILESDIR}"/${P}-unbundle-msgpack.patch
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
new file mode 100644
index 000000000000..3b9d5248820c
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+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/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}
+"
+
+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 b326c5264e41..3b9d5248820c 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -28,7 +28,6 @@ RDEPEND="
 	app-arch/lz4
 	virtual/acl
 	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= )
@@ -40,14 +39,6 @@ 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/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch b/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch
new file mode 100644
index 000000000000..85b612af2370
--- /dev/null
+++ b/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch
@@ -0,0 +1,110 @@
+diff -Naur borgbackup-1.1.11.orig/setup.cfg borgbackup-1.1.11/setup.cfg
+--- borgbackup-1.1.11.orig/setup.cfg	2020-03-07 18:44:15.000000000 -0500
++++ borgbackup-1.1.11/setup.cfg	2020-03-11 10:28:25.168481822 -0400
+@@ -6,7 +6,7 @@
+ 	F401,F405,F811,
+ 	W504
+ max-line-length = 255
+-exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py,src/borg/algorithms/msgpack
++exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py
+ 
+ [egg_info]
+ tag_build = 
+diff -Naur borgbackup-1.1.11.orig/setup.py borgbackup-1.1.11/setup.py
+--- borgbackup-1.1.11.orig/setup.py	2020-03-07 18:32:06.000000000 -0500
++++ borgbackup-1.1.11/setup.py	2020-03-11 10:28:15.568759338 -0400
+@@ -25,8 +25,6 @@
+ # True: use the shared libb2 from the system, False: use the bundled blake2 code
+ prefer_system_libb2 = True
+ 
+-# prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py.
+-
+ min_python = (3, 4)
+ my_python = sys.version_info
+ 
+@@ -79,8 +77,6 @@
+ platform_syncfilerange_source = 'src/borg/platform/syncfilerange.pyx'
+ platform_darwin_source = 'src/borg/platform/darwin.pyx'
+ platform_freebsd_source = 'src/borg/platform/freebsd.pyx'
+-msgpack_packer_source = 'src/borg/algorithms/msgpack/_packer.pyx'
+-msgpack_unpacker_source = 'src/borg/algorithms/msgpack/_unpacker.pyx'
+ 
+ cython_c_sources = [
+     # these .pyx will get compiled to .c
+@@ -98,12 +94,6 @@
+     platform_darwin_source,
+ ]
+ 
+-cython_cpp_sources = [
+-    # these .pyx will get compiled to .cpp
+-    msgpack_packer_source,
+-    msgpack_unpacker_source,
+-]
+-
+ try:
+     from Cython.Distutils import build_ext
+     import Cython.Compiler.Main as cython_compiler
+@@ -133,8 +123,6 @@
+                 'src/borg/platform/syncfilerange.c',
+                 'src/borg/platform/freebsd.c',
+                 'src/borg/platform/darwin.c',
+-                'src/borg/algorithms/msgpack/_packer.cpp',
+-                'src/borg/algorithms/msgpack/_unpacker.cpp',
+             ])
+             super().make_distribution()
+ 
+@@ -155,14 +143,12 @@
+     platform_freebsd_source = platform_freebsd_source.replace('.pyx', '.c')
+     platform_darwin_source = platform_darwin_source.replace('.pyx', '.c')
+ 
+-    msgpack_packer_source = msgpack_packer_source.replace('.pyx', '.cpp')
+-    msgpack_unpacker_source = msgpack_unpacker_source.replace('.pyx', '.cpp')
+ 
+     from distutils.command.build_ext import build_ext
+     if not on_rtd and not all(os.path.exists(path) for path in [
+         compress_source, crypto_ll_source, chunker_source, hashindex_source, item_source, checksums_source,
+         platform_posix_source, platform_linux_source, platform_syncfilerange_source, platform_freebsd_source, platform_darwin_source,
+-        msgpack_packer_source, msgpack_unpacker_source]):
++        ]):
+         raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.')
+ 
+ 
+@@ -805,26 +791,7 @@
+                                                system_prefix=libb2_prefix, system=libb2_system,
+                                                **crypto_ext_kwargs)
+ 
+-    msgpack_endian = '__BIG_ENDIAN__' if (sys.byteorder == 'big') else '__LITTLE_ENDIAN__'
+-    msgpack_macros = [(msgpack_endian, '1')]
+-    msgpack_packer_ext_kwargs = dict(
+-        sources=[msgpack_packer_source],
+-        include_dirs=include_dirs,
+-        library_dirs=library_dirs,
+-        define_macros=msgpack_macros,
+-        language='c++',
+-    )
+-    msgpack_unpacker_ext_kwargs = dict(
+-        sources=[msgpack_unpacker_source],
+-        include_dirs=include_dirs,
+-        library_dirs=library_dirs,
+-        define_macros=msgpack_macros,
+-        language='c++',
+-    )
+-
+     ext_modules += [
+-        Extension('borg.algorithms.msgpack._packer', **msgpack_packer_ext_kwargs),
+-        Extension('borg.algorithms.msgpack._unpacker', **msgpack_unpacker_ext_kwargs),
+         Extension('borg.compress', **compress_ext_kwargs),
+         Extension('borg.crypto.low_level', **crypto_ext_kwargs),
+         Extension('borg.hashindex', [hashindex_source]),
+diff -Naur borgbackup-1.1.11.orig/src/borg/helpers.py borgbackup-1.1.11/src/borg/helpers.py
+--- borgbackup-1.1.11.orig/src/borg/helpers.py	2020-03-07 18:32:06.000000000 -0500
++++ borgbackup-1.1.11/src/borg/helpers.py	2020-03-11 10:28:42.519980213 -0400
+@@ -55,7 +55,7 @@
+ #   any feedback related to issues caused by this will be ignored.
+ # - especially, it is known that msgpack 0.6.x does NOT work for borg 1.1.x.
+ 
+-prefer_system_msgpack = False
++prefer_system_msgpack = True
+ 
+ try:
+     if prefer_system_msgpack: