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

…80402 Package-Manager: portage-2.2.26
johu · Apr 18, 2016 · 1de8769 · 1de8769
1 parent e0517bf
commit 1de8769
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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= )