gentoo resync : 13.06.2020

3 files changed, 4 insertions, 43 deletions

diff --git a/dev-ruby/sassc-rails/Manifest b/dev-ruby/sassc-rails/Manifest
index 6b7380ad5ee0..6f667490363d 100644
--- a/dev-ruby/sassc-rails/Manifest
+++ b/dev-ruby/sassc-rails/Manifest
@@ -1,4 +1,3 @@
 DIST sassc-rails-2.1.2.gem 33280 BLAKE2B 1ecd048a879ea9ba08390ed81c679a3a4461f3937d1b0ce5ee001810067286f386ea885787984ffa417d2af191f178563e892ea24f1b466b6538c815fadbd9e3 SHA512 d250f22a3f2c4afb56a22f4533194d80b8a301730e5e4b49f9613e489f7158e7bd9c02cff8e1ec8ce727ede25f1c03a2613a664291967b5e97e210f7890d0bc8
-EBUILD sassc-rails-2.1.2-r1.ebuild 830 BLAKE2B 4c3ffefbd44e137fdf34fa2f4af709667132d6a91212bdb50bf688b0998d3aaea411dfaa5ebe58f0ea1be85ad80fe9ff5510dcae03cfe316a105ea80adaf1d9f SHA512 dace6cf8fea2dcbe4a19f18959df5c41541640e36aa1fa05b20306ea049976e59e30f4b35c1e3a2b1fd1067aea27d5a4123b30b4fe8c805278d8d1cd2c4a7c6d
-EBUILD sassc-rails-2.1.2.ebuild 783 BLAKE2B 82fb27a1be266c91e2b423646e2e13d7f70fefce0951595708dd580624eb4bca1d0369aa5ea09fb4351df0537b1185d5aab757805ead5620c822ee3a0ad08646 SHA512 d37ecbd211802bbba7f0ae588138ffb9517f266bb9b14082b8eade25acd0965c37a0d391854001e7d1b839962461f8d3477f6e5d8bed0fe559a248fc351d0675
+EBUILD sassc-rails-2.1.2-r1.ebuild 905 BLAKE2B 31691ff99abfbf6377142f8545b8729ea4e935920be861d4b0be7c3b51192291fdac7207dc294e405925c68d72ccde205822d1c7f168d64717cf8ffe19e4a549 SHA512 9a6a922da7333be0d6394cec9091aacf03b032c87ee525bda3caed54c7a417558de36b693775d17577e29d2789b0cf133f5a2671a575c6d36db65ea32e6caf35
 MISC metadata.xml 342 BLAKE2B b460bdd1f19ae844f16c9600d7ffe9c737fe0812e88d35e572eb75d616b2aa6392bd0fa83eac92bd349503f5d72d39da3317b57415c38d121c705f09c5317338 SHA512 ee5b3763d54c109df23d6acdb840d71569d9405884bec4fb15de75d6fc66f68a5e40a8b873dfecab98e6c1f7e47cea4f875ac842d1f0d08cf5fc6cdcb0828312
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
index 089cbd49d652..54f5843763ad 100644
--- a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
+++ b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.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=6
@@ -33,8 +33,10 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	sed -e '/rake/ s/,.*$//' \
+		-e '/pry/ s:^:#:' \
 		-e 's/git ls-files -z/find . -print0/' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.2.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.2.ebuild
deleted file mode 100644
index ca9443f56d99..000000000000
--- a/dev-ruby/sassc-rails/sassc-rails-2.1.2.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="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrate SassC-Ruby with Rails"
-HOMEPAGE="https://github.com/sass/sassc-rails"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/sassc-2.0
-	dev-ruby/tilt:*
-	>=dev-ruby/railties-4:*
-	>=dev-ruby/sprockets-3.0:*
-	dev-ruby/sprockets-rails:*
-"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/bundler dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/,.*$//' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}