gentoo resync : 02.08.2019

3 files changed, 8 insertions, 4 deletions

diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index e4201db2eae7..8c724945e34f 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -207,6 +207,6 @@ DIST xml-rs-0.7.0.crate 50980 BLAKE2B 3d0427660327002248823c8b565f83214035d5b582
 DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
 DIST yaml-rust-0.4.2.crate 45338 BLAKE2B 2e4f0b488ecbe227dbe83588ebac80686df5b9cff7133a9dc0de0e26f08a39c280a85eaed00e147dcd4e3ea9c3a4e8a7903380150db635a4c481957c8cad9689 SHA512 b1b9e1f9e683a1ec194231e7871418019c6d29ae0424b4b2a423c62a1a4d2ef14f8f3f396513747da91f1f20851ffe3ad69d14db6a75b6e892dc778762cdd423
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
-EBUILD bat-0.10.0.ebuild 2932 BLAKE2B 85324f3dde034a27445cb3b59622d3c462bf320befdd1fe549b9e2be736e9a200899a124a90541382e84508b76d53613e149c6e1ef0029629cfe7c175cb6bd50 SHA512 d10f6d309b6b08dc0c9b378c615cd1855b89c42bc6b50ce4dfd4f174b3ad93ff0bd03b34fb0a33894a6ca8b98a95408be87ce121ea1d65c354bfd73b66020684
-EBUILD bat-0.11.0.ebuild 3178 BLAKE2B 896f020a76eefc516f74a191a6882efe59ee63170b01a3a1a7dd4bc39ef4a92a187533179cdfcf0bc934f6604ed0cf1ecf6db12289090fa3581d73d48dd370b4 SHA512 6149b354f1f8a2ac195d7516caefe20f0baf98b8de6eed43373a1c5bfe7e48567ac6225bf6a934a96dd8876c04654d3b12fdfb203e8c6ef4fce3ad05c0499366
+EBUILD bat-0.10.0-r1.ebuild 3021 BLAKE2B d7c254914446974d3c993954c5a4a138202bf95a00e9a54c115521cda7f373109925e8905918581f969285a69055863ec2286c326cc4c6852befe6a1189e9645 SHA512 a4f0b5e55ecad3ab78c838d0b6ddb144bf9d942c22da5cba7a610cefb18ea8791f83f9c2dc52dd3e2809f393b13f795c4b9b0ed4ceb5224fb037fbcb944549a3
+EBUILD bat-0.11.0-r1.ebuild 3267 BLAKE2B bf9cfb2f5f77b8f77d89f4d6e97934978998a8909d2172bd7e8e767cd42910ee2948622c2d5181104e316f18fe44a3b0eb972d48e9bc227c08981e94ae2e72e3 SHA512 cf5c758ad12ba5c4502963ed71bb36a4461f60a90c662ade5708ea1f26c3a67b5c9df9f7dc4b81dcdf68ef4cf92a7c5f71cee0b819a6c88c59b402f2dbc4173a
 MISC metadata.xml 709 BLAKE2B 5d8265e6f27b8b650024dd6298773ef8b3afaa63b5f210467bff6b35df4b14112fc5b144d73d5074e97d47200c4cc03d6048359f9df4110a18a75d841083c6bd SHA512 779c6d9b6cc09f8f6d06bc256f83aff716ac4638d0ee0be84420b6ea52bb6fae7bec0dd4e672cacbec4d27a537c27c1dcd6d6a49c44be0670c45dc75ca97c0b3
diff --git a/sys-apps/bat/bat-0.10.0.ebuild b/sys-apps/bat/bat-0.10.0-r1.ebuild
index 7f741c651a57..f684739f23db 100644
--- a/sys-apps/bat/bat-0.10.0.ebuild
+++ b/sys-apps/bat/bat-0.10.0-r1.ebuild
@@ -152,8 +152,10 @@ LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
 DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]"
 BDEPEND=">=virtual/rust-1.30.0"
 
 QA_FLAGS_IGNORED="/usr/bin/bat"
diff --git a/sys-apps/bat/bat-0.11.0.ebuild b/sys-apps/bat/bat-0.11.0-r1.ebuild
index 8bab8e0da831..14807bd2a14d 100644
--- a/sys-apps/bat/bat-0.11.0.ebuild
+++ b/sys-apps/bat/bat-0.11.0-r1.ebuild
@@ -160,8 +160,10 @@ LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
 DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]"
 BDEPEND=">=virtual/rust-1.31.0"
 
 DOCS=( README.md doc/alternatives.md )