summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-10-30 04:05:51 +1100
committerMichael Palimaka <kensington@gentoo.org>2015-11-01 01:29:09 +1100
commit2f38ee0ac7e073edbf0018b93b78e035081ff595 (patch)
treebe0dec6066b33a2d21f925858d4ec8626c9f7d0d /dev-qt
parentdev-python/autopep8: Add python3.5 support (diff)
downloadgentoo-2f38ee0ac7e073edbf0018b93b78e035081ff595.tar.gz
gentoo-2f38ee0ac7e073edbf0018b93b78e035081ff595.tar.bz2
gentoo-2f38ee0ac7e073edbf0018b93b78e035081ff595.zip
dev-qt: remove 4.8.5
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/assistant/assistant-4.8.5.ebuild65
-rw-r--r--dev-qt/designer/designer-4.8.5.ebuild84
-rw-r--r--dev-qt/linguist/linguist-4.8.5.ebuild51
-rw-r--r--dev-qt/pixeltool/pixeltool-4.8.5.ebuild45
-rw-r--r--dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild51
-rw-r--r--dev-qt/qt-meta/qt-meta-4.8.5.ebuild41
-rw-r--r--dev-qt/qt3support/qt3support-4.8.5.ebuild45
-rw-r--r--dev-qt/qtbearer/qtbearer-4.8.5.ebuild58
-rw-r--r--dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch114
-rw-r--r--dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch124
-rw-r--r--dev-qt/qtcore/qtcore-4.8.5-r2.ebuild178
-rw-r--r--dev-qt/qtdbus/qtdbus-4.8.5.ebuild53
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild76
-rw-r--r--dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild116
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch41
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch84
-rw-r--r--dev-qt/qtgui/qtgui-4.8.5-r4.ebuild216
-rw-r--r--dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch21
-rw-r--r--dev-qt/qthelp/qthelp-4.8.5-r2.ebuild127
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild60
-rw-r--r--dev-qt/qtopengl/qtopengl-4.8.5.ebuild64
-rw-r--r--dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild62
-rw-r--r--dev-qt/qtphonon/qtphonon-4.8.5.ebuild54
-rw-r--r--dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch12
-rw-r--r--dev-qt/qtscript/qtscript-4.8.5.ebuild62
-rw-r--r--dev-qt/qtsql/qtsql-4.8.5.ebuild73
-rw-r--r--dev-qt/qtsvg/qtsvg-4.8.5.ebuild61
-rw-r--r--dev-qt/qttest/qttest-4.8.5.ebuild45
-rw-r--r--dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch17
-rw-r--r--dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild83
-rw-r--r--dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild48
31 files changed, 0 insertions, 2231 deletions
diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild
deleted file mode 100644
index d08564ee00c..00000000000
--- a/dev-qt/assistant/assistant-4.8.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="webkit"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qthelp-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- # bug 401173
- use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
-
- qt4-build_src_prepare
-}
-
-src_configure() {
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
- $(qt_use webkit)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- doicon tools/assistant/tools/assistant/images/assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
-}
diff --git a/dev-qt/designer/designer-4.8.5.ebuild b/dev-qt/designer/designer-4.8.5.ebuild
deleted file mode 100644
index da1ffbdd5e1..00000000000
--- a/dev-qt/designer/designer-4.8.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS} kde"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
- phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] ) )
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/designer"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- local plugin
- for plugin in ${DESIGNER_PLUGINS}; do
- if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde ); then
- sed -i -e "/\<${plugin}\>/d" \
- tools/designer/src/plugins/plugins.pro || die
- fi
- done
-}
-
-src_configure() {
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
- fi
- doins "${S}"/tools/designer/src/lib/shared/*
- doins "${S}"/tools/designer/src/lib/sdk/*
-
- doicon tools/designer/src/designer/images/designer.png
- make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-}
diff --git a/dev-qt/linguist/linguist-4.8.5.ebuild b/dev-qt/linguist/linguist-4.8.5.ebuild
deleted file mode 100644
index 89e537dbe36..00000000000
--- a/dev-qt/linguist/linguist-4.8.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
- make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
-}
diff --git a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
deleted file mode 100644
index 0f74e18c896..00000000000
--- a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-build
-
-DESCRIPTION="Qt screen magnifier"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- !<dev-qt/qthelp-4.8.5:4
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/pixeltool"
- QT4_EXTRACT_DIRECTORIES="
- include
- src/corelib
- src/gui
- tools/pixeltool"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
deleted file mode 100644
index 233cfeb4089..00000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtdbus-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/qdbus"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
- make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
-}
diff --git a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild b/dev-qt/qt-meta/qt-meta-4.8.5.ebuild
deleted file mode 100644
index b812f55f6c2..00000000000
--- a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Cross-platform application development framework (metapackage)"
-HOMEPAGE="https://www.qt.io/"
-
-LICENSE="metapackage"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+dbus examples kde openvg +qt3support +webkit"
-
-DEPEND=""
-RDEPEND="
- >=dev-qt/assistant-${PV}:4
- >=dev-qt/designer-${PV}:4
- >=dev-qt/linguist-${PV}:4
- >=dev-qt/pixeltool-${PV}:4
- dbus? ( >=dev-qt/qdbusviewer-${PV}:4 )
- qt3support? ( >=dev-qt/qt3support-${PV}:4 )
- >=dev-qt/qtbearer-${PV}:4
- >=dev-qt/qtcore-${PV}:4
- dbus? ( >=dev-qt/qtdbus-${PV}:4 )
- >=dev-qt/qtdeclarative-${PV}:4
- examples? ( >=dev-qt/qtdemo-${PV}:4 )
- >=dev-qt/qtgui-${PV}:4
- >=dev-qt/qthelp-${PV}:4
- >=dev-qt/qtmultimedia-${PV}:4
- >=dev-qt/qtopengl-${PV}:4
- openvg? ( >=dev-qt/qtopenvg-${PV}:4 )
- kde? ( media-libs/phonon[qt4] )
- !kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) )
- >=dev-qt/qtscript-${PV}:4
- >=dev-qt/qtsql-${PV}:4
- >=dev-qt/qtsvg-${PV}:4
- >=dev-qt/qttest-${PV}:4
- webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
- >=dev-qt/qtxmlpatterns-${PV}:4
-"
diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild
deleted file mode 100644
index 62467da7547..00000000000
--- a/dev-qt/qt3support/qt3support-4.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Qt3Support module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/porting"
-
- QT4_EXTRACT_DIRECTORIES="
- src
- include
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -qt3support
- $(qt_use accessibility)"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
deleted file mode 100644
index 12788696a2f..00000000000
--- a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-IUSE="connman networkmanager"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtDBus
- include/QtNetwork
- src/corelib
- src/dbus
- src/network
- src/plugins/bearer
- src/plugins/qpluginbase.pri"
-
- QT4_TARGET_DIRECTORIES="
- src/plugins/bearer/generic
- $(use connman && echo src/plugins/bearer/connman)
- $(use networkmanager && echo src/plugins/bearer/networkmanager)"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(use connman || use networkmanager || echo -no-dbus)
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
- -no-cups -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch b/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch
deleted file mode 100644
index c472d4212ff..00000000000
--- a/dev-qt/qtcore/files/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@digia.com>
-Date: Thu, 7 Nov 2013 09:36:29 +0100
-Subject: Disallow deep or widely nested entity references.
-
-Nested references with a depth of 2 or greater will fail. References
-that partially expand to greater than 1024 characters will also fail.
-
-This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4.
-
-Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609
-Reviewed-by: Richard J. Moore <rich@kde.org>
-Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-
-diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
-index a1777c5..3904632 100644
---- a/src/xml/sax/qxml.cpp
-+++ b/src/xml/sax/qxml.cpp
-@@ -424,6 +424,10 @@ private:
- int stringValueLen;
- QString emptyStr;
-
-+ // The limit to the amount of times the DTD parsing functions can be called
-+ // for the DTD currently being parsed.
-+ int dtdRecursionLimit;
-+
- const QString &string();
- void stringClear();
- void stringAddC(QChar);
-@@ -492,6 +496,7 @@ private:
- void unexpectedEof(ParseFunction where, int state);
- void parseFailed(ParseFunction where, int state);
- void pushParseState(ParseFunction function, int state);
-+ bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage);
-
- Q_DECLARE_PUBLIC(QXmlSimpleReader)
- QXmlSimpleReader *q_ptr;
-@@ -2759,6 +2764,7 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
- useNamespacePrefixes = false;
- reportWhitespaceCharData = true;
- reportEntities = false;
-+ dtdRecursionLimit = 2;
- }
-
- QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
-@@ -5018,6 +5024,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype()
- }
- break;
- case Mup:
-+ if (dtdRecursionLimit > 0 && parameterEntities.size() > dtdRecursionLimit) {
-+ reportParseError(QString::fromLatin1(
-+ "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit));
-+ return false;
-+ }
- if (!parseMarkupdecl()) {
- parseFailed(&QXmlSimpleReaderPrivate::parseDoctype, state);
- return false;
-@@ -6627,6 +6638,37 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
- return false;
- }
-
-+bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage)
-+{
-+ const QString value = string();
-+ QMap<QString, int> referencedEntityCounts;
-+ foreach (QString entityName, entities.keys()) {
-+ for (int i = 0; i < value.size() && i != -1; ) {
-+ i = value.indexOf(entityName, i);
-+ if (i != -1) {
-+ // The entityName we're currently trying to find
-+ // was matched in this string; increase our count.
-+ ++referencedEntityCounts[entityName];
-+ i += entityName.size();
-+ }
-+ }
-+ }
-+
-+ foreach (QString entityName, referencedEntityCounts.keys()) {
-+ const int timesReferenced = referencedEntityCounts[entityName];
-+ const QString entityValue = entities[entityName];
-+ if (entityValue.size() * timesReferenced > 1024) {
-+ if (errorMessage) {
-+ *errorMessage = QString::fromLatin1("The XML entity \"%1\""
-+ "expands too a string that is too large to process when "
-+ "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced);
-+ }
-+ return true;
-+ }
-+ }
-+ return false;
-+}
-+
- /*
- Parse a EntityDecl [70].
-
-@@ -6721,6 +6763,15 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
- switch (state) {
- case EValue:
- if ( !entityExist(name())) {
-+ QString errorMessage;
-+ if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) {
-+ // The entity at entityName is entityValue.size() characters
-+ // long in its unexpanded form, and was mentioned timesReferenced times,
-+ // resulting in a string that would be greater than 1024 characters.
-+ reportParseError(errorMessage);
-+ return false;
-+ }
-+
- entities.insert(name(), string());
- if (declHnd) {
- if (!declHnd->internalEntityDecl(name(), string())) {
---
-1.8.5.2
-
diff --git a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch b/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch
deleted file mode 100644
index 03ef64f22d8..00000000000
--- a/dev-qt/qtcore/files/CVE-2013-4549-02-fully-expand-entities.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@digia.com>
-Date: Tue, 12 Nov 2013 13:44:56 +0100
-Subject: Fully expand entities to ensure deep or widely nested ones fail
- parsing
-
-With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing
-entities whose partially expanded size was greater than 1024
-characters. That was not enough, so now we fully expand all entities.
-
-This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac.
-
-Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0
-Reviewed-by: Richard J. Moore <rich@kde.org>
-
-diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
-index 3904632..befa801 100644
---- a/src/xml/sax/qxml.cpp
-+++ b/src/xml/sax/qxml.cpp
-@@ -426,7 +426,9 @@ private:
-
- // The limit to the amount of times the DTD parsing functions can be called
- // for the DTD currently being parsed.
-- int dtdRecursionLimit;
-+ static const int dtdRecursionLimit = 2;
-+ // The maximum amount of characters an entity value may contain, after expansion.
-+ static const int entityCharacterLimit = 1024;
-
- const QString &string();
- void stringClear();
-@@ -496,7 +498,7 @@ private:
- void unexpectedEof(ParseFunction where, int state);
- void parseFailed(ParseFunction where, int state);
- void pushParseState(ParseFunction function, int state);
-- bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage);
-+ bool isExpandedEntityValueTooLarge(QString *errorMessage);
-
- Q_DECLARE_PUBLIC(QXmlSimpleReader)
- QXmlSimpleReader *q_ptr;
-@@ -2764,7 +2766,6 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
- useNamespacePrefixes = false;
- reportWhitespaceCharData = true;
- reportEntities = false;
-- dtdRecursionLimit = 2;
- }
-
- QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
-@@ -6638,30 +6639,43 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
- return false;
- }
-
--bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage)
-+bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessage)
- {
-- const QString value = string();
-- QMap<QString, int> referencedEntityCounts;
-- foreach (QString entityName, entities.keys()) {
-- for (int i = 0; i < value.size() && i != -1; ) {
-- i = value.indexOf(entityName, i);
-- if (i != -1) {
-- // The entityName we're currently trying to find
-- // was matched in this string; increase our count.
-- ++referencedEntityCounts[entityName];
-- i += entityName.size();
-+ QMap<QString, int> literalEntitySizes;
-+ // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (int>) times.
-+ QMap<QString, QMap<QString, int> > referencesToOtherEntities;
-+ QMap<QString, int> expandedSizes;
-+
-+ // For every entity, check how many times all entity names were referenced in its value.
-+ foreach (QString toSearch, entities.keys()) {
-+ // The amount of characters that weren't entity names, but literals, like 'X'.
-+ QString leftOvers = entities.value(toSearch);
-+ // How many times was entityName referenced by toSearch?
-+ foreach (QString entityName, entities.keys()) {
-+ for (int i = 0; i < leftOvers.size() && i != -1; ) {
-+ i = leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i);
-+ if (i != -1) {
-+ leftOvers.remove(i, entityName.size() + 2);
-+ // The entityName we're currently trying to find was matched in this string; increase our count.
-+ ++referencesToOtherEntities[toSearch][entityName];
-+ }
- }
- }
-+ literalEntitySizes[toSearch] = leftOvers.size();
- }
-
-- foreach (QString entityName, referencedEntityCounts.keys()) {
-- const int timesReferenced = referencedEntityCounts[entityName];
-- const QString entityValue = entities[entityName];
-- if (entityValue.size() * timesReferenced > 1024) {
-+ foreach (QString entity, referencesToOtherEntities.keys()) {
-+ expandedSizes[entity] = literalEntitySizes[entity];
-+ foreach (QString referenceTo, referencesToOtherEntities.value(entity).keys()) {
-+ const int references = referencesToOtherEntities.value(entity).value(referenceTo);
-+ // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size.
-+ expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references;
-+ }
-+
-+ if (expandedSizes[entity] > entityCharacterLimit) {
- if (errorMessage) {
-- *errorMessage = QString::fromLatin1("The XML entity \"%1\""
-- "expands too a string that is too large to process when "
-- "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced);
-+ *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3).");
-+ *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit);
- }
- return true;
- }
-@@ -6764,10 +6778,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
- case EValue:
- if ( !entityExist(name())) {
- QString errorMessage;
-- if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) {
-- // The entity at entityName is entityValue.size() characters
-- // long in its unexpanded form, and was mentioned timesReferenced times,
-- // resulting in a string that would be greater than 1024 characters.
-+ if (isExpandedEntityValueTooLarge(&errorMessage)) {
- reportParseError(errorMessage);
- return false;
- }
---
-1.8.5.2
-
diff --git a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild
deleted file mode 100644
index d1dacc5bb49..00000000000
--- a/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+glib iconv icu qt3support ssl"
-
-DEPEND="
- sys-libs/zlib
- glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49:= )
- ssl? ( dev-libs/openssl:0 )
- !dev-qt/qttranslations:4
- !<x11-libs/cairo-1.10.2-r2
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
- "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
- "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
- "${FILESDIR}/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch"
- "${FILESDIR}/CVE-2013-4549-02-fully-expand-entities.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-
- # bug 427782
- sed -i -e "/^CPPFLAGS/s/-g//" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
- "${S}/configure" || die "sed configure setBootstrapVariable failed"
-}
-
-src_configure() {
- myconf+="
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use icu)
- $(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs
-
- # install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
-
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" \
- "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations failed"
- insinto "${QTTRANSDIR#${EPREFIX}}"
- doins translations/*.qm
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}"/44qt4
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}"/44qt4
-
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "failed to move qconfig.pri"
-
- # Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
- # TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
- else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die "sed for qconfig.h failed"
- fi
-
- QCONFIG_DEFINE="QT_ZLIB"
- install_qconfigs
-
- # remove .la files
- prune_libtool_files
-
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
- fix_includes
-}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
deleted file mode 100644
index d37d32d954b..00000000000
--- a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- >=sys-apps/dbus-1.2
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
- "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
-
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+=" -dbus-linked"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
deleted file mode 100644
index cba6eb61d1a..00000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
- ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
- qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- src/plugins/qmltooling
- tools/qml
- tools/qmlplugindump"
-
- if use webkit; then
- QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
- fi
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools
- translations"
-
- QCONFIG_ADD="declarative"
- QCONFIG_DEFINE="QT_DECLARATIVE"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -declarative -no-gtkstyle
- $(qt_use accessibility)
- $(qt_use qt3support)
- $(qt_use webkit)"
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # install private headers
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
- # ran for the 2nd time, need it for the updated headers
- fix_includes
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
- fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
deleted file mode 100644
index 2607b79b9ac..00000000000
--- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos"
-fi
-IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
-
-DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?]
- ~dev-qt/qthelp-${PV}[aqua=,debug=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?]
- ~dev-qt/qtsvg-${PV}[aqua=,debug=]
- ~dev-qt/qttest-${PV}[aqua=,debug=]
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
- opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
- openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
- phonon? (
- kde? ( media-libs/phonon[aqua=,qt4] )
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=,qt4] ) )
- )
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Array mapping USE flags to subdirs
- local flags_subdirs_map=(
- 'dbus'
- 'declarative:declarative'
- 'multimedia:spectrum'
- 'opengl:boxes|glhypnotizer'
- 'openvg'
- 'phonon:mediaplayer'
- 'webkit:browser'
- 'xmlpatterns'
- )
-
- # Disable unwanted examples/demos
- for flag in "${flags_subdirs_map[@]}"; do
- if ! use ${flag%:*}; then
- einfo "Disabling ${flag%:*} examples"
- sed -i -e "/SUBDIRS += ${flag%:*}/d" \
- examples/examples.pro || die
-
- if [[ ${flag} == *:* ]]; then
- einfo "Disabling ${flag%:*} demos"
- sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
- demos/demos.pro || die
- fi
- fi
- done
-
- if ! use qt3support; then
- einfo "Disabling qt3support examples"
- sed -i -e '/QT_CONFIG, qt3support/d' \
- examples/graphicsview/graphicsview.pro || die
- fi
-}
-
-src_configure() {
- myconf+="
- $(qt_use dbus)
- $(qt_use declarative)
- $(qt_use multimedia) -no-audio-backend
- $(qt_use opengl)
- $(qt_use openvg)
- $(qt_use phonon) -no-phonon-backend
- $(qt_use qt3support)
- $(qt_use webkit)
- $(qt_use xmlpatterns)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- insinto "${QTDOCDIR#${EPREFIX}}"/src
- doins -r doc/src/images
-
- qt4-build_src_install
-}
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
deleted file mode 100644
index c975ebfaca2..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@digia.com>
-Date: Sat, 31 Aug 2013 21:22:47 +0200
-Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb
- layout."
-
-The change which attempted to fix QTBUG-15319 broke keyboard
-shortcuts for non latin keyboard layouts.
-
-This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
-regression.
-
-Task-number: QTBUG-32908
-
-Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/gui/kernel/qkeymapper_x11.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
-index 005ff3f..7daa41d 100644
---- a/src/gui/kernel/qkeymapper_x11.cpp
-+++ b/src/gui/kernel/qkeymapper_x11.cpp
-@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
-
- // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
- // always use them when determining the baseKeySym)
-- // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
-- // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
-- // See https://bugreports.qt-project.org/browse/QTBUG-15319 .
- KeySym baseKeySym;
- uint consumedModifiers;
-- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
-+ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
- &consumedModifiers, &baseKeySym))
- return QList<int>();
-
---
-1.8.3.2
-
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch b/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
deleted file mode 100644
index 47d35e23249..00000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f Mon Sep 17 00:00:00 2001
-From: aavit <eirik.aavitsland@digia.com>
-Date: Tue, 10 Sep 2013 11:46:51 +0200
-Subject: Compilation fix for libjpeg release 9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the latest libjpeg version, the "boolean" type is changed so that
-true and false no longer can be used instead of TRUE and FALSE.
-
-Also, purge some ancient code remains meant to support a now defunct
-OS´s idea about the boolean type.
-
-Task-number: QTBUG-33166
-Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4)
----
- src/gui/image/qjpeghandler.cpp | 27 +++++----------------------
- 1 file changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
-index a8700b7..ba5c469 100644
---- a/src/gui/image/qjpeghandler.cpp
-+++ b/src/gui/image/qjpeghandler.cpp
-@@ -157,11 +157,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
- } else {
- src->bytes_in_buffer = num_read;
- }
--#if defined(Q_OS_UNIXWARE)
-- return B_TRUE;
--#else
-- return true;
--#endif
-+ return TRUE;
- }
-
- static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-@@ -489,11 +485,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo)
- dest->next_output_byte = dest->buffer;
- dest->free_in_buffer = max_buf;
-
--#if defined(Q_OS_UNIXWARE)
-- return B_TRUE;
--#else
-- return true;
--#endif
-+ return TRUE;
- }
-
- static void qt_term_destination(j_compress_ptr cinfo)
-@@ -584,13 +576,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ
-
-
- int quality = sourceQuality >= 0 ? qMin(sourceQuality,100) : 75;
--#if defined(Q_OS_UNIXWARE)
-- jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);
-- jpeg_start_compress(&cinfo, B_TRUE);
--#else
-- jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */);
-- jpeg_start_compress(&cinfo, true);
--#endif
-+ jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-+ jpeg_start_compress(&cinfo, TRUE);
-
- row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components];
- int w = cinfo.image_width;
-@@ -751,11 +738,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
- err.error_exit = my_error_exit;
-
- if (!setjmp(err.setjmp_buffer)) {
-- #if defined(Q_OS_UNIXWARE)
-- (void) jpeg_read_header(&info, B_TRUE);
-- #else
-- (void) jpeg_read_header(&info, true);
-- #endif
-+ (void) jpeg_read_header(&info, TRUE);
-
- int width = 0;
- int height = 0;
---
-2.0.0
-
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
deleted file mode 100644
index 4a61205cd3a..00000000000
--- a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
- gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
- app-eselect/eselect-qtgraphicssystem
- ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/jpeg:0
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- cups? ( net-print/cups )
- egl? ( media-libs/mesa[egl] )
- glib? ( dev-libs/glib:2 )
- gtkstyle? (
- x11-libs/cairo[-qt4(-)]
- x11-libs/gtk+:2[aqua=]
- )
- mng? ( >=media-libs/libmng-1.0.9:= )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
- !<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
- !aqua? (
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
- xv? ( x11-proto/videoproto )
- )
-"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=(
- "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
- "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
- "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124
- "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
- "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
- "${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796
- "${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182
- "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
- "${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/imageformats/tga
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- examples/desktop/systray
- include
- src"
-
- use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
- use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
- use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
-
- # mac version does not contain qtconfig?
- [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Add -xvideo to the list of accepted configure options
- sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-src_configure() {
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nas nas-sound system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)
- $(qt_use xv xvideo)"
-
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- # bug 367045
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
- qt4-build_src_configure
-
- if use gtkstyle; then
- sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
- fi
-
- sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
-}
-
-src_install() {
- QCONFIG_ADD="
- mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
- fontconfig system-freetype gif png system-png jpeg system-jpeg
- $(usev accessibility)
- $(usev cups)
- $(use mng && echo system-mng)
- $(usev nas)
- $(usev nis)
- $(use tiff && echo system-tiff)
- $(usev xinerama)
- $(use xv && echo xvideo)"
- QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS)
- $(use egl && echo QT_EGL)
- QT_FONTCONFIG QT_FREETYPE
- $(use gtkstyle && echo QT_STYLE_GTK)
- QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS)
- $(use tiff && echo QT_IMAGEFORMAT_TIFF)
- QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
- $(use xinerama && echo QT_XINERAMA)
- QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
- $(use xv && echo QT_XVIDEO)"
-
- qt4-build_src_install
-
- # install private headers
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
- fi
- find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
-
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- # rerun to get links to headers right
- fix_includes
- fi
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
- echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
- newicon tools/qtconfig/images/appicon.png qtconfig.png
- make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-
- # bug 388551
- if use gtkstyle; then
- local tempfile=${T}/${PN}${SLOT}.sh
- cat <<-EOF > "${tempfile}"
- export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
- EOF
- insinto /etc/profile.d
- doins "${tempfile}"
- fi
-}
-
-pkg_postinst() {
- qt4-build_pkg_postinst
-
- # raster is the default graphicssystem, set it on first install
- eselect qtgraphicssystem set raster --use-old
-}
diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
deleted file mode 100644
index cc762196999..00000000000
--- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300
-+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300
-@@ -14,6 +14,8 @@
-
- PROJECTNAME = Assistant
-
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
- mainwindow.ui \
- tabbedbrowser.ui \
-@@ -59,6 +61,9 @@
- TARGET = Assistant_adp
- }
-
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
- translations/assistant_adp_ja.ts \
- translations/assistant_adp_pl.ts \
diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
deleted file mode 100644
index 6aff23ce120..00000000000
--- a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The Help module for the Qt toolkit"
-SRC_URI+="
- compat? (
- http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
- https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
- )"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="compat doc"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
- compat? (
- ~dev-qt/qtdbus-${PV}[aqua=,debug=]
- sys-libs/zlib
- )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- tools/assistant/lib/fulltextsearch
- tools/assistant/lib
- tools/assistant/tools/qhelpgenerator
- tools/assistant/tools/qcollectiongenerator
- tools/assistant/tools/qhelpconverter
- tools/qdoc3"
- QT4_EXTRACT_DIRECTORIES="
- demos
- doc
- examples
- include
- src
- tools"
-
- use compat && QT4_TARGET_DIRECTORIES+="
- tools/assistant/compat
- tools/assistant/compat/lib"
-
- qt4-build_pkg_setup
-}
-
-src_unpack() {
- qt4-build_src_unpack
-
- # compat version
- # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
- qt-assistant-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
- "${S}"/tools/assistant/compat || die
- mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
- fi
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
-
- # bug 348034
- sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-src_configure() {
- myconf+="
- -system-libpng -system-libjpeg -system-zlib
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
- -no-nas-sound -no-cups -no-nis -fontconfig"
-
- qt4-build_src_configure
-}
-
-src_compile() {
- # help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
- export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
- qt4-build_src_compile
-
- # ugly hack to build docs
- "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
-
- if use doc; then
- emake docs
- elif [[ ${QT4_BUILD_TYPE} == release ]]; then
- # live ebuild cannot build qch_docs, it will build them through emake docs
- emake qch_docs
- fi
-}
-
-src_install() {
- qt4-build_src_install
-
- emake INSTALL_ROOT="${D}" install_qchdocs
-
- # do not compress .qch files
- docompress -x "${QTDOCDIR}"/qch
-
- if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs
- fi
-
- if use compat; then
- insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features
- doins tools/assistant/compat/features/assistant.prf
- fi
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
deleted file mode 100644
index b1e129f7e69..00000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-IUSE="alsa"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-alsa.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/multimedia"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtGui
- include/QtMultimedia
- src/src.pro
- src/corelib
- src/gui"
-
- QCONFIG_ADD="multimedia"
- QCONFIG_DEFINE="QT_MULTIMEDIA"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -multimedia -audio-backend
- $(qt_use alsa)
- -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
- -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
deleted file mode 100644
index 683afb554ba..00000000000
--- a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="egl qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
- virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -opengl
- $(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
-}
-
-src_install() {
- qt4-build_src_install
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
-}
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
deleted file mode 100644
index db2fdd76efc..00000000000
--- a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="qt3support"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
- media-libs/mesa[egl,openvg]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/openvg
- src/plugins/graphicssystems/openvg"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenVG
- src/corelib
- src/gui
- src/openvg
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="openvg"
- QCONFIG_DEFINE="QT_OPENVG"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- gltype="desktop"
-
- myconf+="
- -openvg -egl
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
-}
diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
deleted file mode 100644
index b70091fdfdf..00000000000
--- a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="dbus qt3support"
-
-DEPEND="
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
- !kde-apps/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- !media-sound/phonon
- !aqua? ( media-libs/gstreamer:0.10
- media-plugins/gst-plugins-meta:0.10 )
- aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] )
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
-
- QCONFIG_ADD="phonon"
- QCONFIG_DEFINE="QT_PHONON
- $(use !aqua && echo QT_GSTREAMER)"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -phonon -phonon-backend -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch
deleted file mode 100644
index 35a157337cf..00000000000
--- a/dev-qt/qtscript/files/4.8.2-javascriptcore-x32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
---- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:17:21.328043461 +0200
-+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:42:13.699386250 +0200
-@@ -884,7 +884,7 @@
- #endif
-
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
-+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild
deleted file mode 100644
index af795b18649..00000000000
--- a/dev-qt/qtscript/qtscript-4.8.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The QtScript module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="iconv +jit"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" )
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/script"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtScript
- src/3rdparty/javascriptcore
- src/corelib"
-
- QCONFIG_ADD="script"
- QCONFIG_DEFINE="QT_SCRIPT"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(qt_use iconv)
- $(qt_use jit javascript-jit)
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
- -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
- -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild
deleted file mode 100644
index 6bc8acc2fef..00000000000
--- a/dev-qt/qtsql/qtsql-4.8.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit multilib qt4-build
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- firebird? ( dev-db/firebird )
- freetds? ( dev-db/freetds )
- mysql? ( virtual/mysql )
- oci8? ( dev-db/oracle-instantclient-basic )
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
- postgres? ( dev-db/postgresql )
- sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtSql
- src/src.pro
- src/corelib
- src/plugins
- src/tools/tools.pro"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(qt_use firebird sql-ibase plugin)
- $(qt_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
- $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
- $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
- $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
- -no-sql-db2
- -no-sql-sqlite2
- -no-sql-symsql
- $(qt_use qt3support)
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- -no-glib"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
deleted file mode 100644
index 23b3df6cce5..00000000000
--- a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg
- include/Qt
- include/QtGui
- include/QtCore
- include/QtXml
- src/corelib
- src/gui
- src/plugins
- src/xml
- src/3rdparty"
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -svg
- $(qt_use accessibility)
- -no-xkb -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild
deleted file mode 100644
index c712f12fd60..00000000000
--- a/dev-qt/qttest/qttest-4.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/testlib"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest
- include/QtCore
- src/corelib"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
- -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-svg"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
deleted file mode 100644
index d29d5da7f04..00000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200
-@@ -3,13 +3,6 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
-
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-- message(Using gold linker)
-- QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
--
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
- CONFIG += production
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
deleted file mode 100644
index d7de5b41734..00000000000
--- a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-build flag-o-matic
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+gstreamer icu +jit"
-
-# libxml2[!icu?] is needed for bugs 407315 and 411091
-DEPEND="
- dev-db/sqlite:3
- ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
- x11-libs/libX11
- x11-libs/libXrender
- gstreamer? (
- dev-libs/glib:2
- dev-libs/libxml2:2[!icu?]
- >=media-libs/gstreamer-0.10.36:0.10
- >=media-libs/gst-plugins-base-0.10.36:0.10
- )
- icu? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
- "${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
-
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- # 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
-
- # Remove -Werror from CXXFLAGS
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
- src/3rdparty/webkit/Source/WebKit.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_src_prepare
-}
-
-src_configure() {
- myconf+="
- -webkit
- -system-sqlite
- $(qt_use icu)
- $(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)"
-
- qt4-build_src_configure
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
deleted file mode 100644
index 5a446e92a77..00000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/xmlpatterns
- tools/xmlpatterns
- tools/xmlpatternsvalidator"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network
- src/xml
- src/corelib"
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+=" -xmlpatterns"
-
- qt4-build_src_configure
-}