commit: 50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Tue Apr 30 18:06:37 2019 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Tue Apr 30 18:06:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f7f7c5
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 <AT> gentoo.org> dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild | 3 ++- dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 cb3f8af09f7..07787f48cf8 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 22b09b8ad76..7bb51f87551 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 )"
