summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-04-18 11:17:00 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-04-18 11:17:31 -0400
commit1de87698ffc1895ac812b7718bc64e1fdd090192 (patch)
tree4b2677236a7903e0221324623da5a8980f52f5cc /app-backup
parentapp-backup/borgbackup: remove older version (diff)
downloadgentoo-1de87698ffc1895ac812b7718bc64e1fdd090192.tar.gz
gentoo-1de87698ffc1895ac812b7718bc64e1fdd090192.tar.bz2
gentoo-1de87698ffc1895ac812b7718bc64e1fdd090192.zip
app-backup/borgbackup: fix file conflict with app-office/borg, bug #580402
Package-Manager: portage-2.2.26
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/borgbackup/borgbackup-1.0.1.ebuild2
-rw-r--r--app-backup/borgbackup/borgbackup-9999.ebuild2
2 files changed, 4 insertions, 0 deletions
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= )