[gentoo-commits] repo/gentoo:master commit in: app-backup/borgbackup/

[Anthony G. Basile]

commit:     1de87698ffc1895ac812b7718bc64e1fdd090192
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 15:17:00 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 15:17:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de87698

app-backup/borgbackup: fix file conflict with app-office/borg, bug #580402

Package-Manager: portage-2.2.26

 app-backup/borgbackup/borgbackup-1.0.1.ebuild | 2 ++
 app-backup/borgbackup/borgbackup-9999.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-backup/borgbackup/borgbackup-1.0.1.ebuild 
b/app-backup/borgbackup/borgbackup-1.0.1.ebuild
index 373e984..c6825d5 100644
--- a/app-backup/borgbackup/borgbackup-1.0.1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.0.1.ebuild
@@ -23,7 +23,9 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="libressl +fuse"
 
+# Unformately we have a file conflict with app-office/borg, bug #580402
 RDEPEND="
+       !!app-office/borg
        app-arch/lz4
        dev-python/msgpack[${PYTHON_USEDEP}]
        !libressl? ( dev-libs/openssl:0= )

diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild 
b/app-backup/borgbackup/borgbackup-9999.ebuild
index 373e984..c6825d5 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -23,7 +23,9 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="libressl +fuse"
 
+# Unformately we have a file conflict with app-office/borg, bug #580402
 RDEPEND="
+       !!app-office/borg
        app-arch/lz4
        dev-python/msgpack[${PYTHON_USEDEP}]
        !libressl? ( dev-libs/openssl:0= )