gentoo resync : 31.10.2017

3 files changed, 0 insertions, 185 deletions

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 5556905d1926..b1f0d0b85053 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -7,16 +7,12 @@ AUX qtwebkit-5.4.2-system-leveldb.patch 711 SHA256 791a952174e5b50b0fc2a0e7b12fd
 AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec
 AUX qtwebkit-5.6.2-icu-59.patch 4683 SHA256 45af86da2d8b0621b213668808aee4136022c5a16b8baae11367d98acd5838b2 SHA512 189b523c8ee6ae8b62b93e8a46319a2a656280a6aca476fc2bc04d8066f497a9fd3f18029659558bedf985ba7c500eb2d541c4140158e2410cc01db29612f356 WHIRLPOOL 838c887a0af099c6a22e4516a2aa24428c5266f2d0eb99e68ccf21aa4c0ce625cac2cd1d763ec6fcf6843fd7409fb79092643c4e7b2aedad7d2313590c9e47ef
 AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 SHA256 9d07ef5ebb167ef877c95c38ce0080c39338f2dac5e7adf5cb7e94d901781b55 SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d WHIRLPOOL e2073f06156d66b8bc5b57359ed173d61c9239383c0b0e5bdf928eb55b7747b4e7aa10721968bfce603c7adff8af46b02b4583a6ddb90fc0145607839e2f5624
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542
-DIST qtwebkit-opensource-src-5.6.2.tar.xz 35306252 SHA256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 SHA512 d3f795463c957b4927d61280df831d08282bf6c9e624cf1db2709ab56ab218eb028192a4efaef21e0bdb28edd42de8ec08995f37fc828bde99000cf6919c33c3 WHIRLPOOL 9667f2f68bb832fdf3f5de14da641afd3b71a0c270e436257bc37ae86ed7d8d3434cdcada3b8818ab73ac6866bd4a69892ae682618d6d6a00cccccd287bda4bf
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 SHA256 a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a WHIRLPOOL d2dce72777a6babb1c35025ff6d882b7f48895dca4425b9e29b099e45282e8538548a653f0757998d6a619d706544fad0363199d8979ccca94762ba39b6516bd
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 SHA256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 WHIRLPOOL 85bb21fb4ed3895c8d78d86a0725d650179b6d2bfea418cf8a54b98d8dac91f98a1423c78058feed54349ebb25fc934ecd82122413f22338b6d49083e21d41b9
 EBUILD qtwebkit-4.10.4.ebuild 3494 SHA256 6f68f93b4a4d441c0deb88b33df77220ade03ea8ade629888c363929671bcc65 SHA512 b639e4913d72e7da97992da94545af42cb4428c45b3265f9274c4fa76f2e440afb9f84ad30a7bc537716ed946ae72b997cde9f691020c1dcde0238654c0af14d WHIRLPOOL b2fd77022b2319cc718be314f232972503761cc169d88683a5ab9824bc8ab4e574eff24fff51b65ddb814decdc110b0bdad27b87b3b9af9d2b232c15d0c8df96
-EBUILD qtwebkit-4.8.6-r1.ebuild 1918 SHA256 94d69bdf14527dfc23e52d772b511536b1f5b3a68afd00c9f4b8512d892223bf SHA512 20a5647a270a7f72263921c2ea9144500e1e4019155bb27f92df6b72733d27acd7c6a4c848669e68339bd34c2f40b9397a770920e934a9a53bba49de46559d1a WHIRLPOOL aafc7a1c84cbc0d76c2af19c8334524a61eb8caf3c2c04c0ca7b61ebed88965453acf02f876b339f5a8006f6bc997b17b88eeeaf770f2be6f12ee245d456fe76
 EBUILD qtwebkit-4.8.7.ebuild 1884 SHA256 431c77f8be50833918d9b617a3b5e092cebe376b24dcec12e0d4cf4ab19ccc6f SHA512 162070940a680a8f9b3e9f008dd5f640a8e634443621edf878bdb7bec2f9725f48696ebc054455e099d2374d1f226031e02b571f3d45713541750d5061caca68 WHIRLPOOL 2465e8663d5d5ea90fe02041fbab2338d2b21148f8a0c9f1bc764731165480b22bfde6b5d3af01ed6c9921f6d5c98b6e2cc3b0990aefc21b2263b652976ad9f2
-EBUILD qtwebkit-5.6.2.ebuild 3262 SHA256 b7d7fa7adccac1873228bcae368f73355144d837dba57d9608b7f76428952a78 SHA512 25d3a1554d8c9f77b881dfb0a9fd97d420b009483ec1752f2a737c2302ae91a8577d238b37214f38c8b01b396475f02aaf7e0283c79953ad44310a2d7f7b200d WHIRLPOOL 48c8457a9161f0f46dac20daf2fbe8a9a00056ff6f977a7fb1f82b3c751239ce1cff0a739b449a0c9eadc2ad90678780971c5ac864f0576da574c94ff0d3d897
 EBUILD qtwebkit-5.7.1.ebuild 3544 SHA256 ffd1cbe63831e12da3e4fc0f30aff8944006c272ed80b47dd389b823032bc439 SHA512 e4159313513e9c8f628eae43fe1f5a4412c84de66ce52cb20b3a7dd8e5d18195f50c25408995987c3d5e9635e937a27a13d9642722677f1a1f4a3190991aaac5 WHIRLPOOL 4ee6fa8274b16fdfce4bb7cb9ad52243ea618cee432d0f078c7cf3b0a8e6e46f20766d1b9a6d5cbbf2be642648472a0041e9d2226d937db2040d71d7329f5dec
 EBUILD qtwebkit-5.9.1.ebuild 3499 SHA256 0d7a22016ae106e8096977e41796d68ac133ed1eb8e66b7246a859613438e2eb SHA512 051bbaa3ef288492e6f25e868269462325b13849ed0ccd7b0c5fffe07d9ac012980726e4c361a5676b5ba485a0fdbd396896836cf6c0f88971fd0f046b9d2301 WHIRLPOOL bce03b838faffab69e7547a699910d9e2a2449c42bf27d9ced857675e43edfd7616df5c4ef11ac982042e0b1384a87b99e42fe5772abbdfcb6ddd84c2a8911c0
 MISC ChangeLog 8577 SHA256 8c3013ae304b6073455ac7b762e164a240d9b7beadaa40b3734fb6316eccc569 SHA512 cc728a9137e7b1b07c0f54ce98d154400f678f32ae1fb9a50720f53a0659d8a3d1a44fe5e866f9d994e82f5c89ebfc3ccac12191a3cc3cc8e872cde1a01c56d0 WHIRLPOOL 6860249a4bf13d829e900dca2b7950cde91b143c9009515257dfa5a83045a7579f366e9118e07603a94579a87a32fb7e498e2c242d75222f68a74a03150325a9
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
deleted file mode 100644
index eb73229ec7df..000000000000
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="arm ia64 ppc ppc64"
-else
-	KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="icu +jit"
-
-# libxml2[!icu?] is needed for bugs 407315 and 411091
-DEPEND="
-	>=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/3rdparty/webkit/Source/JavaScriptCore
-	src/3rdparty/webkit/Source/WebCore
-	src/3rdparty/webkit/Source/WebKit/qt"
-
-QCONFIG_ADD="webkit"
-QCONFIG_DEFINE="QT_WEBKIT"
-
-src_prepare() {
-	# Remove -Werror from CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
-		src/3rdparty/webkit/Source/WebKit.pri || die
-
-	# Fix version number in generated pkgconfig file (bug 406443)
-	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
-		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
-	# Prevent automagic dependency on qt-mobility (bug 547350)
-	sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \
-		src/3rdparty/webkit/Source/WebCore/features.pri || die
-
-	if use icu; then
-		sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
-			src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
-	fi
-
-	qt4-build-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-webkit
-		-system-sqlite
-		$(qt_use icu)
-		$(qt_use jit javascript-jit)
-		-DENABLE_VIDEO=0
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
deleted file mode 100644
index a944be9499ba..000000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ppc64 x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	>=dev-libs/leveldb-1.18-r1
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	~dev-qt/qtcore-${PV}[icu]
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}
-	~dev-qt/qtwidgets-${PV}
-	media-libs/fontconfig:1.0
-	media-libs/libpng:0=
-	>=sys-libs/zlib-1.2.5
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-	opengl? ( ~dev-qt/qtopengl-${PV} )
-	orientation? ( ~dev-qt/qtsensors-${PV} )
-	printsupport? ( ~dev-qt/qtprintsupport-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	webchannel? ( ~dev-qt/qtwebchannel-${PV} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/rubygems
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-	"${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
-)
-
-src_prepare() {
-	# ensure bundled library cannot be used
-	rm -r Source/ThirdParty/leveldb || die
-
-	# bug 466216
-	sed -i -e '/CONFIG +=/s/rpath//' \
-		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
-		|| die
-
-	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod webchannel webchannel \
-		Source/WebKit2/Target.pri \
-		Source/WebKit2/WebKit2.pri
-
-	if use gstreamer010; then
-		PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
-	elif ! use gstreamer; then
-		PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
-	fi
-
-	# bug 562396
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
-	use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 458222
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	qt5-build_src_prepare
-}