diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2019-04-30 11:06:37 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2019-04-30 11:06:46 -0700 |
| commit | 50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418 (patch) | |
| tree | 5ab220b55377261938f264e3528f75b60d416675 /dev-ruby | |
| parent | dev-libs/wlc: adding self as a maintainer (diff) | |
| download | gentoo-50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418.tar.gz gentoo-50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418.tar.bz2 gentoo-50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418.zip | |
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>
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild | 3 | ||||
| -rw-r--r-- | dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild | 1 |
2 files changed, 3 insertions, 1 deletions
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 )" |