[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     893b23bb814213d1c0465d97d14c9cbf74f48fce
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 11:40:26 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 11:40:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893b23bb

dev-qt/qtwebkit: Drop obsolete qtwebkit:4 packages

Bug: https://bugs.gentoo.org/620684
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-qt/qtwebkit/Manifest                           |   2 -
 dev-qt/qtwebkit/files/4.10.4-gcc5.patch            |  35 ------
 .../files/4.10.4-use-correct-icu-typedef.patch     |  40 -------
 .../qtwebkit/files/4.8.2-javascriptcore-x32.patch  |  11 --
 dev-qt/qtwebkit/metadata.xml                       |   2 -
 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild             | 125 ---------------------
 dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild              |  69 ------------
 7 files changed, 284 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 6e0d43c0adb..373025ecb9d 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtwebkit-2.3.4.tar.gz 51648808 BLAKE2B 6f7f7fa5cc40389ffca7871ef1db6b448b324bf7d6c9cd09738ab561c1dc16409d2e0979cf1b5c8db9efc24fc49fc603fd940c2bc6a815d2a9ef263aa1223a86 SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5

diff --git a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch
deleted file mode 100644
index 3a6b2a39c0e..00000000000
--- a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Fri, 6 Mar 2015 10:20:13 +0000 (+0100)
-Subject: Fix g++ 5.0 build
-X-Git-Tag: v5.4.2~12
-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=650c6ee8e76bb574d3a1bea09e2494992d8f070e;hp=f9966f351678351ee6b971d7b6b25a4987407e46
-
-Fix g++ 5.0 build
-
-A non-inline template needs to be explicitly instantiated if used
-outside the object where it is declared.
-
-Patch suggested by Khem Raj.
-
-Task-number: QTBUG-44829
-Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792
-Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
----
-
-diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
-index 5637e20..bd55919 100644
---- a/Source/JavaScriptCore/runtime/JSObject.cpp
-+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
-@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
-     }
- }
- 
-+// Used in JSArray.cpp so we must instantiate explicit
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
-     VM& vm = exec->vm();
-

diff --git a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch
deleted file mode 100644
index 3e4816255fe..00000000000
--- a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@flaska.net>
-Date: Tue, 3 Sep 2013 16:59:35 +0200
-Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002
-
-This fixes the build failure of qtwebkit23 on my Gentoo machine.
----
- Source/WTF/wtf/unicode/qt4/UnicodeQt4.h     |    2 +-
- Source/WTF/wtf/unicode/wchar/UnicodeWchar.h |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
-index a2d1ad4..392d2db 100644
---- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
-+++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
-@@ -69,7 +69,7 @@ typedef uint16_t UChar;
- #endif
- 
- #if !USE(ICU_UNICODE)
--typedef uint32_t UChar32;
-+typedef int32_t UChar32;
- #endif
- 
- namespace WTF {
-diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
-index 10c2026..db8944e 100644
---- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
-+++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
-@@ -31,7 +31,7 @@
- #include <wtf/unicode/UnicodeMacrosFromICU.h>
- 
- typedef wchar_t UChar;
--typedef uint32_t UChar32;
-+typedef int32_t UChar32;
- 
- namespace WTF {
- namespace Unicode {
--- 
-1.7.1
-

diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch
deleted file mode 100644
index 16f52d9cb07..00000000000
--- a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig	2012-07-17 15:06:26.692276108 +0000
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h	2012-07-17 15:06:54.480928701 +0000
-@@ -993,7 +993,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
-+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \
-     || (CPU(IA64) && !CPU(IA64_32)) \
-     || CPU(ALPHA) \
-     || CPU(SPARC64) \

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 885ad268a50..87f1ed33ba3 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>

diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
deleted file mode 100644
index 8a1810e3d7f..00000000000
--- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal
-
-MY_PV=${PV/4.10/2.3}
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-HOMEPAGE="https://www.qt.io/ http://trac.webkit.org/wiki/QtWebKit"
-SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="debug +gstreamer"
-
-RDEPEND="
-	>=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
-	dev-libs/libxslt[${MULTILIB_USEDEP}]
-	>=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}]
-	>=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}
-
-PATCHES=(
-	"${FILESDIR}/${PV}-gcc5.patch"
-	"${FILESDIR}/${PV}-use-correct-icu-typedef.patch"
-)
-
-src_prepare() {
-	# examples cause a sandbox violation (bug 458222)
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	# respect CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \
-		Source/WTF/WTF.pro \
-		Source/JavaScriptCore/Target.pri || die
-
-	# apply patches
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-multilib_src_compile() {
-	local -x \
-		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \
-		WEBKITOUTPUTDIR=${BUILD_DIR}
-
-	local myconf=(
-		"${S}"/Tools/Scripts/build-webkit
-		--qt
-		# tell the build system where to find the qmake binary for the current ABI
-		--qmake="$(qt4_get_bindir)"/qmake
-		--qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0"
-		--makeargs="${MAKEOPTS}"
-		--$(usex debug debug release)
-		--$(usex gstreamer video no-video)
-		# disable WebKit2 since it requires Qt5
-		--no-webkit2
-		# prevent automagic dependency on qt-mobility (bug 547350)
-		--no-geolocation
-		--no-device-orientation
-		--no-orientation-events
-		# copied from eqmake4
-		QMAKE_AR="'$(tc-getAR) cqs'"
-		QMAKE_CC="'$(tc-getCC)'"
-		QMAKE_CXX="'$(tc-getCXX)'"
-		QMAKE_LINK="'$(tc-getCXX)'"
-		QMAKE_LINK_C="'$(tc-getCC)'"
-		QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'"
-		QMAKE_RANLIB=
-		QMAKE_STRIP=
-		QMAKE_CFLAGS="'${CFLAGS}'"
-		QMAKE_CFLAGS_RELEASE=
-		QMAKE_CFLAGS_DEBUG=
-		QMAKE_CXXFLAGS="'${CXXFLAGS}'"
-		QMAKE_CXXFLAGS_RELEASE=
-		QMAKE_CXXFLAGS_DEBUG=
-		QMAKE_LFLAGS="'${LDFLAGS}'"
-		QMAKE_LFLAGS_RELEASE=
-		QMAKE_LFLAGS_DEBUG=
-	)
-	echo "${myconf[@]}"
-	"${myconf[@]}" || die
-}
-
-multilib_src_install() {
-	emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release)
-
-	# move pkgconfig file to the correct location
-	mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die
-}

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
deleted file mode 100644
index b3d1ba495de..00000000000
--- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
+++ /dev/null
@@ -1,69 +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} == release ]]; then
-	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-59:=[${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
-}