gentoo resync : 21.06.2020

3 files changed, 3 insertions, 45 deletions

diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 1a271add399a..363251e2264b 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,7 +1,5 @@
 DIST mustache-1.0.5.gem 41984 BLAKE2B c063af6c9464884114b55c30df6c6cb2685b0394aa9280f006b6c35cd0681c8776edddccd1a33de75e291a2e1992477c1d70f6cb1c603e800b08be5b989a9ca0 SHA512 d9b2c55d758bd4e317732307b513e2a079b04ec7a1203233834fd08a3a32f7b1bf8283d207af2f7082a8c4847f9c5955a557f19bad9b08a1dee2f32417eca190
-DIST mustache-1.1.0.gem 42496 BLAKE2B f2bef262238a6e335decf2295d1d55c7865d9e2181f7772d2359bde99441536c4f1b44a103f2ee9be8e6933027ea0241f7027410d9a506732ac8affe9a72ea22 SHA512 5e8daa7cfb6151e86e5d2223a026538194e03331bcd74f15704404795eb8c6c28899f29fa9fe421fe38e026b38ad734fe5574d2a6d4aa1e53ed5a566a8061c61
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
 EBUILD mustache-1.0.5.ebuild 880 BLAKE2B 3900c31778270f31adf59785138725ba225c2d04af90abf8ccebb4019789c38010e3baee9afd1b4ebbe24162846c2e7423de81272f1f85bb82208afac524a923 SHA512 87ac6cafca9586f7966b4b5a57d39a1edd1ce40d6b5bce04ef0be3c877858673331cfc7e4990f844b5671fb0cba999428050f0a7a4827c0948dd95aa30a6f741
-EBUILD mustache-1.1.0.ebuild 912 BLAKE2B 51a86fd07d3d38888552dad22d1bb81c73d76d885478bdf295c8b4fe6a7939acd323925013b33c364d9c0a23f35eb1e99bc46b5de6e3eda5e6caf08539cb2722 SHA512 6a5b1df1cff97b70d9496ae79739b1612409a7f8f2f025e184e77c0b80a28442322f01c2b1a86f4380f0da212dc60b4fbe2b0cc6b321af465ee4cd04c0bcbba3
-EBUILD mustache-1.1.1.ebuild 905 BLAKE2B a67dfb3a560aaa405daf7d7246d3c7f1761835655168ad49eb9d56c75f5ffc4a0b1277550760d44393d52408166b67e627d717379cb5a0898f8b9fd59dc6843a SHA512 cc76d3ce16a52c7043ffb02e59054bf7c932b0e7c6435531ded356c6f0b0be2bf875ff2328c8eee8512d88ec4c397a9b65730e66ac5aaec525853cc6b5fe9a28
+EBUILD mustache-1.1.1.ebuild 904 BLAKE2B ddbf4e025e270bb6087027eaf26d807aa8cda065e1b2d1a8be6f1865be99ef0ba819f6e098142dca50c4cc60f7b6644de4aa560618dfb465a8f278fbca951a11 SHA512 a09f0085ea8d3ed714b276ed61690199523ac1200ca9e20c3cc85a73bd71f6ddd030c1738128f0f86a11e48803fc7d44767100740d4d55afb4283f0150654195
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/mustache-1.1.0.ebuild b/dev-ruby/mustache/mustache-1.1.0.ebuild
deleted file mode 100644
index 6bb46ff0d870..000000000000
--- a/dev-ruby/mustache/mustache-1.1.0.ebuild
+++ /dev/null
@@ -1,40 +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_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="man:build"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
-HOMEPAGE="https://mustache.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-all_ruby_prepare() {
-	# Fix for renamed .ron files
-	sed -i -e 's:\.ronn:.ron:' Rakefile || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/mustache.1 man/mustache.5
-}
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1.ebuild
index f40ad2f9a93d..5e9c7ef9faba 100644
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"