commit: c0bf190da61cc26836870398a43a77cf6b0390cd Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Feb 20 10:44:58 2021 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 10:45:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bf190d
dev-ruby/sprockets: fix blocker on old slot Add a revision that can be installed with slot 4 and use a soft blocker. Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> ...kets-4.0.2.ebuild => sprockets-3.7.2-r1.ebuild} | 23 +++++++++------------- dev-ruby/sprockets/sprockets-4.0.2.ebuild | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild similarity index 66% copy from dev-ruby/sprockets/sprockets-4.0.2.ebuild copy to dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild index cbef97b5029..0b2f62510c1 100644 --- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild +++ b/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild @@ -1,29 +1,31 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 USE_RUBY="ruby25 ruby26 ruby27" +RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="README.md" RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec" -inherit ruby-fakegem +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem versionator DESCRIPTION="Ruby library for compiling and serving web assets" HOMEPAGE="https://github.com/rails/sprockets"; SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz" LICENSE="MIT" -SLOT="$(ver_cut 1)" +SLOT="$(get_version_component_range 1)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" ruby_add_rdepend " dev-ruby/concurrent-ruby:1 - >=dev-ruby/rack-1:* <dev-ruby/rack-3:* - !!<dev-ruby/sprockets-3.7.2-r1:3" + >=dev-ruby/rack-1:* <dev-ruby/rack-3:*" ruby_add_bdepend "test? ( dev-ruby/json @@ -39,15 +41,8 @@ all_ruby_prepare() { # eco and ejs. sed -i -e '/eco templates/,/end/ s:^:#:' \ -e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die - sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die - sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die - sed -e '/change jst template namespace/askip' \ - -e '/find_asset. does not raise an exception/askip' \ - -e '/es6 asset/askip' \ - -i test/test_environment.rb || die - rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die - # Fails only within Gentoo test environment, not clear why - sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die + sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die + rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die sed -i -e "/bundler/d" Rakefile || die } diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-4.0.2.ebuild index cbef97b5029..5d9da86eb6a 100644 --- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild +++ b/dev-ruby/sprockets/sprockets-4.0.2.ebuild @@ -23,7 +23,7 @@ IUSE="" ruby_add_rdepend " dev-ruby/concurrent-ruby:1 >=dev-ruby/rack-1:* <dev-ruby/rack-3:* - !!<dev-ruby/sprockets-3.7.2-r1:3" + !<dev-ruby/sprockets-3.7.2-r1:3" ruby_add_bdepend "test? ( dev-ruby/json
