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: Sat, 09 Jul 2016 05:29:32
Message-Id: 1468042141.1363c629686c5c0b06acacf1a195c25e85fbc6de.graaff@gentoo
1 commit: 1363c629686c5c0b06acacf1a195c25e85fbc6de
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 9 05:17:10 2016 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 9 05:29:01 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1363c629
7
8 dev-ruby/nokogiri: cleanup
9
10 Package-Manager: portage-2.2.28
11
12 dev-ruby/nokogiri/Manifest | 2 -
13 dev-ruby/nokogiri/nokogiri-1.6.4.1.ebuild | 82 ---------------------------
14 dev-ruby/nokogiri/nokogiri-1.6.7.1.ebuild | 93 -------------------------------
15 3 files changed, 177 deletions(-)
16
17 diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
18 index d1801c9..280dfd5 100644
19 --- a/dev-ruby/nokogiri/Manifest
20 +++ b/dev-ruby/nokogiri/Manifest
21 @@ -1,6 +1,4 @@
22 -DIST nokogiri-1.6.4.1-git.tgz 2251386 SHA256 5a326466d5bcd1b197c26d933f8ae5b4343c0b97b59f6859820d9987ca87a2e6 SHA512 e73577cd16cc05ab6368b8ccdb5e5e239e1360385c1cdd8027a7c4fea9072bafdc203d14bd89989274fd2fe9b9392fb77d6d22b5dbffe12ba9ee11e4f01ee0ae WHIRLPOOL cec01495d64f5f05c5eb1d25cf5d8026481b7ce36a2866627eac4ab5f948bd81b1e0e52e89da6d387206b292084f2931b5c8ec6c651e5231e987e980978804b1
23 DIST nokogiri-1.6.6.2-git.tgz 2258820 SHA256 32358b52936f1e2de0136130d3f43ea7e8d6c6f417265e21dc7e7d8572aff5b6 SHA512 6335c8e584c6b13a5cc9353b348b6df65f3e84392628b3ff458279bb03253e0f773f4557bac701872842761b1656a23d520a8446b83fcbc30efa29109fb2fec5 WHIRLPOOL c488a97872c560be4f366a1fb6cc8da08e025af3da19cd5083fb6bc9ce31127a021bd8ebb4a203172a799dfe5f29cb8c96da86e6165fe50e10a3e73f9e899632
24 DIST nokogiri-1.6.6.4-git.tgz 2263539 SHA256 de5241eb4dcebb3efe7a0f00d6bc82e18e47756fa76d66fd5d6399aeaac3757e SHA512 8009fa3519b9aae37223211601900541c7d12debedc561738013a8816b43e3b14979d044d1bf54797eabe47a0156af1263cad78ab0f067f4be4c3417842dc843 WHIRLPOOL 32b8d6bd7345d4063c7d4e48c105a1bdc62fd929430113810e5942feaf3f82b77d34652ca1b2176555a3af659700b03465faf67cf506fd4bdad1d40c96718d6b
25 -DIST nokogiri-1.6.7.1-git.tgz 2285125 SHA256 96d7b27124244a3f3d8d1bbfe84484f70eac4a5dc82daf4a1345f2f87db0c399 SHA512 aec39aedbbd08aafb0ef61747d7d7e9c96f311a53cc4b6c2f7f6ff8fcc3b7f5f6a46a295ddcfe04944742ef80a504bd3fa692d3aa2f3728e0bd107866a44a4b2 WHIRLPOOL 29c7c3c2998d5693c541bad199c40aa3027d508797f387f7a5058ddee178b436f700d2ced11389a1ef29fced6afc75f8b23249403e2e4ac1cfedafc37ed60d39
26 DIST nokogiri-1.6.7.2-git.tgz 2287034 SHA256 3ae69986d68b0922a13545a0530507374ba8be3df4e8acaca48e7e446c96e41f SHA512 aeccc3999e6ab97fca969d8ac5c5a117b6c65a610c1178349c5715c1c94717779b63106824ad2dd8ae80813b59e5381220a58d067e9f44aace41fd01d9a7a6df WHIRLPOOL 51913aac7c3a2a3bef9822da90bc3123d134ee49a9e4549fb408e1eda5157a28aa3f77ba3ac5554250461def7d499f1c85f7b1f5fd7e6ec4d7e60e88c2121050
27 DIST nokogiri-1.6.8-git.tgz 5707447 SHA256 e4c5c0799fb2c3fceb1874ef2c9a1c26a8d04bb527f376fb9936372db60001a2 SHA512 0457b26e09739c99ac06fd56fae1ab6422e0855e935518cf433de5d8c6abe5c24d700a0932128dbe9417f96267fcbac30b1988a9f0f60fefc2980346ec5b12b0 WHIRLPOOL 362ee473369449de916abdd4de5645ae92eeaa2b4772e76bfcbf5a88469b4425f898de04fab2d7aadc3463ea8e68d683f97fdc0f1118cafbd87f37b7a1e36b44
28
29 diff --git a/dev-ruby/nokogiri/nokogiri-1.6.4.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.4.1.ebuild
30 deleted file mode 100644
31 index 2fb74d9..0000000
32 --- a/dev-ruby/nokogiri/nokogiri-1.6.4.1.ebuild
33 +++ /dev/null
34 @@ -1,82 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=5
40 -
41 -USE_RUBY="ruby20"
42 -
43 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
44 -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
45 -
46 -inherit ruby-fakegem eutils multilib
47 -
48 -DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
49 -HOMEPAGE="http://nokogiri.org/"
50 -LICENSE="MIT"
51 -SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
52 -
53 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
54 -SLOT="0"
55 -IUSE=""
56 -
57 -RDEPEND="${RDEPEND}
58 - >=dev-libs/libxml2-2.9.2:=
59 - dev-libs/libxslt
60 - virtual/libiconv"
61 -DEPEND="${DEPEND}
62 - >=dev-libs/libxml2-2.9.2
63 - dev-libs/libxslt
64 - virtual/libiconv"
65 -
66 -# The tests require _minitest_, not the virtual; what is shipped with
67 -# Ruby 1.9 is *not* enough, unfortunately
68 -ruby_add_bdepend "
69 - dev-ruby/hoe
70 - dev-ruby/rake-compiler
71 - dev-ruby/rexical
72 - dev-ruby/rdoc
73 - dev-ruby/racc
74 - test? ( dev-ruby/minitest )"
75 -
76 -all_ruby_prepare() {
77 - sed -i \
78 - -e '/tasks\/cross_compile/s:^:#:' \
79 - -e '/:test.*prerequisites/s:^:#:' \
80 - -e '/license/ s:^:#:' \
81 - Rakefile || die
82 - # Remove the cross compilation options since they interfere with
83 - # native building.
84 - sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die
85 - sed -i -e '/cross_config_options/d' Rakefile || die
86 -}
87 -
88 -each_ruby_configure() {
89 - NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
90 - ${RUBY} -Cext/${PN} extconf.rb \
91 - --with-zlib-include="${EPREFIX}"/usr/include \
92 - --with-zlib-lib="${EPREFIX}"/$(get_libdir) \
93 - --with-iconv-include="${EPREFIX}"/usr/include \
94 - --with-iconv-lib="${EPREFIX}"/$(get_libdir) \
95 - --with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
96 - --with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
97 - --with-xslt-dir="${EPREFIX}"/usr \
98 - --with-iconvlib=iconv \
99 - || die "extconf.rb failed"
100 -}
101 -
102 -each_ruby_compile() {
103 - if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
104 - ${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
105 - fi
106 -
107 - if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
108 - ${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
109 - fi
110 -
111 - emake -Cext/${PN} \
112 - V=1 \
113 - CFLAGS="${CFLAGS} -fPIC" \
114 - archflag="${LDFLAGS}" || die "make extension failed"
115 - cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
116 -}
117
118 diff --git a/dev-ruby/nokogiri/nokogiri-1.6.7.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.7.1.ebuild
119 deleted file mode 100644
120 index ad87548..0000000
121 --- a/dev-ruby/nokogiri/nokogiri-1.6.7.1.ebuild
122 +++ /dev/null
123 @@ -1,93 +0,0 @@
124 -# Copyright 1999-2015 Gentoo Foundation
125 -# Distributed under the terms of the GNU General Public License v2
126 -# $Id$
127 -
128 -EAPI=5
129 -
130 -USE_RUBY="ruby20 ruby21 ruby22 ruby23"
131 -
132 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
133 -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.md ROADMAP.md STANDARD_RESPONSES.md"
134 -
135 -RUBY_FAKEGEM_EXTRAINSTALL="ext"
136 -
137 -inherit ruby-fakegem eutils multilib
138 -
139 -DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
140 -HOMEPAGE="http://nokogiri.org/"
141 -LICENSE="MIT"
142 -SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
143 -
144 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
145 -SLOT="0"
146 -IUSE=""
147 -
148 -RDEPEND="${RDEPEND}
149 - >=dev-libs/libxml2-2.9.2:=
150 - dev-libs/libxslt
151 - virtual/libiconv"
152 -DEPEND="${DEPEND}
153 - >=dev-libs/libxml2-2.9.2
154 - dev-libs/libxslt
155 - virtual/libiconv"
156 -
157 -ruby_add_bdepend "
158 - dev-ruby/hoe
159 - dev-ruby/rexical
160 - dev-ruby/rdoc
161 - dev-ruby/racc
162 - test? ( dev-ruby/minitest )"
163 -
164 -all_ruby_prepare() {
165 - sed -i \
166 - -e '/tasks\/cross_compile/s:^:#:' \
167 - -e '/:test.*prerequisites/s:^:#:' \
168 - -e '/license/ s:^:#:' \
169 - Rakefile || die
170 - # Remove the cross compilation options since they interfere with
171 - # native building.
172 - sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die
173 - sed -i -e '/cross_config_options/d' Rakefile || die
174 -}
175 -
176 -each_ruby_configure() {
177 - NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
178 - ${RUBY} -Cext/${PN} extconf.rb \
179 - --with-zlib-include="${EPREFIX}"/usr/include \
180 - --with-zlib-lib="${EPREFIX}"/$(get_libdir) \
181 - --with-iconv-include="${EPREFIX}"/usr/include \
182 - --with-iconv-lib="${EPREFIX}"/$(get_libdir) \
183 - --with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
184 - --with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
185 - --with-xslt-dir="${EPREFIX}"/usr \
186 - --with-iconvlib=iconv \
187 - || die "extconf.rb failed"
188 -}
189 -
190 -each_ruby_compile() {
191 - if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
192 - ${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
193 - fi
194 -
195 - if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
196 - ${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
197 - fi
198 -
199 - emake -Cext/${PN} \
200 - V=1 \
201 - CFLAGS="${CFLAGS} -fPIC" \
202 - archflag="${LDFLAGS}" || die "make extension failed"
203 - cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
204 -}
205 -
206 -each_ruby_test() {
207 - ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
208 -}
209 -
210 -each_ruby_install() {
211 - # Clean up "ext" directory before installing it. nokogumbo expects
212 - # the header files and shared object to be in ext.
213 - rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
214 -
215 - each_fakegem_install
216 -}