Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/jekyll/
Date: Wed, 09 Sep 2020 10:07:34
Message-Id: 1599646041.93d8aa91480791f62232d237a39f69d6c6625b76.mgorny@gentoo
1 commit: 93d8aa91480791f62232d237a39f69d6c6625b76
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 9 09:05:45 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 9 10:07:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d8aa91
7
8 www-apps/jekyll: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 www-apps/jekyll/Manifest | 2 -
13 www-apps/jekyll/jekyll-3.8.5.ebuild | 81 ---------------------------------
14 www-apps/jekyll/jekyll-4.1.0.ebuild | 90 -------------------------------------
15 3 files changed, 173 deletions(-)
16
17 diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
18 index 5f7915f13ed..5b9729c8243 100644
19 --- a/www-apps/jekyll/Manifest
20 +++ b/www-apps/jekyll/Manifest
21 @@ -1,3 +1 @@
22 -DIST jekyll-3.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
23 -DIST jekyll-4.1.0.tar.gz 1397143 BLAKE2B f7021fdc418acefa1b7e92318225ff8afff8dd84a0134906bb48ae461a94e4a71a8d0de0800ea489a3bd3eb7bfa36be4b8781e4c89729d5adc9e8ddc3b711dc3 SHA512 fdd9b28ff065a1dbe78f197c618bdd00bfeb37f66983c55ce971edcc96c3af39d926ec64b3866084dc8c21a56764ecdfb61d954123b15fe41a9de68fc951dc48
24 DIST jekyll-4.1.1.tar.gz 1398438 BLAKE2B ac207d58b155e069fda40b4598d441d8fb88f22e85740082829d018dc9cefe51ca636b23a6207c37711c4d26e078f6e4913946599f0200b8e8cb065a9ceff952 SHA512 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
25
26 diff --git a/www-apps/jekyll/jekyll-3.8.5.ebuild b/www-apps/jekyll/jekyll-3.8.5.ebuild
27 deleted file mode 100644
28 index 37240e5d51b..00000000000
29 --- a/www-apps/jekyll/jekyll-3.8.5.ebuild
30 +++ /dev/null
31 @@ -1,81 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -USE_RUBY="ruby23 ruby24 ruby25"
37 -
38 -inherit ruby-fakegem
39 -
40 -RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
41 -RUBY_FAKEGEM_EXTRAINSTALL="features"
42 -
43 -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
44 -
45 -RUBY_FAKEGEM_BINDIR="exe"
46 -
47 -DESCRIPTION="A simple, blog aware, static site generator"
48 -HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
49 -SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
50 -
51 -LICENSE="MIT"
52 -SLOT="0"
53 -KEYWORDS="~amd64"
54 -IUSE="test"
55 -
56 -ruby_add_rdepend "
57 - >=dev-ruby/addressable-2.4
58 - >=dev-ruby/colorator-1.0i
59 - >=dev-ruby/em-websocket-0.5
60 - >=dev-ruby/i18n-0.7:0.7
61 - >=dev-ruby/kramdown-1.14
62 - >=dev-ruby/liquid-4.0:4
63 - >=dev-ruby/mercenary-0.3.3
64 - >=dev-ruby/pathutil-0.9
65 - >=dev-ruby/safe_yaml-1.0
66 - || ( dev-ruby/rouge:2 >=dev-ruby/rouge-1.7:0 )
67 - >=www-apps/jekyll-sass-converter-1.0
68 - >=www-apps/jekyll-watch-2.0
69 -"
70 -
71 -ruby_add_bdepend "
72 - test? (
73 - >=dev-ruby/classifier-reborn-2.1.0
74 - dev-ruby/launchy
75 - >=dev-ruby/pygments_rb-0.6.0
76 - >=dev-ruby/rdiscount-2.0
77 - >=dev-ruby/redcarpet-3.2.3
78 - dev-ruby/rspec-mocks
79 - >=dev-ruby/shoulda-3
80 - dev-ruby/test-unit:2
81 - www-apps/jekyll-coffeescript
82 - )
83 -"
84 -
85 -all_ruby_prepare() {
86 - eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
87 -
88 - # Drop tests requiring bundler
89 - sed -i -e '/bundle_message/d' test/test_new_command.rb || die
90 - rm test/test_plugin_manager.rb || die
91 -
92 - # Replace git command in gemspec
93 - sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
94 -
95 - # FIXMEs:
96 - # fails to find fixtures
97 - rm test/test_theme.rb || die
98 - rm test/test_theme_assets_reader.rb || die
99 - sed -i -e '/^ should.*theme/,/^ end$/d' \
100 - -e '/^ should.*theme/,/^ end$/d' test/test_site.rb || die
101 - # partially requires 'toml'
102 - rm test/test_configuration.rb || die
103 - # pygments tests fail because of line numbering
104 - sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_tags.rb || die
105 - sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_redcarpet.rb || die
106 -}
107 -
108 -src_test() {
109 - local -x JEKYLL_NO_BUNDLER_REQUIRE=true
110 -
111 - ruby-ng_src_test
112 -}
113
114 diff --git a/www-apps/jekyll/jekyll-4.1.0.ebuild b/www-apps/jekyll/jekyll-4.1.0.ebuild
115 deleted file mode 100644
116 index b60329211a3..00000000000
117 --- a/www-apps/jekyll/jekyll-4.1.0.ebuild
118 +++ /dev/null
119 @@ -1,90 +0,0 @@
120 -# Copyright 1999-2020 Gentoo Authors
121 -# Distributed under the terms of the GNU General Public License v2
122 -
123 -EAPI=7
124 -USE_RUBY="ruby25 ruby26"
125 -
126 -inherit ruby-fakegem
127 -
128 -RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
129 -RUBY_FAKEGEM_EXTRAINSTALL="features"
130 -
131 -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
132 -
133 -RUBY_FAKEGEM_BINDIR="exe"
134 -
135 -DESCRIPTION="A simple, blog aware, static site generator"
136 -HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
137 -SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
138 -
139 -LICENSE="MIT"
140 -SLOT="0"
141 -KEYWORDS="~amd64 ~arm64"
142 -IUSE="test"
143 -
144 -ruby_add_rdepend "
145 - >=dev-ruby/addressable-2.4
146 - >=dev-ruby/colorator-1.0
147 - >=dev-ruby/em-websocket-0.5
148 - dev-ruby/i18n:1
149 - >=dev-ruby/kramdown-2.1:2
150 - dev-ruby/kramdown-parser-gfm:1
151 - dev-ruby/liquid:4
152 - >=dev-ruby/mercenary-0.4.0
153 - >=dev-ruby/pathutil-0.9
154 - =dev-ruby/rouge-3*
155 - >=dev-ruby/safe_yaml-1.0
156 - >=dev-ruby/terminal-table-1.8:0
157 - >=www-apps/jekyll-sass-converter-2.0
158 - >=www-apps/jekyll-watch-2.0
159 -"
160 -
161 -ruby_add_bdepend "
162 - test? (
163 - >=dev-ruby/classifier-reborn-2.1.0
164 - dev-ruby/launchy
165 - >=dev-ruby/pygments_rb-0.6.0
166 - >=dev-ruby/rdiscount-2.0
167 - >=dev-ruby/redcarpet-3.2.3
168 - dev-ruby/rspec-mocks
169 - >=dev-ruby/shoulda-3
170 - dev-ruby/test-unit:2
171 - www-apps/jekyll-coffeescript
172 - )
173 -"
174 -
175 -all_ruby_prepare() {
176 - eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
177 -
178 - # Drop tests requiring bundler
179 - sed -i -e '/bundle_message/d' test/test_new_command.rb || die
180 - rm test/test_plugin_manager.rb || die
181 -
182 - # Replace git command in gemspec
183 - sed -e 's/git ls-files/find -not -type d -print/' \
184 - -e 's:_relative ": "./:' \
185 - -i $RUBY_FAKEGEM_GEMSPEC || die
186 -
187 - # FIXMEs:
188 - # fails to find fixtures because this requires bundler
189 - rm test/test_theme.rb || die
190 - rm test/test_theme_assets_reader.rb || die
191 - sed -i -e '/^ should.*theme/,/^ end$/d' \
192 - -e '/^ should.*theme/,/^ end$/d' test/test_site.rb || die
193 - sed -i -e '/context "with a theme"/,/^ end/ s:^:#:' test/test_layout_reader.rb || die
194 - sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
195 - # partially requires 'toml'
196 - rm test/test_configuration.rb || die
197 - # pygments tests fail because of line numbering
198 - sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_tags.rb || die
199 - #sed -i -e '/^ context.*pygments/,/^ end$/d' test/test_redcarpet.rb || die
200 -
201 - # Tries to use bundler and install packages.
202 - rm -f test/test_new_command.rb || die
203 -}
204 -
205 -src_test() {
206 - local -x JEKYLL_NO_BUNDLER_REQUIRE=true
207 -
208 - ruby-ng_src_test
209 -}