gentoo resync : 16.09.2020

4 files changed, 3 insertions, 103 deletions

diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index bdbd363e414f..6390f73bd485 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,7 +1,3 @@
-DIST hiera-eyaml-3.0.0.tar.gz 54416 BLAKE2B 75587799b228562ae89ab4e46fdd5d4a256f66403df0a2c0761aadec17fb3fa95c1207aee5a4663bcbd843c7d6e0594ce2c0edf6973184b64522a987d628b549 SHA512 805496478d0fe142ea1661345d92e5ad2ad4c18c98bb83c8f799031b784a997e1aee2a11b46600a8ddbe0b147072ea0f83fbfa100df5b5fc534d7489850d9827
-DIST hiera-eyaml-3.1.0.tar.gz 55857 BLAKE2B 6038798c86f6c7cfb56ed2519961bcdb7937d16e0376ba426c5ae4a892cef9863e6728368af8da31359abc956d78ab38d379bca5ba8cbf567c2c812ee33929fe SHA512 970aa0dd696acd77062ac5c289c9ac0e5992c58acc4df379500978904e58a2054801fa7c36fa3b156dd1b635ef19522cc9886bd91c83e8fda6d00058b18ab9d9
 DIST hiera-eyaml-3.1.1.tar.gz 54848 BLAKE2B 8daa4925bf1fb945ddb5ce7a485c3bf2bfca8747eb0cf00530eb91307d18d3f5c73699a30631b80e7825baac3a8b0c1695bd0313906bc8c7aba9c3c00d69b9cc SHA512 3bc93ca31af96383401f28644490f5540a70cf719e47d340794daf6c8bcc7fe9800d1d1e6ba99aba344831966f8d15f1a1fd9d1522696457f0bdec79dd45a108
-EBUILD hiera-eyaml-3.0.0.ebuild 1472 BLAKE2B feb37e3e260d1a098364ea4596a825623c4e49dbfdbe31cf6b36a6c687091b90ee99c1120cdf44f7a4be1f56837f0e35a890952a81f82524e2ee0751474a05c1 SHA512 da48467b2f7f62d9f02078bba34f980547202ed15928b3dcbb2d068375b90c7b4082474fe60326cc6967a071441d068e2960b08663c74cf50699ca2dc56bfda8
-EBUILD hiera-eyaml-3.1.0.ebuild 1465 BLAKE2B 198e538b6871fdf5d92520acc8d4061a3acd3b125d3e2e4f35c94766025347171e783e41cda1436950528133394a6d114a68a419c2af8bc222fd779276010d31 SHA512 cc4240fdd6e155d873bf420789999f713a9246f5fdbda93ebc52155a02158533cc60f20cae4b18a95500c74b1504ca7b12e273f093fe508532dced795de481c0
-EBUILD hiera-eyaml-3.1.1.ebuild 1465 BLAKE2B 198e538b6871fdf5d92520acc8d4061a3acd3b125d3e2e4f35c94766025347171e783e41cda1436950528133394a6d114a68a419c2af8bc222fd779276010d31 SHA512 cc4240fdd6e155d873bf420789999f713a9246f5fdbda93ebc52155a02158533cc60f20cae4b18a95500c74b1504ca7b12e273f093fe508532dced795de481c0
+EBUILD hiera-eyaml-3.1.1.ebuild 1465 BLAKE2B 5dd4ccf526c16d9ff861dcb7fb01b773284c4b8d6ae941a5ee0f9279bf2f1ea6188e5bcc4944a942960e76e73b77348c02fc77f55f3f1ad264298518622bc7eb SHA512 fe8673a634ae9c93a63960a0d836cc6b70d36f8f2a93c5fc3f1c7a5c588a139b295a19139e6153369a67a583250f5bb837546ea9571b2f8f6ee689a271d3ccdb
 MISC metadata.xml 474 BLAKE2B d527c2a402f1ccb95a35c7a75baa9f71710dee53d9f37e424f28827182fe5500cdddb7af8297be14fab4805ac430d92efcc564419940065bcb0bedd3b7252b84 SHA512 af80beefd80dfb83c5c95f9d1707cda077ef7323004785e420ba56f6a4ccf42181247adaec2d023857d410ed003b82919a72af2a5e024c9d76a0ee696009361e
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
deleted file mode 100644
index 744e6a1d5e21..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-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 )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.0.ebuild
deleted file mode 100644
index 863a4be4abb3..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-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 )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
index 863a4be4abb3..29e79172ccd4 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"