projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e0517bf)
app-backup/borgbackup: fix file conflict with app-office/borg, bug #580402
authorAnthony G. Basile <blueness@gentoo.org>
Mon, 18 Apr 2016 15:17:00 +0000 (11:17 -0400)
committerAnthony G. Basile <blueness@gentoo.org>
Mon, 18 Apr 2016 15:17:31 +0000 (11:17 -0400)
Package-Manager: portage-2.2.26

app-backup/borgbackup/borgbackup-1.0.1.ebuild patch | blob | history
app-backup/borgbackup/borgbackup-9999.ebuild patch | blob | history

diff --git a/app-backup/borgbackup/borgbackup-1.0.1.ebuild b/app-backup/borgbackup/borgbackup-1.0.1.ebuild
index 373e9849ee5f9be9cc2ecbe57462403763bbfcb2..c6825d599263892eb1b1a15233e460c392b519e9 100644 (file)
--- 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 373e9849ee5f9be9cc2ecbe57462403763bbfcb2..c6825d599263892eb1b1a15233e460c392b519e9 100644 (file)
--- 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= )
Unnamed repository; edit this file 'description' to name the repository.