From: Anthony G. Basile <blueness@gentoo.org>
Date: Mon, 18 Apr 2016 15:17:00 +0000 (-0400)
Subject: app-backup/borgbackup: fix file conflict with app-office/borg, bug #580402
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1de87698ffc1895ac812b7718bc64e1fdd090192;p=gentoo.git

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

Package-Manager: portage-2.2.26
---

diff --git a/app-backup/borgbackup/borgbackup-1.0.1.ebuild b/app-backup/borgbackup/borgbackup-1.0.1.ebuild
index 373e9849ee5f..c6825d599263 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 373e9849ee5f..c6825d599263 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= )