gentoo resync : 11.02.2018

2 files changed, 102 insertions, 1 deletions

diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
index fec699ca175c..561bff00bb46 100644
--- a/www-client/phantomjs/Manifest
+++ b/www-client/phantomjs/Manifest
@@ -1,6 +1,7 @@
 AUX phantomjs-gcc5-compile-fix.patch 860 BLAKE2B ebfcae37b0fc84ea8080d9ec24783dd7baa2b57bc79bc32f6003bc3101c815603ef9276de7ce4a110fc5d26efa4033e0fe3bc55a6b46473682a552de1d4b4e5d SHA512 95838ebb8406fcecae852bca8ed95d8a18f194e2255603e1170c102ffdeb99d6134a34a3142e915437b71d845225676657ab28fb6ed8b744ddeafe75c83885c0
 AUX phantomjs-python3-udis86-itab.patch 664 BLAKE2B 6e12ad96e8489dfc4a1b1c221e1c160e04d7d3ab3fe5ce3e3b633e85063d13c3281dea22058421f9de79518e8f22c1e787adb71e971e272bc2cc455f32cdd43c SHA512 39f5803fe063953edb6fe848c2b12b3c2ba87224304ff49ad6798c8b3a9c7b99049ec24176efa54cf97c092fbfcce7c7676ef20e0ad16db1b86f69d158d972f2
-DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 SHA256 9715d61865b092721b7498be01b75b9d6541673f03d9aa7a29406262a5e20804 SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df WHIRLPOOL 7b0bceb762bfdab4f9d5f1bd6fa96c23c7b71ea153ed656333e12ea34069f9f86840a755cf19568d2243890f11d4cef486f2366d40792afa7e9ed25fdd0317e2
+DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 BLAKE2B 4a0fe19ae338ebb1846e2f04c3a6ea2f790d3835044d089304f7eba1d1f3bf0af41148d87b6f4a32103a5613cb1b470a8572189653bb3c38a64fb0c12e475feb SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df
+DIST gentoo-phantomjs-patchset-0.02.tar.bz2 8017 BLAKE2B 0bde29dab19ced08afeab0484e0d88f9fee35306ddba0aeda3cef158ad0f818a7f93f6d1462766399231513d1279dc1071bde4e82d82c67e156eaeb0c52d6f87 SHA512 88e8acb47842b108c4f01bc778c25d95011462b9d6732e6cca20372824a93321731d1976b19736a87d6e51737dffa0c76a15983d4b0739e97c7dc55ea065e791
 DIST phantomjs-1.9.8-source.zip 40965044 BLAKE2B f0ba4e7684539daf19b3f4c012ca680cbce8858ec1639714d14726e8234e4392d7239cd9f797471bdf3fdcf46ee81b006548891f645f5d71783a28a749c32616 SHA512 3692268a2706b097484ade500a2b24ce33d243b8ebbdf5ae8dea4b5e37adea5a84c11528e2862b9da71deb53cd14a985f1878d190a91c440632dd22cbfaf78fb
 DIST phantomjs-2.0.0-source.zip 110092872 BLAKE2B cbd27e1803801cfd8316effcf532f68fe03ce3ebee2b972c8ad2c909522e362b28d0054e73272d0eb0a1cb68a68a1942f2d04072b3e0524a8fa0fe84092ff6a9 SHA512 c8262353ee4daa842ef891b41e006baccf1815a99cf3262aeba457cfc37bbef6cb2ca234e69bd33a5446014fe802b3e35591e2eb0d49d8483c1f75bacf9d6f42
 DIST phantomjs-2.1.1.tar.gz 1880406 BLAKE2B e54e8a1d42cdbf6fb98c90283a0ebcb4145350bc34d76b8a0d01163fcca15b7e6bbf7043e2d17bbf21c5d01e7fd0e76a4386f9c01dfc8727998f8d0f17da9291 SHA512 07b769133957c5194c9afdaa347bd9a019ebe47653f98adf17a35d3dd12714d2f8e3773ced91d7d99f31cb18d7f73167022d5b0a3906d9aac0732ef96341f5ec
@@ -8,5 +9,6 @@ DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 BLAKE2B 2fd956a2d8cb64e31bff107
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
 EBUILD phantomjs-1.9.8.ebuild 1972 BLAKE2B fa8d56274e95fb425f003f9a4f74e21d0c46776e73695a817b29fc13f7ad331e50be3acfbf02da7549adc7c0755ced07392b3419d4875631f05e51ad44e1b4d5 SHA512 58cd58785d25d34aaebd091c73b8c50e4e8b974db1e77cf0cd4ec9929c07a54641f8bdcd825b1ad47a421b8dd91465b9aca65d9a2028b12e5445eea4c4a74fe2
 EBUILD phantomjs-2.0.0-r1.ebuild 2147 BLAKE2B 2604c350aa778d7dfa9b3f94170f178469459c052b40dc21736dcd61d8977b72f194994389a72936d91b8da11ba8d894a6a234fb48d1736ed9ad267282016dd3 SHA512 d8de3eb916fbd8219058c54c218bdc586df698bdb8e7bbcc7eed7de8c828e2c39771ee0c4d75ceeea62421f4d2bb8e6a2b35d1b91a07f29787d3f825842d7d96
+EBUILD phantomjs-2.1.1-r1.ebuild 2794 BLAKE2B 37c80004693ab37067d2bdee4168b30e1ce7ccf6e8c28f8a2abfad09bd1057b9987cd9b9f4093902a2b6a088e268a14bd83c0cfe8fd250c26e339dc799bce0ba SHA512 a526af772650a51ab635f7e714bda1449d0b43160107e306f55311d3305a345bf33e7873a2028378c7dccf954324383fbef4a740c2ee7c3f5fcab1d68fd572f9
 EBUILD phantomjs-2.1.1.ebuild 2794 BLAKE2B bd3410849ebbb936b26c844c10a77ca44fa0db2c74a599dea0b6483227f7fbccdacd44b013e23cdc139c3fa8b9196d5ba4404dc0d1db3c31a7c92cf7ffba3b7c SHA512 2e1f2a0bc357ab3e131c31a5c78ec7cf35284c19e9c714c3cf202c8a153b6d948eafff5e53fd95e54cafbce149044480f0d204db470bbfc124299c0a484cacab
 MISC metadata.xml 382 BLAKE2B 8f4b356d275737c3d790bdd8007f6edce0b9def238278ba810dcb4dc136738928aa2ed0e3a0f16fae2b9aeab18a3677bc452153381a50e82330bcd374f58323c SHA512 67e68f44de1b0a5554104a67d363c414ca0a03842633a0e08e9f1d8e30f8b0f19aea14185c0e791d945f047e319a137904f551058b37b5f7622bcafe343f82b5
diff --git a/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild b/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..c9a611bdeb3e
--- /dev/null
+++ b/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+QTB_PV="5.5.1"
+QTB_P="qtbase-opensource-src-${QTB_PV}"
+QTW_PV="5.7.1"
+QTW_P="qtwebkit-opensource-src-${QTW_PV}"
+
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
+HOMEPAGE="http://phantomjs.org/"
+SRC_URI="https://github.com/ariya/phantomjs/archive/${PV}.tar.gz -> ${P}.tar.gz
+	 https://download.qt.io/archive/qt/${QTB_PV%.*}/${QTB_PV}/submodules/${QTB_P}.tar.xz
+	 https://download.qt.io/community_releases/${QTW_PV%.*}/${QTW_PV}/${QTW_P}.tar.xz
+	 mirror://gentoo/gentoo-${PN}-patchset-0.02.tar.bz2"
+
+inherit eutils toolchain-funcs pax-utils multiprocessing
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples fontconfig libressl truetype"
+RESTRICT="mirror"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+RDEPEND="dev-libs/icu:=
+	fontconfig? ( media-libs/fontconfig )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	truetype? ( media-libs/freetype )
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	net-misc/openssh[-bindist]
+	app-arch/unzip
+	dev-lang/ruby
+	virtual/pkgconfig"
+
+src_prepare() {
+	ebegin "Moving third-party libraries into position for build"
+	mv -T "${WORKDIR}/${QTB_P}" "${S}/src/qt/qtbase/" || die "QT base ${QTB_PV} failed"
+	mv -T "${WORKDIR}/${QTW_P}" "${S}/src/qt/qtwebkit/" || die "QT webkit ${QTW_PV} failed"
+	eend "$?"
+
+	ebegin "Instilling C/CXX/LDFLAGS respect in main source"
+	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+	sed -i \
+		-e "/^SYSTEM_VARIABLES=/i \
+		CC='$(tc-getCC)'\n\
+		CXX='$(tc-getCXX)'\n\
+		CFLAGS='${CFLAGS}'\n\
+		CXXFLAGS='${CXXFLAGS}'\n\
+		LDFLAGS='${LDFLAGS}'\n\
+		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
+		src/qt/qtbase/configure \
+		|| die
+	eend $?
+
+	ebegin "Instilling C/CXX/LDFLAGS respect in test suite"
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		{} + || die
+	eend $?
+
+	default
+}
+
+src_compile() {
+	./build.py \
+		--confirm \
+		--jobs $(makeopts_jobs) \
+		|| die
+}
+
+src_test() {
+	./bin/phantomjs test/run-tests.js || die
+}
+
+src_install() {
+	pax-mark m bin/phantomjs || die
+	dobin bin/phantomjs
+	dodoc ChangeLog README.md
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}