Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/sprockets/
Date: Tue, 30 May 2017 04:30:39
Message-Id: 1496118495.e78d6ef9e9cfca431db4d0b5d8bdc46cfebcc2f2.graaff@gentoo
1 commit: e78d6ef9e9cfca431db4d0b5d8bdc46cfebcc2f2
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 30 04:28:15 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Tue May 30 04:28:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78d6ef9
7
8 dev-ruby/sprockets: remove masked slot
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.1
11
12 dev-ruby/sprockets/Manifest | 2 -
13 dev-ruby/sprockets/sprockets-2.11.3.ebuild | 70 ------------------------------
14 dev-ruby/sprockets/sprockets-2.2.3.ebuild | 62 --------------------------
15 3 files changed, 134 deletions(-)
16
17 diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
18 index 7dfbde90809..f8222dad7a6 100644
19 --- a/dev-ruby/sprockets/Manifest
20 +++ b/dev-ruby/sprockets/Manifest
21 @@ -1,6 +1,4 @@
22 -DIST sprockets-2.11.3-git.tgz 195342 SHA256 010a3cfcee4a196552b19d07ad1b00221be9e3d117ad82a977824d3041fec8d5 SHA512 2fd26441089bc5c9474d9b443a9e72febde4566403592180e4e1fa5dce566e2fc37fde88f8cf804e732cbe588ba8347b57f7016124467f826a9de875df67e849 WHIRLPOOL af174e377604697cd746665852ed4b4ed551805c90f0530f92db61114dabf21f81b540c779e9f3a5d27131d52f9455ed09000ea1543392e5fb1df696038178ff
23 DIST sprockets-2.12.3-git.tgz 195647 SHA256 998ed806114a50b9168ad569c67d037fa866c185b2620924abdf4c542123529b SHA512 fd9544ed946bdf95968f198e74a36b682613d68e29a46708fd46c8b58792bf52526936b4c8d9ec3acea8f7cce789a69bcf4da3269741d43e186001061cbed03a WHIRLPOOL 4305464c17b275a6956fde436e1a65004da29580e0cc5f9962af9911778bf54ff303235fcfea85f28b1c7735e6f021fd63b1e719286efbd72a0be3dd95b14210
24 -DIST sprockets-2.2.3-git.tgz 185139 SHA256 d8d8c59a4f129357f5d9093db02d8e5df0b2df7aaeee23fc6c5864fdbc29997c SHA512 6850423efbb8521e4f4980e30e1464821be148474b511aca05478078b2601cf569a244cddeb9f164ba759d4207dcc2605c89b4b5b45431ebbee26b56f07b5e01 WHIRLPOOL 5b8eb85651975429c994e3e741d31a7989b031d51c4d9fb3d2a70da700a9187e888e100965b4f034f13d38d9066cb48a8c201841d2d639398c1c4f7c0dc1985e
25 DIST sprockets-3.4.1-git.tgz 298315 SHA256 fb2dcf86378c45c8028fb9b483f2def9ae558613794255f6eb12c97db0f220db SHA512 dd8bae1d922b662ef3215742731024d13b3fbc435124bb25351eeb6d33363383cb630ff60a8f6199205f31ed484e76c4a40d2c8a02b05e35bd9e73eb43a951bb WHIRLPOOL 8ae84a080dc7dab113a6109a3c50e61b3da8b753391e0ac2113c8ac6f89b955c6b4c6d40dee6ff8d6522a0c289c0a49e1777bbf7958f819adbcae6204641d9f7
26 DIST sprockets-3.5.2-git.tgz 302784 SHA256 8ef5507db16113c9f839371544a8ed4e3911c99525df95cc55bf61413f432b3b SHA512 8e599cf646baf53650ecafc65923d7e92c0d04cbf7207f64a0aaa4098d068ce4a1c252c5ce879188cff9d9af6f88ba50fa39d7af643b2668f23b1b8535a284c2 WHIRLPOOL 108da86d47be7b889ab74c5f75bd3ff592ff310e43f006d1a4362d5912bb044fa2dd5b29f86bec0ff4222c85093785fbf4a55f94c73b30ac4fe2fbe0862a1c40
27 DIST sprockets-3.6.3-git.tgz 367032 SHA256 40b51d0fb647bb4647e180b7aa21c6645344bc0dd59ff2c829340cc07c42c358 SHA512 4e497e87e0a5e93baa142071bf200810b47ad26dd9f431dbcda8e332629d971e94d43da2ebd04331d7be7f6807a4c707bdd0cf33303aa689da8996be26adbcac WHIRLPOOL 3f8d1193ef01233c73337202c0a6b9af1c5d1c870b7eaf0eb2b653dd54f0ae1feef72698a820746b2d349ffefa9ec4afe14995fe9498f10b22f4cd0a01bee4ab
28
29 diff --git a/dev-ruby/sprockets/sprockets-2.11.3.ebuild b/dev-ruby/sprockets/sprockets-2.11.3.ebuild
30 deleted file mode 100644
31 index 8ee1eb659e5..00000000000
32 --- a/dev-ruby/sprockets/sprockets-2.11.3.ebuild
33 +++ /dev/null
34 @@ -1,70 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=5
39 -USE_RUBY="ruby20 ruby21"
40 -
41 -RUBY_FAKEGEM_TASK_DOC=""
42 -RUBY_FAKEGEM_EXTRADOC="README.md"
43 -
44 -RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
45 -
46 -RUBY_FAKEGEM_BINWRAP=""
47 -
48 -inherit ruby-fakegem versionator
49 -
50 -DESCRIPTION="Ruby library for compiling and serving web assets"
51 -HOMEPAGE="https://github.com/sstephenson/sprockets"
52 -SRC_URI="https://github.com/sstephenson/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
53 -
54 -LICENSE="MIT"
55 -SLOT="2.11"
56 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
57 -
58 -IUSE=""
59 -
60 -ruby_add_rdepend "
61 - =dev-ruby/hike-1* >=dev-ruby/hike-1.2
62 - =dev-ruby/multi_json-1*
63 - =dev-ruby/rack-1*
64 - =dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.1
65 - !!<dev-ruby/sprockets-2.2.2-r1:2.2"
66 -
67 -ruby_add_bdepend "test? (
68 - dev-ruby/json
69 - dev-ruby/rack-test
70 - =dev-ruby/coffee-script-2*
71 - =dev-ruby/execjs-2*
72 - =dev-ruby/sass-3* >=dev-ruby/sass-3.1
73 - )"
74 -
75 -all_ruby_prepare() {
76 - # Avoid tests for template types that we currently don't package:
77 - # eco and ejs.
78 - sed -i -e '/eco templates/,/end/ s:^:#:' \
79 - -e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
80 -
81 - # Add missing 'json' require
82 - sed -i -e '4irequire "json"' test/test_manifest.rb || die
83 -
84 - # Avoid test breaking on specific javascript error being thrown,
85 - # most likely due to using node instead of v8.
86 - sed -i -e '/bundled asset cached if theres an error/,/^ end/ s:^:#:' test/test_environment.rb || die
87 -
88 - # Require a newer version of execjs since we do not have this slotted.
89 - sed -i -e '/execjs/ s/1.0/2.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
90 -}
91 -
92 -each_ruby_prepare() {
93 - sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
94 -}
95 -
96 -each_ruby_test() {
97 - # Make sure we have completely separate copies. Hardlinks won't work
98 - # for this test suite.
99 - cp -R test test-new || die
100 - rm -rf test || die
101 - mv test-new test || die
102 -
103 - each_fakegem_test
104 -}
105
106 diff --git a/dev-ruby/sprockets/sprockets-2.2.3.ebuild b/dev-ruby/sprockets/sprockets-2.2.3.ebuild
107 deleted file mode 100644
108 index b25bc204bd2..00000000000
109 --- a/dev-ruby/sprockets/sprockets-2.2.3.ebuild
110 +++ /dev/null
111 @@ -1,62 +0,0 @@
112 -# Copyright 1999-2016 Gentoo Foundation
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=5
116 -USE_RUBY="ruby20 ruby21"
117 -
118 -RUBY_FAKEGEM_TASK_DOC=""
119 -
120 -RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
121 -
122 -RUBY_FAKEGEM_BINWRAP=""
123 -
124 -inherit ruby-fakegem versionator
125 -
126 -DESCRIPTION="Ruby library for compiling and serving web assets"
127 -HOMEPAGE="https://github.com/sstephenson/sprockets"
128 -SRC_URI="https://github.com/sstephenson/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
129 -
130 -LICENSE="MIT"
131 -SLOT="$(get_version_component_range 1-2)"
132 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
133 -
134 -IUSE=""
135 -
136 -ruby_add_rdepend "
137 - >=dev-ruby/hike-1.2:0
138 - =dev-ruby/multi_json-1*
139 - =dev-ruby/rack-1*
140 - =dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.1"
141 -
142 -ruby_add_bdepend "test? (
143 - dev-ruby/json
144 - dev-ruby/rack-test
145 - =dev-ruby/coffee-script-2*
146 - dev-ruby/execjs:1
147 - )"
148 -
149 -all_ruby_prepare() {
150 - # Avoid tests for template types that we currently don't package:
151 - # eco and ejs.
152 - sed -i -e '/eco templates/,/end/ s:^:#:' \
153 - -e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
154 -
155 - # Avoid failing tests. These no longer fail in upstream HEAD and we
156 - # did not run tests before at all so its not a regression.
157 - rm test/test_asset.rb test/test_server.rb || die
158 -
159 - # Ignore failing tests with sprockets 2.2.1. These pass with the
160 - # latest versions but we need to put in this old version to support
161 - # Rails 3.2.9.
162 - sed -i -e '/depedencies are cached/,/end/ s:^:#:' test/test_caching.rb || die
163 - sed -i -e '/remove old asset/,/^ end/ s:^:#:' test/test_manifest.rb || die
164 -
165 - # Fix missing json include
166 - sed -i -e '5irequire "json"' test/sprockets_test.rb || die
167 -
168 - # Avoid test depending on specific execjs version
169 - sed -i -e '/bundled asset cached if theres an error building it/askip "gentoo"' test/test_environment.rb || die
170 -
171 - # Avoid test failing due to encoding specifics and available locales.
172 - sed -i -e '/read ASCII asset/askip "gentoo"' test/test_encoding.rb || die
173 -}