public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/borgbackup/
Date: Mon, 18 Apr 2016 15:17:33 +0000 (UTC)	[thread overview]
Message-ID: <1460992651.1de87698ffc1895ac812b7718bc64e1fdd090192.blueness@gentoo> (raw)

commit:     1de87698ffc1895ac812b7718bc64e1fdd090192
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 15:17:00 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 15:17:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de87698

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 373e984..c6825d5 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 373e984..c6825d5 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= )


             reply	other threads:[~2016-04-18 15:17 UTC|newest]

Thread overview: 132+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-18 15:17 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-12 13:05 [gentoo-commits] repo/gentoo:master commit in: app-backup/borgbackup/ Petr Vaněk
2024-09-10 10:25 Arthur Zamarin
2024-09-09 21:08 Sam James
2024-09-09 21:08 Sam James
2024-08-08  9:23 Petr Vaněk
2024-08-08  9:23 Petr Vaněk
2024-07-03 13:55 Petr Vaněk
2024-07-03 13:55 Petr Vaněk
2024-07-03 13:55 Petr Vaněk
2024-04-19 11:51 Marek Szuba
2024-04-19 11:43 Sam James
2024-04-19 11:01 Sam James
2024-04-19 11:01 Sam James
2024-04-02 16:11 Marek Szuba
2024-02-10  3:28 Sam James
2024-01-18 19:08 Marek Szuba
2024-01-18 17:25 Sam James
2024-01-18 17:25 Sam James
2023-12-08 23:10 Marek Szuba
2023-09-04  8:21 Marek Szuba
2023-09-03 16:39 Sam James
2023-09-03 16:39 Sam James
2023-09-03 13:54 Marek Szuba
2023-08-21 15:49 Marek Szuba
2023-08-21 14:56 Marek Szuba
2023-07-23 19:28 Arthur Zamarin
2023-07-23 19:28 Arthur Zamarin
2023-05-15  8:41 Piotr Karbowski
2023-05-14 14:51 Piotr Karbowski
2023-05-07 18:39 Piotr Karbowski
2023-05-02 15:21 Arthur Zamarin
2023-05-02 15:21 Arthur Zamarin
2023-03-29 20:51 Piotr Karbowski
2023-03-29 20:51 Piotr Karbowski
2023-03-16 18:52 Michał Górny
2023-03-06 12:51 Arthur Zamarin
2023-03-06 12:51 Arthur Zamarin
2023-02-16 17:13 Michał Górny
2023-01-07 19:59 Piotr Karbowski
2022-12-09 22:02 Sam James
2022-12-09 22:02 Sam James
2022-10-24 20:46 Piotr Karbowski
2022-08-24 12:28 Anthony G. Basile
2022-08-16 15:07 Sam James
2022-08-16 15:07 Sam James
2022-06-22 13:44 Piotr Karbowski
2022-06-22 11:50 Michał Górny
2022-06-19 14:33 Piotr Karbowski
2022-06-08 14:38 Anthony G. Basile
2022-06-08 14:18 Anthony G. Basile
2022-02-28  0:01 Piotr Karbowski
2021-10-12 18:57 Sam James
2021-10-12 18:57 Sam James
2021-08-17 11:11 Anthony G. Basile
2021-07-20 16:36 Marek Szuba
2021-07-13 18:52 Piotr Karbowski
2021-04-30 17:32 Mikle Kolyada
2021-03-31 21:57 Sam James
2021-03-28 12:56 Piotr Karbowski
2021-02-21 19:50 Sam James
2021-02-04 14:42 Agostino Sarubbo
2021-02-04 14:09 Sam James
2021-01-26  2:04 Sam James
2021-01-05 20:51 Sam James
2020-12-27 23:00 Sam James
2020-12-27 22:49 Piotr Karbowski
2020-10-10 14:47 Anthony G. Basile
2020-08-17  7:01 Agostino Sarubbo
2020-06-15 18:06 Sergei Trofimovich
2020-06-14 14:34 Anthony G. Basile
2020-06-14 14:31 Anthony G. Basile
2020-06-07  8:26 Piotr Karbowski
2020-06-07  8:26 Piotr Karbowski
2020-04-23 18:51 Anthony G. Basile
2020-04-16 13:48 Agostino Sarubbo
2020-04-15 21:43 Piotr Karbowski
2020-03-29 15:25 Anthony G. Basile
2020-03-11  1:50 Anthony G. Basile
2019-12-05 19:00 Piotr Karbowski
2019-12-05 19:00 Piotr Karbowski
2019-11-12 10:45 Agostino Sarubbo
2019-08-25 16:35 Piotr Karbowski
2019-08-25 16:35 Piotr Karbowski
2019-07-08 12:10 Thomas Deutschmann
2019-07-08 11:05 Agostino Sarubbo
2019-06-15 17:24 Piotr Karbowski
2019-06-15 17:24 Piotr Karbowski
2019-05-21  1:13 Anthony G. Basile
2019-04-14 16:19 Piotr Karbowski
2019-04-13 11:27 Patrick Lauer
2019-02-12 23:35 Anthony G. Basile
2019-02-12 23:35 Anthony G. Basile
2019-02-12  1:17 Anthony G. Basile
2019-02-12  0:56 Anthony G. Basile
2018-12-10 16:37 Anthony G. Basile
2018-08-12 11:59 Anthony G. Basile
2018-08-12 11:59 Anthony G. Basile
2018-07-09 14:50 Mikle Kolyada
2018-07-05  0:42 Thomas Deutschmann
2018-06-14 18:18 Anthony G. Basile
2018-04-02 21:52 Anthony G. Basile
2018-03-09 21:45 Matt Thode
2018-03-09 17:59 Matt Thode
2017-12-31  9:46 Anthony G. Basile
2017-11-30 20:07 Anthony G. Basile
2017-11-30 20:07 Anthony G. Basile
2017-11-28 14:44 Anthony G. Basile
2017-11-06  9:16 Anthony G. Basile
2017-11-06  9:16 Anthony G. Basile
2017-11-06  9:16 Anthony G. Basile
2017-10-25 14:56 Anthony G. Basile
2017-10-09 12:16 Anthony G. Basile
2017-07-30  9:48 David Seifert
2017-07-21 11:28 Anthony G. Basile
2017-05-16 14:17 Manuel Rüger
2017-02-15 14:42 Anthony G. Basile
2017-02-15 14:41 Anthony G. Basile
2017-01-30 13:09 Agostino Sarubbo
2016-12-20 19:16 Tobias Klausmann
2016-12-20  7:51 Anthony G. Basile
2016-10-30 19:15 Anthony G. Basile
2016-10-09  7:47 Pacho Ramos
2016-08-25 18:34 Anthony G. Basile
2016-07-13 15:17 Anthony G. Basile
2016-07-13 15:17 Anthony G. Basile
2016-05-21 11:14 Anthony G. Basile
2016-04-21 10:12 Anthony G. Basile
2016-04-18 15:17 Anthony G. Basile
2016-04-10  1:40 Anthony G. Basile
2016-03-21 23:21 Anthony G. Basile
2016-03-20 21:52 Anthony G. Basile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460992651.1de87698ffc1895ac812b7718bc64e1fdd090192.blueness@gentoo \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox