| 1 |
commit: 50f7f7c58aaf64bcd4bf5fc4e7825c6a5a2c2418 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 30 18:06:37 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 30 18:06:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f7f7c5 |
| 7 |
|
| 8 |
dev-ruby/hiera-eyaml: slots are mutually exclusive due to file conflict |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild | 3 ++- |
| 14 |
dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild | 1 + |
| 15 |
2 files changed, 3 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index cb3f8af09f7..07787f48cf8 100644 |
| 19 |
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild |
| 20 |
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r2.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2018 Gentoo Authors |
| 23 |
+# Copyright 1999-2019 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -22,6 +22,7 @@ IUSE="test" |
| 28 |
|
| 29 |
ruby_add_rdepend ">=dev-ruby/highline-1.6.19" |
| 30 |
ruby_add_rdepend "dev-ruby/trollop:2" |
| 31 |
+ruby_add_rdepend "!!dev-ruby/heira-eyaml:2" # both install the /usr/bin/eyaml binary |
| 32 |
|
| 33 |
ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-5 dev-ruby/hiera-eyaml-plaintext )" |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild |
| 37 |
index 22b09b8ad76..7bb51f87551 100644 |
| 38 |
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild |
| 39 |
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild |
| 40 |
@@ -22,6 +22,7 @@ IUSE="test" |
| 41 |
|
| 42 |
ruby_add_rdepend ">=dev-ruby/highline-1.6.19:*" |
| 43 |
ruby_add_rdepend "dev-ruby/optimist" |
| 44 |
+ruby_add_rdepend "!!dev-ruby/heira-eyaml:0" # both install the /usr/bin/eyaml binary |
| 45 |
|
| 46 |
ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-6 dev-ruby/hiera-eyaml-plaintext )" |
Archives