From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1253292-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 875FD1382C5
for <garchives@archives.gentoo.org>; Sat, 20 Feb 2021 10:45:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D5B55E0867;
Sat, 20 Feb 2021 10:45:15 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AE517E0867
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Feb 2021 10:45:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AA21A341007
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Feb 2021 10:45:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 499E0487
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Feb 2021 10:45:13 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <1613817907.c0bf190da61cc26836870398a43a77cf6b0390cd.graaff@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/sprockets/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild dev-ruby/sprockets/sprockets-4.0.2.ebuild
X-VCS-Directories: dev-ruby/sprockets/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: c0bf190da61cc26836870398a43a77cf6b0390cd
X-VCS-Branch: master
Date: Sat, 20 Feb 2021 10:45:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2817203f-ee96-4257-b0e1-2062ed7b26f4
X-Archives-Hash: 018f6776829adce0e8737521e569ff25
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