gentoo resync : 04.05.2019

3 files changed, 5 insertions, 3 deletions

diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index 064f1b3dd89a..b9fb57a49223 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,5 +1,5 @@
 DIST hiera-eyaml-2.1.0.tar.gz 46179 BLAKE2B a25eaf1e013af4add5c4628dab168daedfeb8763038f4e003d5e48b5e51ddc25dbbb8b01d024836163089106d0786d27af43113b3db950ecb302c3ec5a82d7a8 SHA512 b85de0de0cb4f4a7b381ec7e406e5b3858b1e93b5475830df6991fc679d1391a88dd988c0d266942e70fb4705ba47cb656fd732bd923f8290dd90a5bf6e4a5fb
 DIST hiera-eyaml-3.0.0.tar.gz 54416 BLAKE2B 75587799b228562ae89ab4e46fdd5d4a256f66403df0a2c0761aadec17fb3fa95c1207aee5a4663bcbd843c7d6e0594ce2c0edf6973184b64522a987d628b549 SHA512 805496478d0fe142ea1661345d92e5ad2ad4c18c98bb83c8f799031b784a997e1aee2a11b46600a8ddbe0b147072ea0f83fbfa100df5b5fc534d7489850d9827
-EBUILD hiera-eyaml-2.1.0-r2.ebuild 1372 BLAKE2B 04c73936eb1d5b6d98182b2986271e3db831f204ad05bf9897c7b860a492e008dd99c41fdf1abc484f77661dfcae8e52350f9dea9a38dc54f9bee73537cfd154 SHA512 9d4fab22bf88de3cf55e6eaa5287be9385a694b5c28f4fece4eace00ff1524f39df783ac40d2a8651623690e81b1734569488ae1380993305b0a188eb2066c8f
-EBUILD hiera-eyaml-3.0.0.ebuild 1380 BLAKE2B 30460b1346489b3d38ee1b7dc8e6c1c41b892a651ac7646869b8b27bb13d54c82b50c1b2ea45f1609086c3e1a4fe4e0a62adb060ae61d9a8284e67b3207c6f58 SHA512 b31977ac77d63bde2d02acb59d64ef867dc5662aed827412cb12080e927bc7f72338f4cc4eb1916c1bce3d9a84fc3f4fa385d38bcb833ee3e75add09825b47b1
+EBUILD hiera-eyaml-2.1.0-r2.ebuild 1457 BLAKE2B 6eee18cdb6a74d1db0b18269ccc5f6998333674a06d24e06a27eb7e72db0f67e9b500da968f026a3be0b88a4f719eab36c26f4f2798859d973efbf6c27d36bb9 SHA512 461cc064a371a6235c73832d3c5ea003e503529df18b037ac0232651585cdf4a638fb85e3ee6edc0a4cbce076b29685b62a897ddd0f63297f987951a3b21c05e
+EBUILD hiera-eyaml-3.0.0.ebuild 1465 BLAKE2B fceb438e7a8dc44ba79a6b6cde7f764367f01f1299b9ba68cba5f0f6019368507af6e8dc03cca429753d9f0c3e562a38c4028b294a54d278aafbb9990cdc1c37 SHA512 f794604dad174d04335853f12913daf6f642b1db244a1cd645d712c44dd0d1d04adcdf82162d87cec118452423e30dc1bcb5a8f1f6a6a65bf122bf222777d8d6
 MISC metadata.xml 474 BLAKE2B d527c2a402f1ccb95a35c7a75baa9f71710dee53d9f37e424f28827182fe5500cdddb7af8297be14fab4805ac430d92efcc564419940065bcb0bedd3b7252b84 SHA512 af80beefd80dfb83c5c95f9d1707cda077ef7323004785e420ba56f6a4ccf42181247adaec2d023857d410ed003b82919a72af2a5e024c9d76a0ee696009361e
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..ff6b41f65d1a 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/hiera-eyaml:3" # 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..0ac125d70878 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/hiera-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 )"