gentoo resync : 22.05.2021

4 files changed, 6 insertions, 71 deletions

diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index 3887d29ecea1..eb6eba67e770 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,9 +1,5 @@
-DIST docile-1.3.2.tar.gz 14684 BLAKE2B f24ce3ae857d249ce2fc32bcefa505b272327962755e000e51dd13531ad81a039c1da0e97774752cc03444fc3f44fa12212bbe61ff7886ebf5d44076785db3df SHA512 6bba8e8855e43acc3ad314ca500896b861865e4470618f98e720a11a26e226e30d8748096638027e213eeb54838fd1c3b2c9749701476d26cf8bc55c82c4f3ce
-DIST docile-1.3.3.tar.gz 15752 BLAKE2B 290af9553aba4b8b6ab058a1b1dbc4a36e840b3dc11e97db08408230679ab1095a5f6c03b133d9c02d2c1c9be75cf4d5cfa525bf5bd3c0705993df975ef152f3 SHA512 64e4f45616135f2089ecdb7282b7d1bed61cc5a1c8fa37e5ea70d8141d364760c62e06c650359d9cc107088fcfe4837d6bf35b492bd81c0207b037aa67d1d114
-DIST docile-1.3.4.tar.gz 15726 BLAKE2B 93f37266dc7fe80f8d3863ac7c5293dbd0432a5917f4ab134a1ceea4bdfb40a6af2e045db0b690fa3ef2590f2c781ea003ca482521e271e21ee50aa95aa9a30c SHA512 4e191f0cc374a429a1bb3297c1baf1d337918a475c783a12ac4e4c5de8cc941d440c85d31f2d226736c9fe88c52698b54bd9897be9b497e96eaceef73a6f0f56
 DIST docile-1.3.5.tar.gz 16345 BLAKE2B c06fe60bc6e0fc0dec699271fcdc0b23febeba939aab513a23d5065d33bc7ce5d1cd6391d7b05a5f163c4420c199e12c97a79855d03fb252b61661c2532ac879 SHA512 be193eff58b73e0367a109d459e28097d04e0486b152b084f2fd6bcc795aedbaa12c13dae6d845ec4ef3d52335563ce2b22d5424d689e8b93ff9adf7dbe7b0e9
-EBUILD docile-1.3.2.ebuild 776 BLAKE2B d1166b8e13c3f3c9216b60d767453c11c95201f8ed4b3c55a16060de9e8790430ad273c8fb818c2df8bc9ff9d64dce909a71ac50b33bc4c443702ad8ccf3d4e3 SHA512 7cfc0fc2d24ca5d037c525c28f0e1f7c7253fec41b95309e9fc7198dac323c51b64ae3c1e428f0a5d6d76c88fe4cb860c48f559419552fa5dc1b970d8c50c3f3
-EBUILD docile-1.3.3.ebuild 738 BLAKE2B c9d5f42d5c1f38f15ef7f7193eb11da1524a8fc77749dbbaa8ae9569d9f67e1d7b1807bc240091c1a2e583097f812e3f74536ec796a8811b1e0d49aac412d328 SHA512 eefa4c0445f9e3fd3c338b2e79ec7bbbffb7211cabcf773a834dea2dc02b084dd783f7dac8271864f0e458ee88feec5d5a97c41c794935389f602f133fff1f42
-EBUILD docile-1.3.4.ebuild 738 BLAKE2B c9d5f42d5c1f38f15ef7f7193eb11da1524a8fc77749dbbaa8ae9569d9f67e1d7b1807bc240091c1a2e583097f812e3f74536ec796a8811b1e0d49aac412d328 SHA512 eefa4c0445f9e3fd3c338b2e79ec7bbbffb7211cabcf773a834dea2dc02b084dd783f7dac8271864f0e458ee88feec5d5a97c41c794935389f602f133fff1f42
+DIST docile-1.4.0.tar.gz 16932 BLAKE2B 7e2472a64bcf27899d537444f77cb1fce587400d04c64abe17e2c39b1a50af027941f6ae72d6423817dc7ddfed8e15aa113cc4d32c30b97f166ff37fb7663000 SHA512 78350144a9b0d84d6025770d05b1e9999f34ce431691c08e73232f8b10537bc265f9f06409ff6feabf2e6f20d018dbb83aaf8c0f66e7dcec3e195475820481cd
 EBUILD docile-1.3.5.ebuild 738 BLAKE2B 28f6e9b21c3acba40b0df45b55c93cad359a0e3c29996ff2603b98d6bc6d328e04531ea3f9ed908d6e8d8cce0e1a11cf902809eccc2c03389e6b3da58fa0ab7c SHA512 924a37471398fe680f09502245bbb56bc7695c07b19555f44736ffe791e2f31d5ab5532f455df56a4cfbc604689962aa076b571f1970a1cd2f8331843d4567c6
+EBUILD docile-1.4.0.ebuild 772 BLAKE2B 4f742fda939433b54187ece343325956079c6ce3b3e508293c88697ae20c3ef7359b551919f5566cb422a3e993399f9ad52298957f4d88358bb92e4a2892b035 SHA512 b20f06f0bf632e0eeca23351f8fd1c238b59252c1ae4a8267363e2696b5f628f008fd88b508e2015621f8a8c22771dba653d1e8743086ec42a916545d9da854d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/docile/docile-1.3.2.ebuild b/dev-ruby/docile/docile-1.3.2.ebuild
deleted file mode 100644
index 2adf8d06e6ad..000000000000
--- a/dev-ruby/docile/docile-1.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Turns any Ruby object into a DSL"
-HOMEPAGE="https://ms-ati.github.io/docile/"
-SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
-	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/docile/docile-1.3.4.ebuild b/dev-ruby/docile/docile-1.3.4.ebuild
deleted file mode 100644
index 41f1cd91fffe..000000000000
--- a/dev-ruby/docile/docile-1.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Turns any Ruby object into a DSL"
-HOMEPAGE="https://ms-ati.github.io/docile/"
-SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
-	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/docile/docile-1.3.3.ebuild b/dev-ruby/docile/docile-1.4.0.ebuild
index 41f1cd91fffe..4cf790013b83 100644
--- a/dev-ruby/docile/docile-1.3.3.ebuild
+++ b/dev-ruby/docile/docile-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -24,7 +24,7 @@ IUSE=""
 
 all_ruby_prepare() {
 	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
-	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/,/unshift/ s:^:#:' spec/spec_helper.rb || die
 
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's:_relative ": "./:' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }