gentoo resync : 28.04.2018

3 files changed, 3 insertions, 37 deletions

diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index c3b83ded76d2..ea876f6d3fe7 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,3 @@
-DIST sinatra-1.4.7.gem 369664 BLAKE2B 6b397a440c0ba2016127c38534fc3dde2198d286b2627b8333024d6df10c2a0c28ae0c8b49ead224f0b473699d331fa8993ecaa022b372bb2710e33c4ee9b3db SHA512 f13531390af95e0bb42f7c5cc350e3aee7136c1bb81b487ef71cc194ed6675722a1c23ff6b65ac0e3b2c1a0986bfa733c4a0f24cf9bbe0168a18cd4d18d8a13a
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
-EBUILD sinatra-1.4.7.ebuild 1150 BLAKE2B 06a69ab2376366675bb8fc69ff244e4873de29b1cab05e9e423b7776beebea74164d263f7e0d5b22ad9fa9cbf3597eed73cde8afe43e024e2dbb6153501a94e8 SHA512 bae583355cf7b1912ec15fa6fcc93b3e47abfe6a7ef9acffbc1461ac27d74b11a1ad748e6fe9b0851e54ac7b229a1c6dcf4ff04127b1f16de0829c367197e44f
-EBUILD sinatra-1.4.8.ebuild 1277 BLAKE2B ea105651157a50c9281b50c0b8684de23eb3f189b1013993e5354afe2050143bd506ac520743563f040d6d45ff5270772643ff4252f5aa6cbfd1380a86a5d2f8 SHA512 c68a5f96ea66382818bd56e76dec6bdb54b3625eeedbc76527f3cd201daf5ee180dc2c6bd03f5b9ded3c1fd8361aaa6268a58bdc06bc5955c3e7dc8932f70430
+EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-1.4.7.ebuild b/dev-ruby/sinatra/sinatra-1.4.7.ebuild
deleted file mode 100644
index 0ac0235cb305..000000000000
--- a/dev-ruby/sinatra/sinatra-1.4.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/rack-1*:* >=dev-ruby/rack-1.5:*
-	>=dev-ruby/rack-protection-1.4:1
-	>=dev-ruby/tilt-1.3.4:* <dev-ruby/tilt-3:*"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
-
-# haml tests are optional and not yet marked for ruby20.
-#USE_RUBY="ruby20" ruby_add_bdepend "test? ( >=dev-ruby/haml-3.0 )"
-
-all_ruby_prepare() {
-	# Remove implicit build dependency on git.
-	sed -i -e '/\(s.files\|s.test_files\|s.extra_rdoc_files\)/d' sinatra.gemspec || die
-}
diff --git a/dev-ruby/sinatra/sinatra-1.4.8.ebuild b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
index 6a6b7c996db7..0d815fc809b6 100644
--- a/dev-ruby/sinatra/sinatra-1.4.8.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
 
 RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"