From 1de87698ffc1895ac812b7718bc64e1fdd090192 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Mon, 18 Apr 2016 11:17:00 -0400 Subject: [PATCH] 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 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= ) -- 2.26.2