From: Robin H. Johnson <robbat2@gentoo.org>
Date: Tue, 30 Apr 2019 18:06:37 +0000 (-0700)
Subject: dev-ruby/hiera-eyaml: slots are mutually exclusive due to file conflict
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418;p=gentoo.git

dev-ruby/hiera-eyaml: slots are mutually exclusive due to file conflict

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---

diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild
index cb3f8af09f7a..07787f48cf80 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/highline-1.6.19"
 ruby_add_rdepend "dev-ruby/trollop:2"
+ruby_add_rdepend "!!dev-ruby/heira-eyaml:2" # both install the /usr/bin/eyaml binary
 
 ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-5 dev-ruby/hiera-eyaml-plaintext )"
 
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
index 22b09b8ad766..7bb51f87551c 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
@@ -22,6 +22,7 @@ IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/highline-1.6.19:*"
 ruby_add_rdepend "dev-ruby/optimist"
+ruby_add_rdepend "!!dev-ruby/heira-eyaml:0" # both install the /usr/bin/eyaml binary
 
 ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-6 dev-ruby/hiera-eyaml-plaintext )"