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