Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/phantomjs/files/, www-client/phantomjs/
Date: Tue, 13 Feb 2018 20:29:49
Message-Id: 1518553781.5ee1f2e94ce0872badb1ef5d5190282ddec9f1cc.pacho@gentoo
1 commit: 5ee1f2e94ce0872badb1ef5d5190282ddec9f1cc
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 13 20:29:27 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 13 20:29:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee1f2e9
7
8 www-client/phantomjs: Drop old (#647512)
9
10 Package-Manager: Portage-2.3.20, Repoman-2.3.6
11
12 www-client/phantomjs/Manifest | 2 -
13 .../files/phantomjs-gcc5-compile-fix.patch | 14 ----
14 .../files/phantomjs-python3-udis86-itab.patch | 12 ----
15 www-client/phantomjs/phantomjs-1.9.8.ebuild | 78 --------------------
16 www-client/phantomjs/phantomjs-2.0.0-r1.ebuild | 83 ----------------------
17 5 files changed, 189 deletions(-)
18
19 diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
20 index b8f6ea3a384..014f959a009 100644
21 --- a/www-client/phantomjs/Manifest
22 +++ b/www-client/phantomjs/Manifest
23 @@ -1,7 +1,5 @@
24 DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 BLAKE2B 4a0fe19ae338ebb1846e2f04c3a6ea2f790d3835044d089304f7eba1d1f3bf0af41148d87b6f4a32103a5613cb1b470a8572189653bb3c38a64fb0c12e475feb SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df
25 DIST gentoo-phantomjs-patchset-0.02.tar.bz2 8017 BLAKE2B 0bde29dab19ced08afeab0484e0d88f9fee35306ddba0aeda3cef158ad0f818a7f93f6d1462766399231513d1279dc1071bde4e82d82c67e156eaeb0c52d6f87 SHA512 88e8acb47842b108c4f01bc778c25d95011462b9d6732e6cca20372824a93321731d1976b19736a87d6e51737dffa0c76a15983d4b0739e97c7dc55ea065e791
26 -DIST phantomjs-1.9.8-source.zip 40965044 BLAKE2B f0ba4e7684539daf19b3f4c012ca680cbce8858ec1639714d14726e8234e4392d7239cd9f797471bdf3fdcf46ee81b006548891f645f5d71783a28a749c32616 SHA512 3692268a2706b097484ade500a2b24ce33d243b8ebbdf5ae8dea4b5e37adea5a84c11528e2862b9da71deb53cd14a985f1878d190a91c440632dd22cbfaf78fb
27 -DIST phantomjs-2.0.0-source.zip 110092872 BLAKE2B cbd27e1803801cfd8316effcf532f68fe03ce3ebee2b972c8ad2c909522e362b28d0054e73272d0eb0a1cb68a68a1942f2d04072b3e0524a8fa0fe84092ff6a9 SHA512 c8262353ee4daa842ef891b41e006baccf1815a99cf3262aeba457cfc37bbef6cb2ca234e69bd33a5446014fe802b3e35591e2eb0d49d8483c1f75bacf9d6f42
28 DIST phantomjs-2.1.1.tar.gz 1880406 BLAKE2B e54e8a1d42cdbf6fb98c90283a0ebcb4145350bc34d76b8a0d01163fcca15b7e6bbf7043e2d17bbf21c5d01e7fd0e76a4386f9c01dfc8727998f8d0f17da9291 SHA512 07b769133957c5194c9afdaa347bd9a019ebe47653f98adf17a35d3dd12714d2f8e3773ced91d7d99f31cb18d7f73167022d5b0a3906d9aac0732ef96341f5ec
29 DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 BLAKE2B 2fd956a2d8cb64e31bff107497191bc601048fe173fe3361a5baf3f5987c9dea035c9c1829595531c5d09eb5168acbabc10a361adea943e597daa781008212dd SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575
30 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
31
32 diff --git a/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch b/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch
33 deleted file mode 100644
34 index 7191050f265..00000000000
35 --- a/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch
36 +++ /dev/null
37 @@ -1,14 +0,0 @@
38 ---- a/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-01-24 08:19:52.000000000 +0600
39 -+++ b/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-09-24 18:18:45.598322592 +0600
40 -@@ -1909,6 +1909,11 @@
41 - }
42 - }
43 -
44 -+// Used in JSArray.cpp so we must instantiate explicit
45 -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
46 -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
47 -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
48 -+
49 - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
50 - {
51 - VM& vm = exec->vm();
52
53 diff --git a/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch b/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch
54 deleted file mode 100644
55 index 7c67e6b8ece..00000000000
56 --- a/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch
57 +++ /dev/null
58 @@ -1,12 +0,0 @@
59 ---- a/phantomjs-2.0.0/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/itab.py 2015-01-24 11:19:52.000000000 +0900
60 -+++ b/phantomjs-2.0.0/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/itab.py 2015-03-17 16:20:04.580191055 +0900
61 -@@ -314,8 +314,7 @@
62 - self.ItabH.write( "\n" )
63 -
64 - self.ItabH.write("\n/* itab entry operand definitions */\n");
65 -- operands = self.OperandDict.keys()
66 -- operands.sort()
67 -+ operands = sorted(self.OperandDict)
68 - for o in operands:
69 - self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" %
70 - (o, self.OperandDict[o][0] + ",", self.OperandDict[o][1]));
71
72 diff --git a/www-client/phantomjs/phantomjs-1.9.8.ebuild b/www-client/phantomjs/phantomjs-1.9.8.ebuild
73 deleted file mode 100644
74 index ba919e97795..00000000000
75 --- a/www-client/phantomjs/phantomjs-1.9.8.ebuild
76 +++ /dev/null
77 @@ -1,78 +0,0 @@
78 -# Copyright 1999-2015 Gentoo Foundation
79 -# Distributed under the terms of the GNU General Public License v2
80 -
81 -EAPI=5
82 -
83 -inherit toolchain-funcs pax-utils multiprocessing
84 -
85 -DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
86 -HOMEPAGE="http://phantomjs.org/"
87 -SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
88 -
89 -LICENSE="BSD"
90 -SLOT="0"
91 -KEYWORDS="amd64 x86"
92 -IUSE="examples"
93 -
94 -RDEPEND="dev-libs/icu:=
95 - dev-libs/openssl
96 - media-libs/fontconfig
97 - media-libs/freetype
98 - media-libs/gstreamer:0.10
99 - media-libs/gst-plugins-base:0.10"
100 -DEPEND="${RDEPEND}
101 - app-arch/unzip
102 - virtual/pkgconfig"
103 -
104 -src_prepare() {
105 - sed -i \
106 - -e '/^# CONFIG += text_breaking_with_icu/s:#::' \
107 - src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri \
108 - || die
109 -
110 - # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
111 - sed -i \
112 - -e "/^SYSTEM_VARIABLES=/i \
113 - CC='$(tc-getCC)'\n\
114 - CXX='$(tc-getCXX)'\n\
115 - CFLAGS='${CFLAGS}'\n\
116 - CXXFLAGS='${CXXFLAGS}'\n\
117 - LDFLAGS='${LDFLAGS}'\n\
118 - QMakeVar set QMAKE_CFLAGS_RELEASE\n\
119 - QMakeVar set QMAKE_CFLAGS_DEBUG\n\
120 - QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
121 - QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
122 - QMakeVar set QMAKE_LFLAGS_RELEASE\n\
123 - QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
124 - src/qt/configure \
125 - || die
126 -
127 - # Respect CC, CXX, LINK and *FLAGS in config.tests
128 - find src/qt/config.tests/unix -name '*.test' -type f -exec \
129 - sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
130 - 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
131 - 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
132 - {} + || die
133 -}
134 -
135 -src_compile() {
136 - ./build.sh \
137 - --confirm \
138 - --jobs $(makeopts_jobs) \
139 - --qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
140 - || die
141 -}
142 -
143 -src_test() {
144 - ./bin/phantomjs test/run-tests.js || die
145 -}
146 -
147 -src_install() {
148 - pax-mark m bin/phantomjs || die
149 - dobin bin/phantomjs
150 - dodoc ChangeLog README.md
151 - if use examples ; then
152 - docinto examples
153 - dodoc examples/*
154 - fi
155 -}
156
157 diff --git a/www-client/phantomjs/phantomjs-2.0.0-r1.ebuild b/www-client/phantomjs/phantomjs-2.0.0-r1.ebuild
158 deleted file mode 100644
159 index f02650d9658..00000000000
160 --- a/www-client/phantomjs/phantomjs-2.0.0-r1.ebuild
161 +++ /dev/null
162 @@ -1,83 +0,0 @@
163 -# Copyright 1999-2016 Gentoo Foundation
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=5
167 -
168 -USE_RUBY="ruby20 ruby21 ruby22"
169 -
170 -inherit eutils toolchain-funcs pax-utils multiprocessing ruby-single
171 -
172 -DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
173 -HOMEPAGE="http://phantomjs.org/"
174 -SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
175 -
176 -LICENSE="BSD"
177 -SLOT="0"
178 -KEYWORDS="~amd64 ~x86"
179 -IUSE="examples libressl"
180 -
181 -RDEPEND="dev-libs/icu:=
182 - !libressl? ( dev-libs/openssl:0 )
183 - libressl? ( dev-libs/libressl )
184 - media-libs/fontconfig
185 - media-libs/freetype
186 - media-libs/gstreamer:1.0
187 - media-libs/gst-plugins-base:1.0
188 - media-libs/libpng:0=
189 - virtual/jpeg:0"
190 -DEPEND="${RDEPEND}
191 - ${RUBY_DEPS}
192 - net-misc/openssh[-bindist]
193 - app-arch/unzip
194 - virtual/pkgconfig"
195 -
196 -src_prepare() {
197 - epatch "${FILESDIR}/phantomjs-python3-udis86-itab.patch"
198 - epatch "${FILESDIR}/phantomjs-gcc5-compile-fix.patch"
199 -
200 - # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
201 - sed -i \
202 - -e "/^SYSTEM_VARIABLES=/i \
203 - CC='$(tc-getCC)'\n\
204 - CXX='$(tc-getCXX)'\n\
205 - CFLAGS='${CFLAGS}'\n\
206 - CXXFLAGS='${CXXFLAGS}'\n\
207 - LDFLAGS='${LDFLAGS}'\n\
208 - QMakeVar set QMAKE_CFLAGS_RELEASE\n\
209 - QMakeVar set QMAKE_CFLAGS_DEBUG\n\
210 - QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
211 - QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
212 - QMakeVar set QMAKE_LFLAGS_RELEASE\n\
213 - QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
214 - src/qt/qtbase/configure \
215 - || die
216 -
217 - # Respect CC, CXX, LINK and *FLAGS in config.tests
218 - find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
219 - sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
220 - 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
221 - 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
222 - {} + || die
223 -}
224 -
225 -src_compile() {
226 - ./build.sh \
227 - --confirm \
228 - --jobs $(makeopts_jobs) \
229 - --qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
230 - || die
231 -}
232 -
233 -src_test() {
234 - ./bin/phantomjs test/run-tests.js || die
235 -}
236 -
237 -src_install() {
238 - pax-mark m bin/phantomjs || die
239 - dobin bin/phantomjs
240 - dodoc ChangeLog README.md
241 - if use examples ; then
242 - docinto examples
243 - dodoc examples/*
244 - fi
245 -}