Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-ruby/poltergeist/, www-client/phantomjs/
Date: Wed, 23 Jan 2019 18:43:31
Message-Id: 1548268948.c75c33a70d5cea66528a0613f1cd2cae65275939.grknight@gentoo
1 commit: c75c33a70d5cea66528a0613f1cd2cae65275939
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 23 18:42:28 2019 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 23 18:42:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75c33a7
7
8 dev-ruby/poltergeist,www-client/phantomjs: Remove last rite packages
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11
12 dev-ruby/poltergeist/Manifest | 1 -
13 dev-ruby/poltergeist/metadata.xml | 11 ---
14 dev-ruby/poltergeist/poltergeist-1.14.0.ebuild | 46 ------------
15 profiles/package.mask | 8 ---
16 www-client/phantomjs/Manifest | 5 --
17 www-client/phantomjs/metadata.xml | 12 ----
18 www-client/phantomjs/phantomjs-2.1.1-r1.ebuild | 99 --------------------------
19 www-client/phantomjs/phantomjs-2.1.1.ebuild | 99 --------------------------
20 8 files changed, 281 deletions(-)
21
22 diff --git a/dev-ruby/poltergeist/Manifest b/dev-ruby/poltergeist/Manifest
23 deleted file mode 100644
24 index 6362d579983..00000000000
25 --- a/dev-ruby/poltergeist/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST poltergeist-1.14.0.tar.gz 185946 BLAKE2B 0f5d95437ad5c2509264ef0230624ac257e8901e98bd4494576c3dc6895fc38c64572b287eb9842c8af2ddbaf0b3c48ecb0a1fb4a2cb72711abba40646dcaeec SHA512 82ab8aec7e5e091fa2924765e077d8b9816319833d438d9246f8ef3d0045d158de6bce1d14e929cc5cb8d0970ea380d44a51511b17623479f3cd64853580ce71
29
30 diff --git a/dev-ruby/poltergeist/metadata.xml b/dev-ruby/poltergeist/metadata.xml
31 deleted file mode 100644
32 index 1ec3a890fb3..00000000000
33 --- a/dev-ruby/poltergeist/metadata.xml
34 +++ /dev/null
35 @@ -1,11 +0,0 @@
36 -<?xml version="1.0" encoding="UTF-8"?>
37 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
38 -<pkgmetadata>
39 - <maintainer type="project">
40 - <email>ruby@g.o</email>
41 - <name>Gentoo Ruby Project</name>
42 - </maintainer>
43 - <upstream>
44 - <remote-id type="github">jonleighton/poltergeist</remote-id>
45 - </upstream>
46 -</pkgmetadata>
47
48 diff --git a/dev-ruby/poltergeist/poltergeist-1.14.0.ebuild b/dev-ruby/poltergeist/poltergeist-1.14.0.ebuild
49 deleted file mode 100644
50 index 4dfa4cf7439..00000000000
51 --- a/dev-ruby/poltergeist/poltergeist-1.14.0.ebuild
52 +++ /dev/null
53 @@ -1,46 +0,0 @@
54 -# Copyright 1999-2017 Gentoo Foundation
55 -# Distributed under the terms of the GNU General Public License v2
56 -
57 -EAPI=5
58 -USE_RUBY="ruby21 ruby22 ruby23"
59 -
60 -# There are tests but they require several unpackaged dependencies.
61 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
62 -
63 -RUBY_FAKEGEM_TASK_DOC=""
64 -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
65 -
66 -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
67 -
68 -inherit ruby-fakegem
69 -
70 -DESCRIPTION="A PhantomJS driver for Capybara"
71 -HOMEPAGE="https://github.com/jonleighton/poltergeist"
72 -SRC_URI="https://github.com/jonleighton/poltergeist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
73 -
74 -LICENSE="MIT"
75 -SLOT="0"
76 -KEYWORDS="~amd64"
77 -IUSE=""
78 -
79 -RDEPEND+=" www-client/phantomjs"
80 -
81 -ruby_add_rdepend ">=dev-ruby/cliver-0.3.1
82 - >=dev-ruby/capybara-2.1
83 - >=dev-ruby/websocket-driver-0.2.0"
84 -
85 -ruby_add_bdepend "test? ( dev-ruby/sinatra:0 )"
86 -
87 -all_ruby_prepare() {
88 - # Fix cliver versioning to accept all 0.x versions
89 - sed -i -e 's/0.3.1/0.3/' ${RUBY_FAKEGEM_GEMSPEC} || die
90 -
91 - sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
92 - sed -i -e '2igem "sinatra", "~>1.0"; gem "rack", "~>1.5"' spec/spec_helper.rb || die
93 -
94 - # Remove integration tests for now since they require additional dependencies.
95 - rm -rf spec/integration
96 -
97 - # Avoid a spec failing only in our ebuild test environment
98 - sed -i -e '/can pause indefinitely/,/^ end/ s:^:#:' spec/unit/driver_spec.rb || die
99 -}
100
101 diff --git a/profiles/package.mask b/profiles/package.mask
102 index 65fac9ba71e..ee3815b16a8 100644
103 --- a/profiles/package.mask
104 +++ b/profiles/package.mask
105 @@ -331,14 +331,6 @@ sys-devel/automake:1.8
106 # upstream.
107 >=app-text/jabref-bin-4.0
108
109 -# Hans de Graaff <graaff@g.o> (05 Jun 2017)
110 -# Bundles obsolete and vulnerable webkit version.
111 -# Upstream has stopped development and recommends using
112 -# headless mode in >=www-client/chromium-59.
113 -# Masked for removal in 90 days. Bug #589994.
114 -www-client/phantomjs
115 -dev-ruby/poltergeist
116 -
117 # Michał Górny <mgorny@g.o> (22 May 2017)
118 # for Maciej S. Szmigiero <mail@××××××××××××××××.name>
119 # Any version above 5.100.138 breaks b43 driver in various ways.
120
121 diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
122 deleted file mode 100644
123 index 014f959a009..00000000000
124 --- a/www-client/phantomjs/Manifest
125 +++ /dev/null
126 @@ -1,5 +0,0 @@
127 -DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 BLAKE2B 4a0fe19ae338ebb1846e2f04c3a6ea2f790d3835044d089304f7eba1d1f3bf0af41148d87b6f4a32103a5613cb1b470a8572189653bb3c38a64fb0c12e475feb SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df
128 -DIST gentoo-phantomjs-patchset-0.02.tar.bz2 8017 BLAKE2B 0bde29dab19ced08afeab0484e0d88f9fee35306ddba0aeda3cef158ad0f818a7f93f6d1462766399231513d1279dc1071bde4e82d82c67e156eaeb0c52d6f87 SHA512 88e8acb47842b108c4f01bc778c25d95011462b9d6732e6cca20372824a93321731d1976b19736a87d6e51737dffa0c76a15983d4b0739e97c7dc55ea065e791
129 -DIST phantomjs-2.1.1.tar.gz 1880406 BLAKE2B e54e8a1d42cdbf6fb98c90283a0ebcb4145350bc34d76b8a0d01163fcca15b7e6bbf7043e2d17bbf21c5d01e7fd0e76a4386f9c01dfc8727998f8d0f17da9291 SHA512 07b769133957c5194c9afdaa347bd9a019ebe47653f98adf17a35d3dd12714d2f8e3773ced91d7d99f31cb18d7f73167022d5b0a3906d9aac0732ef96341f5ec
130 -DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 BLAKE2B 2fd956a2d8cb64e31bff107497191bc601048fe173fe3361a5baf3f5987c9dea035c9c1829595531c5d09eb5168acbabc10a361adea943e597daa781008212dd SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575
131 -DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
132
133 diff --git a/www-client/phantomjs/metadata.xml b/www-client/phantomjs/metadata.xml
134 deleted file mode 100644
135 index 748968f236d..00000000000
136 --- a/www-client/phantomjs/metadata.xml
137 +++ /dev/null
138 @@ -1,12 +0,0 @@
139 -<?xml version="1.0" encoding="UTF-8"?>
140 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
141 -<pkgmetadata>
142 - <maintainer type="person">
143 - <email>chainsaw@g.o</email>
144 - <name>Tony Vroon</name>
145 - </maintainer>
146 - <upstream>
147 - <remote-id type="google-code">phantomjs</remote-id>
148 - <remote-id type="bitbucket">ariya/phantomjs</remote-id>
149 - </upstream>
150 -</pkgmetadata>
151
152 diff --git a/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild b/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
153 deleted file mode 100644
154 index c9a611bdeb3..00000000000
155 --- a/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
156 +++ /dev/null
157 @@ -1,99 +0,0 @@
158 -# Copyright 1999-2018 Gentoo Foundation
159 -# Distributed under the terms of the GNU General Public License v2
160 -
161 -EAPI=6
162 -
163 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
164 -QTB_PV="5.5.1"
165 -QTB_P="qtbase-opensource-src-${QTB_PV}"
166 -QTW_PV="5.7.1"
167 -QTW_P="qtwebkit-opensource-src-${QTW_PV}"
168 -
169 -DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
170 -HOMEPAGE="http://phantomjs.org/"
171 -SRC_URI="https://github.com/ariya/phantomjs/archive/${PV}.tar.gz -> ${P}.tar.gz
172 - https://download.qt.io/archive/qt/${QTB_PV%.*}/${QTB_PV}/submodules/${QTB_P}.tar.xz
173 - https://download.qt.io/community_releases/${QTW_PV%.*}/${QTW_PV}/${QTW_P}.tar.xz
174 - mirror://gentoo/gentoo-${PN}-patchset-0.02.tar.bz2"
175 -
176 -inherit eutils toolchain-funcs pax-utils multiprocessing
177 -
178 -LICENSE="BSD"
179 -SLOT="0"
180 -KEYWORDS="~amd64 ~x86"
181 -IUSE="examples fontconfig libressl truetype"
182 -RESTRICT="mirror"
183 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
184 -
185 -EPATCH_SUFFIX="patch"
186 -PATCHES=( "${WORKDIR}/${PN}-patchset" )
187 -
188 -RDEPEND="dev-libs/icu:=
189 - fontconfig? ( media-libs/fontconfig )
190 - !libressl? ( dev-libs/openssl:0 )
191 - libressl? ( dev-libs/libressl )
192 - truetype? ( media-libs/freetype )
193 - dev-db/sqlite:3"
194 -DEPEND="${RDEPEND}
195 - net-misc/openssh[-bindist]
196 - app-arch/unzip
197 - dev-lang/ruby
198 - virtual/pkgconfig"
199 -
200 -src_prepare() {
201 - ebegin "Moving third-party libraries into position for build"
202 - mv -T "${WORKDIR}/${QTB_P}" "${S}/src/qt/qtbase/" || die "QT base ${QTB_PV} failed"
203 - mv -T "${WORKDIR}/${QTW_P}" "${S}/src/qt/qtwebkit/" || die "QT webkit ${QTW_PV} failed"
204 - eend "$?"
205 -
206 - ebegin "Instilling C/CXX/LDFLAGS respect in main source"
207 - # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
208 - sed -i \
209 - -e "/^SYSTEM_VARIABLES=/i \
210 - CC='$(tc-getCC)'\n\
211 - CXX='$(tc-getCXX)'\n\
212 - CFLAGS='${CFLAGS}'\n\
213 - CXXFLAGS='${CXXFLAGS}'\n\
214 - LDFLAGS='${LDFLAGS}'\n\
215 - QMakeVar set QMAKE_CFLAGS_RELEASE\n\
216 - QMakeVar set QMAKE_CFLAGS_DEBUG\n\
217 - QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
218 - QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
219 - QMakeVar set QMAKE_LFLAGS_RELEASE\n\
220 - QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
221 - src/qt/qtbase/configure \
222 - || die
223 - eend $?
224 -
225 - ebegin "Instilling C/CXX/LDFLAGS respect in test suite"
226 - # Respect CC, CXX, LINK and *FLAGS in config.tests
227 - find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
228 - sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
229 - 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
230 - 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
231 - {} + || die
232 - eend $?
233 -
234 - default
235 -}
236 -
237 -src_compile() {
238 - ./build.py \
239 - --confirm \
240 - --jobs $(makeopts_jobs) \
241 - || die
242 -}
243 -
244 -src_test() {
245 - ./bin/phantomjs test/run-tests.js || die
246 -}
247 -
248 -src_install() {
249 - pax-mark m bin/phantomjs || die
250 - dobin bin/phantomjs
251 - dodoc ChangeLog README.md
252 - if use examples ; then
253 - docinto examples
254 - dodoc examples/*
255 - fi
256 -}
257
258 diff --git a/www-client/phantomjs/phantomjs-2.1.1.ebuild b/www-client/phantomjs/phantomjs-2.1.1.ebuild
259 deleted file mode 100644
260 index cf2bef6794e..00000000000
261 --- a/www-client/phantomjs/phantomjs-2.1.1.ebuild
262 +++ /dev/null
263 @@ -1,99 +0,0 @@
264 -# Copyright 1999-2017 Gentoo Foundation
265 -# Distributed under the terms of the GNU General Public License v2
266 -
267 -EAPI=6
268 -
269 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
270 -QTB_PV="5.5.1"
271 -QTB_P="qtbase-opensource-src-${QTB_PV}"
272 -QTW_PV="5.7.1"
273 -QTW_P="qtwebkit-opensource-src-${QTW_PV}"
274 -
275 -DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
276 -HOMEPAGE="http://phantomjs.org/"
277 -SRC_URI="https://github.com/ariya/phantomjs/archive/${PV}.tar.gz -> ${P}.tar.gz
278 - https://download.qt.io/archive/qt/${QTB_PV%.*}/${QTB_PV}/submodules/${QTB_P}.tar.xz
279 - https://download.qt.io/community_releases/${QTW_PV%.*}/${QTW_PV}/${QTW_P}.tar.xz
280 - mirror://gentoo/gentoo-${PN}-patchset-0.01.tar.bz2"
281 -
282 -inherit eutils toolchain-funcs pax-utils multiprocessing
283 -
284 -LICENSE="BSD"
285 -SLOT="0"
286 -KEYWORDS="~amd64 ~x86"
287 -IUSE="examples fontconfig libressl truetype"
288 -RESTRICT="mirror"
289 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
290 -
291 -EPATCH_SUFFIX="patch"
292 -PATCHES=( "${WORKDIR}/${PN}-patchset" )
293 -
294 -RDEPEND="dev-libs/icu:=
295 - fontconfig? ( media-libs/fontconfig )
296 - !libressl? ( dev-libs/openssl:0 )
297 - libressl? ( dev-libs/libressl )
298 - truetype? ( media-libs/freetype )
299 - dev-db/sqlite:3"
300 -DEPEND="${RDEPEND}
301 - net-misc/openssh[-bindist]
302 - app-arch/unzip
303 - dev-lang/ruby
304 - virtual/pkgconfig"
305 -
306 -src_prepare() {
307 - ebegin "Moving third-party libraries into position for build"
308 - mv -T "${WORKDIR}/${QTB_P}" "${S}/src/qt/qtbase/" || die "QT base ${QTB_PV} failed"
309 - mv -T "${WORKDIR}/${QTW_P}" "${S}/src/qt/qtwebkit/" || die "QT webkit ${QTW_PV} failed"
310 - eend "$?"
311 -
312 - ebegin "Instilling C/CXX/LDFLAGS respect in main source"
313 - # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
314 - sed -i \
315 - -e "/^SYSTEM_VARIABLES=/i \
316 - CC='$(tc-getCC)'\n\
317 - CXX='$(tc-getCXX)'\n\
318 - CFLAGS='${CFLAGS}'\n\
319 - CXXFLAGS='${CXXFLAGS}'\n\
320 - LDFLAGS='${LDFLAGS}'\n\
321 - QMakeVar set QMAKE_CFLAGS_RELEASE\n\
322 - QMakeVar set QMAKE_CFLAGS_DEBUG\n\
323 - QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
324 - QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
325 - QMakeVar set QMAKE_LFLAGS_RELEASE\n\
326 - QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
327 - src/qt/qtbase/configure \
328 - || die
329 - eend $?
330 -
331 - ebegin "Instilling C/CXX/LDFLAGS respect in test suite"
332 - # Respect CC, CXX, LINK and *FLAGS in config.tests
333 - find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
334 - sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
335 - 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
336 - 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
337 - {} + || die
338 - eend $?
339 -
340 - default
341 -}
342 -
343 -src_compile() {
344 - ./build.py \
345 - --confirm \
346 - --jobs $(makeopts_jobs) \
347 - || die
348 -}
349 -
350 -src_test() {
351 - ./bin/phantomjs test/run-tests.js || die
352 -}
353 -
354 -src_install() {
355 - pax-mark m bin/phantomjs || die
356 - dobin bin/phantomjs
357 - dodoc ChangeLog README.md
358 - if use examples ; then
359 - docinto examples
360 - dodoc examples/*
361 - fi
362 -}