app-backup/borgbackup: version bump to 1.1.5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 350e4621a8d3f43fc15c113c1e4dec359bda83ef..6805ea4182be8710eb77c779c95c732edcd2f7c1 100644 (file)
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,2 +1,3 @@
 DIST borgbackup-1.1.3.tar.gz 2942183 BLAKE2B c7ca37459d35e06694cf9fdbef7328806cf03e6a4290368d47a2c06e1b6a0700d9dbba3efb170e130c7e59951d65ff8ca677955782150154f0ad2d12b93fe57b SHA512 8378e4f805bfb3e9a4e454f5ccfa58eef0517f13a2e8a2c3c6cbdb0304b763fa67152963b17d677daff09590eb777f12fbe1f3f69c3459bcc68781e5a747cb49
 DIST borgbackup-1.1.4.tar.gz 3390046 BLAKE2B 27d1743718b9fdd303dbc7a01a586b9f87c119ed7f2464582a229bf2357c3f7d929bdf614689be7d7306a707e7332b8ae0ce5bd9898cea5af2311ca2210c5f41 SHA512 0853033f72406a2913dd74c6ebb8b33a318179843255c92481f5e4fdd0f436de6e4c77eed259a422e00bfadcf260facdfd00c813bb0628b82b8ff63a87e1bcfb
+DIST borgbackup-1.1.5.tar.gz 3392774 BLAKE2B 7eaa3dee548748b4b741607934c9344203e318f4558cf9497938caf5ae5af7dfac075748a2c78a767de618d5ca07c80d7dcd2f5c61e7314d643e2974c4eb4b29 SHA512 22071e4b37059d816592baff852772720769b3d86eb1d071abba67f9d13de809066aa29cdf18f1aaef127d1f24288913a7b0b63d157fb98840b1a71606dc0554

diff --git a/app-backup/borgbackup/borgbackup-1.1.5.ebuild b/app-backup/borgbackup/borgbackup-1.1.5.ebuild
new file mode 100644 (file)
index 0000000..fdd80a8
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.5.ebuild
@@ -0,0 +1,46 @@
+# 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-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index e04ac14d4248d3214af4e364b1996d572467bd74..fdd80a89ecd9163313501def579814d1f3650792 100644 (file)
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -41,6 +41,6 @@ DEPEND="
 
 python_prepare_all() {
        # allow use of new (renamed) msgpack
-       sed -i '/msgpack/d' setup.py || die
+       sed -i "s|'msgpack-python.*',||g" setup.py || die
        distutils-r1_python_prepare_all
 }