1 |
commit: c11cab237c6d6ed7061952852e6e966d910d5b57 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 8 06:38:10 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 8 10:49:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11cab23 |
7 |
|
8 |
dev-ruby/nokogiri: cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
dev-ruby/nokogiri/Manifest | 2 - |
14 |
dev-ruby/nokogiri/nokogiri-1.11.4.ebuild | 107 ------------------------------- |
15 |
dev-ruby/nokogiri/nokogiri-1.11.6.ebuild | 107 ------------------------------- |
16 |
3 files changed, 216 deletions(-) |
17 |
|
18 |
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest |
19 |
index 047746c6abc..2fc077e083f 100644 |
20 |
--- a/dev-ruby/nokogiri/Manifest |
21 |
+++ b/dev-ruby/nokogiri/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST nokogiri-1.11.4-git.tgz 5867481 BLAKE2B d9b0df4d6301a510824f8f31bd51e0f3beaf3cf7d3685a703782ae5fab0667b6276c0ccea20032252efc6c2dd6515577fcb21942f5d27a65815bc48f8af91137 SHA512 ca4bf385b06416f5a5b7f8fd742739181cccf93b42590c7d2d4f666846fd3a25d45c16717ae50bacd85e25644efe8584e195df7174450b8a59f2c6ef47624354 |
24 |
-DIST nokogiri-1.11.6-git.tgz 5869434 BLAKE2B 222b6b9e871c124a14ac5d9ac3901d9edfa057daaba7e1179853746af50d661bd70568b326603663f890b4b0d80fbb68f8cc22637ca340fa49699f475cce1bec SHA512 a9d2977ba5a12cb252ee615cffbbf043227e78d746ecba4bfcd82fa825f5ef9fdb74feae27115b16cd65da6dd189e4ac88f1d605e776dfbc52aaf2e0e3044381 |
25 |
DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131 |
26 |
DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b |
27 |
|
28 |
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild |
29 |
deleted file mode 100644 |
30 |
index 863fd634fec..00000000000 |
31 |
--- a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,107 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-USE_RUBY="ruby25 ruby26 ruby27 ruby30" |
40 |
- |
41 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md" |
42 |
- |
43 |
-RUBY_FAKEGEM_EXTRAINSTALL="ext" |
44 |
- |
45 |
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec" |
46 |
- |
47 |
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb) |
48 |
- |
49 |
-inherit ruby-fakegem multilib |
50 |
- |
51 |
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser" |
52 |
-HOMEPAGE="https://www.nokogiri.org/" |
53 |
-LICENSE="MIT" |
54 |
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz" |
55 |
- |
56 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
57 |
-SLOT="0" |
58 |
-IUSE="" |
59 |
- |
60 |
-RDEPEND="${RDEPEND} |
61 |
- >=dev-libs/libxml2-2.9.12:= |
62 |
- >=dev-libs/libxslt-1.1.34 |
63 |
- sys-libs/zlib |
64 |
- virtual/libiconv" |
65 |
-DEPEND="${DEPEND} |
66 |
- >=dev-libs/libxml2-2.9.12 |
67 |
- >=dev-libs/libxslt-1.1.34 |
68 |
- sys-libs/zlib |
69 |
- virtual/libiconv" |
70 |
- |
71 |
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0" |
72 |
- |
73 |
-ruby_add_bdepend " |
74 |
- >=dev-ruby/pkg-config-1.1.7 |
75 |
- >=dev-ruby/rexical-1.0.7 |
76 |
- dev-ruby/rdoc |
77 |
- test? ( dev-ruby/minitest )" |
78 |
- |
79 |
-all_ruby_prepare() { |
80 |
- sed -i \ |
81 |
- -e '/tasks\/cross_compile/s:^:#:' \ |
82 |
- -e '/:test.*prerequisites/s:^:#:' \ |
83 |
- -e '/license/ s:^:#:' \ |
84 |
- Rakefile || die |
85 |
- # Remove the cross compilation options since they interfere with |
86 |
- # native building. |
87 |
- sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die |
88 |
- sed -i -e '/cross_config_options/d' Rakefile || die |
89 |
- |
90 |
- sed -e '/simplecov/,/^end/ s:^:#:' \ |
91 |
- -e '/reporters/I s:^:#:' \ |
92 |
- -i test/helper.rb || die |
93 |
- |
94 |
- sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die |
95 |
- |
96 |
- # Account for fix making it upstream into our libxml2 system version |
97 |
- sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die |
98 |
-} |
99 |
- |
100 |
-each_ruby_configure() { |
101 |
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true \ |
102 |
- ${RUBY} -Cext/${PN} extconf.rb \ |
103 |
- --with-zlib-include="${EPREFIX}"/usr/include \ |
104 |
- --with-zlib-lib="${EPREFIX}"/$(get_libdir) \ |
105 |
- --with-iconv-include="${EPREFIX}"/usr/include \ |
106 |
- --with-iconv-lib="${EPREFIX}"/$(get_libdir) \ |
107 |
- --with-xml2-include="${EPREFIX}"/usr/include/libxml2 \ |
108 |
- --with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \ |
109 |
- --with-xslt-dir="${EPREFIX}"/usr \ |
110 |
- --with-iconvlib=iconv \ |
111 |
- || die "extconf.rb failed" |
112 |
-} |
113 |
- |
114 |
-each_ruby_compile() { |
115 |
- if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then |
116 |
- ${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed" |
117 |
- fi |
118 |
- |
119 |
- if ! [[ -f lib/nokogiri/css/parser.rb ]]; then |
120 |
- ${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed" |
121 |
- fi |
122 |
- |
123 |
- emake -Cext/${PN} \ |
124 |
- V=1 \ |
125 |
- CFLAGS="${CFLAGS} -fPIC" \ |
126 |
- archflag="${LDFLAGS}" || die "make extension failed" |
127 |
- cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die |
128 |
-} |
129 |
- |
130 |
-each_ruby_test() { |
131 |
- ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die |
132 |
-} |
133 |
- |
134 |
-each_ruby_install() { |
135 |
- each_fakegem_install |
136 |
- |
137 |
- # Clean up "ext" directory before installing it. nokogumbo expects |
138 |
- # the header files and shared object to be in ext. |
139 |
- rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die |
140 |
-} |
141 |
|
142 |
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild |
143 |
deleted file mode 100644 |
144 |
index 0a05340414a..00000000000 |
145 |
--- a/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,107 +0,0 @@ |
148 |
-# Copyright 1999-2021 Gentoo Authors |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=7 |
152 |
- |
153 |
-USE_RUBY="ruby25 ruby26 ruby27 ruby30" |
154 |
- |
155 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md" |
156 |
- |
157 |
-RUBY_FAKEGEM_EXTRAINSTALL="ext" |
158 |
- |
159 |
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec" |
160 |
- |
161 |
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb) |
162 |
- |
163 |
-inherit ruby-fakegem multilib |
164 |
- |
165 |
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser" |
166 |
-HOMEPAGE="https://www.nokogiri.org/" |
167 |
-LICENSE="MIT" |
168 |
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz" |
169 |
- |
170 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
171 |
-SLOT="0" |
172 |
-IUSE="" |
173 |
- |
174 |
-RDEPEND="${RDEPEND} |
175 |
- >=dev-libs/libxml2-2.9.12:= |
176 |
- >=dev-libs/libxslt-1.1.34 |
177 |
- sys-libs/zlib |
178 |
- virtual/libiconv" |
179 |
-DEPEND="${DEPEND} |
180 |
- >=dev-libs/libxml2-2.9.12 |
181 |
- >=dev-libs/libxslt-1.1.34 |
182 |
- sys-libs/zlib |
183 |
- virtual/libiconv" |
184 |
- |
185 |
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0" |
186 |
- |
187 |
-ruby_add_bdepend " |
188 |
- >=dev-ruby/pkg-config-1.1.7 |
189 |
- >=dev-ruby/rexical-1.0.7 |
190 |
- dev-ruby/rdoc |
191 |
- test? ( dev-ruby/minitest )" |
192 |
- |
193 |
-all_ruby_prepare() { |
194 |
- sed -i \ |
195 |
- -e '/tasks\/cross_compile/s:^:#:' \ |
196 |
- -e '/:test.*prerequisites/s:^:#:' \ |
197 |
- -e '/license/ s:^:#:' \ |
198 |
- Rakefile || die |
199 |
- # Remove the cross compilation options since they interfere with |
200 |
- # native building. |
201 |
- sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die |
202 |
- sed -i -e '/cross_config_options/d' Rakefile || die |
203 |
- |
204 |
- sed -e '/simplecov/,/^end/ s:^:#:' \ |
205 |
- -e '/reporters/I s:^:#:' \ |
206 |
- -i test/helper.rb || die |
207 |
- |
208 |
- sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die |
209 |
- |
210 |
- # Account for fix making it upstream into our libxml2 system version |
211 |
- sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die |
212 |
-} |
213 |
- |
214 |
-each_ruby_configure() { |
215 |
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true \ |
216 |
- ${RUBY} -Cext/${PN} extconf.rb \ |
217 |
- --with-zlib-include="${EPREFIX}"/usr/include \ |
218 |
- --with-zlib-lib="${EPREFIX}"/$(get_libdir) \ |
219 |
- --with-iconv-include="${EPREFIX}"/usr/include \ |
220 |
- --with-iconv-lib="${EPREFIX}"/$(get_libdir) \ |
221 |
- --with-xml2-include="${EPREFIX}"/usr/include/libxml2 \ |
222 |
- --with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \ |
223 |
- --with-xslt-dir="${EPREFIX}"/usr \ |
224 |
- --with-iconvlib=iconv \ |
225 |
- || die "extconf.rb failed" |
226 |
-} |
227 |
- |
228 |
-each_ruby_compile() { |
229 |
- if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then |
230 |
- ${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed" |
231 |
- fi |
232 |
- |
233 |
- if ! [[ -f lib/nokogiri/css/parser.rb ]]; then |
234 |
- ${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed" |
235 |
- fi |
236 |
- |
237 |
- emake -Cext/${PN} \ |
238 |
- V=1 \ |
239 |
- CFLAGS="${CFLAGS} -fPIC" \ |
240 |
- archflag="${LDFLAGS}" || die "make extension failed" |
241 |
- cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die |
242 |
-} |
243 |
- |
244 |
-each_ruby_test() { |
245 |
- ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die |
246 |
-} |
247 |
- |
248 |
-each_ruby_install() { |
249 |
- each_fakegem_install |
250 |
- |
251 |
- # Clean up "ext" directory before installing it. nokogumbo expects |
252 |
- # the header files and shared object to be in ext. |
253 |
- rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die |
254 |
-} |