[gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qttranslations/, dev-qt/qtmultimedia/, ...

[Davide Pesavento]

commit:     132aeff927c2edf4a78d3d88681e5c8ae3a998d3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 15:37:43 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 02:39:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=132aeff9

[Qt4] 4.8.6 version bump.

---
 dev-qt/assistant/Manifest                          |   1 +
 dev-qt/assistant/assistant-4.8.6.ebuild            |  61 +++++++
 dev-qt/designer/Manifest                           |   1 +
 dev-qt/designer/designer-4.8.6.ebuild              |  77 +++++++++
 dev-qt/linguist/Manifest                           |   1 +
 dev-qt/linguist/linguist-4.8.6.ebuild              |  47 ++++++
 dev-qt/pixeltool/Manifest                          |   1 +
 dev-qt/pixeltool/pixeltool-4.8.6.ebuild            |  41 +++++
 dev-qt/qdbusviewer/Manifest                        |   1 +
 dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild        |  47 ++++++
 dev-qt/qt3support/Manifest                         |   1 +
 dev-qt/qt3support/qt3support-4.8.6.ebuild          |  42 +++++
 dev-qt/qtbearer/Manifest                           |   1 +
 ...earer-4.8.9999.ebuild => qtbearer-4.8.6.ebuild} |   3 +-
 dev-qt/qtbearer/qtbearer-4.8.9999.ebuild           |   3 +-
 dev-qt/qtcore/Manifest                             |   1 +
 ...{qtcore-4.8.9999.ebuild => qtcore-4.8.6.ebuild} |  11 +-
 dev-qt/qtcore/qtcore-4.8.9999.ebuild               |  11 +-
 dev-qt/qtdbus/Manifest                             |   1 +
 dev-qt/qtdbus/qtdbus-4.8.6.ebuild                  |  50 ++++++
 dev-qt/qtdeclarative/Manifest                      |   1 +
 dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild    |  62 ++++++++
 dev-qt/qtdemo/Manifest                             |   1 +
 dev-qt/qtdemo/qtdemo-4.8.6.ebuild                  | 110 +++++++++++++
 dev-qt/qtgui/Manifest                              |   1 +
 ...gui-4.8.5-dont-crash-on-broken-GIF-images.patch |  43 +++++
 dev-qt/qtgui/qtgui-4.8.6.ebuild                    | 176 +++++++++++++++++++++
 dev-qt/qthelp/Manifest                             |   1 +
 dev-qt/qthelp/qthelp-4.8.6.ebuild                  | 124 +++++++++++++++
 dev-qt/qtmultimedia/Manifest                       |   1 +
 dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild      |  56 +++++++
 dev-qt/qtopengl/Manifest                           |   1 +
 dev-qt/qtopengl/qtopengl-4.8.6.ebuild              |  60 +++++++
 dev-qt/qtopenvg/Manifest                           |   1 +
 dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild              |  57 +++++++
 dev-qt/qtphonon/Manifest                           |   1 +
 dev-qt/qtphonon/qtphonon-4.8.6.ebuild              |  60 +++++++
 dev-qt/qtscript/Manifest                           |   1 +
 dev-qt/qtscript/qtscript-4.8.6.ebuild              |  47 ++++++
 dev-qt/qtsql/Manifest                              |   1 +
 dev-qt/qtsql/qtsql-4.8.6.ebuild                    |  68 ++++++++
 dev-qt/qtsvg/Manifest                              |   1 +
 dev-qt/qtsvg/qtsvg-4.8.6.ebuild                    |  58 +++++++
 dev-qt/qttest/Manifest                             |   1 +
 dev-qt/qttest/qttest-4.8.6.ebuild                  |  42 +++++
 dev-qt/qttranslations/Manifest                     |   1 +
 dev-qt/qttranslations/qttranslations-4.8.6.ebuild  |  36 +++++
 dev-qt/qtwebkit/Manifest                           |   1 +
 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild              |  80 ++++++++++
 dev-qt/qtxmlpatterns/Manifest                      |   1 +
 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild    |  45 ++++++
 51 files changed, 1523 insertions(+), 18 deletions(-)

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 2b38b87..fa6cd46 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c WHIRLPOOL 95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild b/dev-qt/assistant/assistant-4.8.6.ebuild
new file mode 100644
index 0000000..8508bf8
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+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"
+)
+
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src
+	tools"
+
+src_prepare() {
+	# bug 401173
+	use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+	qt4-build-multilib_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-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_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/Manifest b/dev-qt/designer/Manifest
index 2b38b87..fa6cd46 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c WHIRLPOOL 95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild
new file mode 100644
index 0000000..0b75a86
--- /dev/null
+++ b/dev-qt/designer/designer-4.8.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
+
+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}"
+
+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? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] )
+	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="tools/designer"
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src
+	tools"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	local plugin
+	for plugin in ${DESIGNER_PLUGINS}; do
+		use ${plugin} || sed -i -e "/\<${plugin}\>/d" \
+			tools/designer/src/plugins/plugins.pro || die
+	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-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_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 "${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
+	else
+		insinto "${QT4_HEADERDIR#${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/Manifest b/dev-qt/linguist/Manifest
index 2b38b87..fa6cd46 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c WHIRLPOOL 95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild b/dev-qt/linguist/linguist-4.8.6.ebuild
new file mode 100644
index 0000000..eec9dc2
--- /dev/null
+++ b/dev-qt/linguist/linguist-4.8.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+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}"
+
+QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src
+	tools"
+
+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-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_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/Manifest b/dev-qt/pixeltool/Manifest
index 2b38b87..fa6cd46 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c WHIRLPOOL 95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
new file mode 100644
index 0000000..9086ea0
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="Qt screen magnifier"
+
+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}"
+
+QT4_TARGET_DIRECTORIES="tools/pixeltool"
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src/corelib
+	src/gui
+	tools/pixeltool"
+
+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-multilib_src_configure
+}

diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 2b38b87..fa6cd46 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c WHIRLPOOL 95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
new file mode 100644
index 0000000..09d4d01
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+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}"
+
+QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src
+	tools/qdbus"
+
+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-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_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/qt3support/Manifest b/dev-qt/qt3support/Manifest
new file mode 100644
index 0000000..27884f4
--- /dev/null
+++ b/dev-qt/qt3support/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84

diff --git a/dev-qt/qt3support/qt3support-4.8.6.ebuild b/dev-qt/qt3support/qt3support-4.8.6.ebuild
new file mode 100644
index 0000000..4b4927c
--- /dev/null
+++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Qt3Support module for the Qt toolkit"
+
+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}"
+
+QT4_TARGET_DIRECTORIES="
+	src/qt3support
+	src/tools/uic3
+	tools/porting"
+
+QT4_EXTRACT_DIRECTORIES="
+	src
+	include
+	tools"
+
+src_configure() {
+	myconf+="
+		-qt3support
+		$(qt_use accessibility)"
+
+	qt4-build-multilib_src_configure
+}

diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
new file mode 100644
index 0000000..27884f4
--- /dev/null
+++ b/dev-qt/qtbearer/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84

diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
similarity index 96%
copy from dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
copy to dev-qt/qtbearer/qtbearer-4.8.6.ebuild
index b941bbc..8d2117e 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
@@ -33,8 +33,7 @@ QT4_EXTRACT_DIRECTORIES="
 	src/corelib
 	src/dbus
 	src/network
-	src/plugins/bearer
-	src/plugins/qpluginbase.pri"
+	src/plugins/bearer"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="

diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index b941bbc..8d2117e 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -33,8 +33,7 @@ QT4_EXTRACT_DIRECTORIES="
 	src/corelib
 	src/dbus
 	src/network
-	src/plugins/bearer
-	src/plugins/qpluginbase.pri"
+	src/plugins/bearer"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9e3bcf5..cb17a52 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.0.tar.xz 46643328 SHA256 07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab SHA512 8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42 WHIRLPOOL f167e8a284d0fc7d6d6fa8d457fc1ddfb6f78def728a4a6c3c83b2254964a01bb9052cd8e8bc1c0151e36eed43a3acfee74ff2133d1129920c38adb56dcd3787

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
similarity index 89%
copy from dev-qt/qtcore/qtcore-4.8.9999.ebuild
copy to dev-qt/qtcore/qtcore-4.8.6.ebuild
index 5353b1a..577f23a 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -47,8 +47,6 @@ QT4_TARGET_DIRECTORIES="
 
 QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 	include
-	src/plugins/plugins.pro
-	src/plugins/qpluginbase.pri
 	src/3rdparty/des
 	src/3rdparty/harfbuzz
 	src/3rdparty/md4
@@ -69,16 +67,15 @@ 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"
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
 
 	# bug 427782
 	sed -i -e "/^CPPFLAGS/s/-g//" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+		"${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"
+		"${S}"/configure || die "sed configure setBootstrapVariable failed"
 }
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 5353b1a..577f23a 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -47,8 +47,6 @@ QT4_TARGET_DIRECTORIES="
 
 QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 	include
-	src/plugins/plugins.pro
-	src/plugins/qpluginbase.pri
 	src/3rdparty/des
 	src/3rdparty/harfbuzz
 	src/3rdparty/md4
@@ -69,16 +67,15 @@ 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"
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}"/qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
 
 	# bug 427782
 	sed -i -e "/^CPPFLAGS/s/-g//" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+		"${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"
+		"${S}"/configure || die "sed configure setBootstrapVariable failed"
 }
 
 src_configure() {

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 9e3bcf5..cb17a52 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.0.tar.xz 46643328 SHA256 07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab SHA512 8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42 WHIRLPOOL f167e8a284d0fc7d6d6fa8d457fc1ddfb6f78def728a4a6c3c83b2254964a01bb9052cd8e8bc1c0151e36eed43a3acfee74ff2133d1129920c38adb56dcd3787

diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
new file mode 100644
index 0000000..cf203e4
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The DBus module for the Qt toolkit"
+
+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
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
+)
+
+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"
+
+src_configure() {
+	myconf+=" -dbus-linked"
+
+	qt4-build-multilib_src_configure
+}

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index eb43e0a..69d0204 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtdeclarative-opensource-src-5.3.0.tar.xz 17599904 SHA256 fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f SHA512 80adbd12a3de1e3cbdd21067b2d1345fc0f018643f5992275399afed0fac1d84e2bddf07c2e5323d22380969c92983142d7caa72f114a214d2b1afafa39e9262 WHIRLPOOL ff65a83e8968a384c669c62dd6db0ed13b606d450a0f45d14bde960c3b7984119cdd7b3106f8830e684b58a01c5de0562a194bb253f082d725cbbc3a1560269e

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
new file mode 100644
index 0000000..38e3027
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+
+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}"
+
+QT4_TARGET_DIRECTORIES="
+	src/declarative
+	src/imports
+	src/plugins/qmltooling
+	tools/qml
+	tools/qmlplugindump"
+
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src
+	tools
+	translations"
+
+QCONFIG_ADD="declarative"
+QCONFIG_DEFINE="QT_DECLARATIVE"
+
+pkg_setup() {
+	use webkit && QT4_TARGET_DIRECTORIES+="
+		src/3rdparty/webkit/Source/WebKit/qt/declarative"
+
+	qt4-build-multilib_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-declarative -no-gtkstyle
+		$(qt_use accessibility)
+		$(qt_use qt3support)
+		$(qt_use webkit)"
+	qt4-build-multilib_src_configure
+}

diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
new file mode 100644
index 0000000..27884f4
--- /dev/null
+++ b/dev-qt/qtdemo/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84

diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
new file mode 100644
index 0000000..db57ecf
--- /dev/null
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
+
+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 webkit xmlpatterns"
+
+DEPEND="
+	~dev-qt/designer-${PV}[aqua=,debug=]
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=]
+	~dev-qt/qthelp-${PV}[aqua=,debug=]
+	~dev-qt/qtscript-${PV}[aqua=,debug=]
+	~dev-qt/qtsql-${PV}[aqua=,debug=]
+	~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=] )
+	openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] )
+	phonon? (
+		kde? ( media-libs/phonon[aqua=] )
+		!kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
+	)
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+QT4_TARGET_DIRECTORIES="
+	demos
+	examples"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	doc/src/images
+	include
+	src
+	tools"
+
+src_prepare() {
+	qt4-build-multilib_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
+
+	# Remove bogus dependency on qt3support (bug 510042)
+	sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
+		examples/graphicsview/graphicsview.pro || die
+}
+
+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 webkit)
+		$(qt_use xmlpatterns)"
+
+	qt4-build-multilib_src_configure
+}
+
+src_install() {
+	insinto "${QT4_DOCDIR#${EPREFIX}}"/src
+	doins -r doc/src/images
+
+	qt4-build-multilib_src_install
+}

diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 9e3bcf5..cb17a52 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.0.tar.xz 46643328 SHA256 07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab SHA512 8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42 WHIRLPOOL f167e8a284d0fc7d6d6fa8d457fc1ddfb6f78def728a4a6c3c83b2254964a01bb9052cd8e8bc1c0151e36eed43a3acfee74ff2133d1129920c38adb56dcd3787

diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch b/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
new file mode 100644
index 0000000..d800caf
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch
@@ -0,0 +1,43 @@
+From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001
+From: Lars Knoll <lars.knoll@×××××.com>
+Date: Thu, 24 Apr 2014 15:33:27 +0200
+Subject: Don't crash on broken GIF images
+
+Broken GIF images could set invalid width and height
+values inside the image, leading to Qt creating a null
+QImage for it. In that case we need to abort decoding
+the image and return an error.
+
+Initial patch by Rich Moore.
+
+Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
+
+Task-number: QTBUG-38367
+Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
+Security-advisory: CVE-2014-0190
+Reviewed-by: Richard J. Moore <rich@×××.org>
+---
+ src/gui/image/qgifhandler.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
+index 3324f04..5199dd3 100644
+--- a/src/gui/image/qgifhandler.cpp
++++ b/src/gui/image/qgifhandler.cpp
+@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
+                     memset(bits, 0, image->byteCount());
+                 }
+ 
++                // Check if the previous attempt to create the image failed. If it
++                // did then the image is broken and we should give up.
++                if (image->isNull()) {
++                    state = Error;
++                    return -1;
++                }
++
+                 disposePrevious(image);
+                 disposed = false;
+ 
+-- 
+1.9.3
+

diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
new file mode 100644
index 0000000..bf01a8c
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+
+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="+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-admin/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=(
+	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
+	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
+	"${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226
+)
+
+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="
+	include
+	src
+	tools/qtconfig"
+
+pkg_setup() {
+	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"
+
+	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
+
+	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-multilib_pkg_setup
+}
+
+src_prepare() {
+	qt4-build-multilib_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)
+		-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-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_src_install
+
+	# 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
+
+	if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then
+		newicon tools/qtconfig/images/appicon.png qtconfig.png
+		make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+	fi
+}
+
+pkg_postinst() {
+	qt4-build-multilib_pkg_postinst
+
+	# raster is the default graphicssystem, set it on first install
+	eselect qtgraphicssystem set raster --use-old
+}

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index b6509e2..aa11979 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,3 +1,4 @@
 DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c WHIRLPOOL 95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
new file mode 100644
index 0000000..ff5f20b
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Help module for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
+	)"
+
+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}"
+
+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"
+
+pkg_setup() {
+	use compat && QT4_TARGET_DIRECTORIES+="
+		tools/assistant/compat
+		tools/assistant/compat/lib"
+
+	qt4-build-multilib_pkg_setup
+}
+
+src_unpack() {
+	qt4-build-multilib_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() {
+	use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
+
+	qt4-build-multilib_src_prepare
+
+	# prevent rebuild of QtCore and QtXml (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-multilib_src_configure
+}
+
+src_compile() {
+	qt4-build-multilib_src_compile
+
+	# this generates a top-level Makefile containing the targets
+	# used below to build and install the documentation
+	"${S}"/bin/qmake || 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-multilib_src_install
+
+	emake INSTALL_ROOT="${D}" install_qchdocs
+
+	# do not compress .qch files
+	docompress -x "${QT4_DOCDIR}"/qch
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs
+	fi
+
+	if use compat; then
+		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
+		doins tools/assistant/compat/features/assistant.prf
+	fi
+}

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index c76887e..8450c91 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtmultimedia-opensource-src-5.3.0.tar.xz 3186260 SHA256 9f30b9f0f758c44db4743d2de409cfa0aef297bc6b81c929b1875dfb638d517b SHA512 60c0289283cb2c1aca40833a0d0fccc8502dccd95c4a815b97875988563e5a72766ce0fcc6f2486aeb1925b15275cfd6045bc42ffd90935d2883bcecaa2f7401 WHIRLPOOL 789a0f584f62c48b480624495dabf31fcf2c1234cbc153c246ac8893e899ddf65884af8277a86cc622631b96c2da2943873acac57d8ac6b68d4af6367b3e397a

diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
new file mode 100644
index 0000000..d31a7a8
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+
+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"
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/multimedia"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	include/Qt
+	include/QtCore
+	include/QtGui
+	include/QtMultimedia
+	src/corelib
+	src/gui"
+
+QCONFIG_ADD="multimedia"
+QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+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-multilib_src_configure
+}

diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 9e3bcf5..cb17a52 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.0.tar.xz 46643328 SHA256 07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab SHA512 8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42 WHIRLPOOL f167e8a284d0fc7d6d6fa8d457fc1ddfb6f78def728a4a6c3c83b2254964a01bb9052cd8e8bc1c0151e36eed43a3acfee74ff2133d1129920c38adb56dcd3787

diff --git a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
new file mode 100644
index 0000000..11b887b
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The OpenGL module for the Qt toolkit"
+
+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=]
+	x11-libs/libX11
+	x11-libs/libXrender
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+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"
+
+src_configure() {
+	myconf+="
+		-opengl
+		$(qt_use qt3support)
+		$(qt_use egl)"
+
+	qt4-build-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_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/Manifest b/dev-qt/qtopenvg/Manifest
new file mode 100644
index 0000000..27884f4
--- /dev/null
+++ b/dev-qt/qtopenvg/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84

diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
new file mode 100644
index 0000000..e11f3af
--- /dev/null
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The OpenVG module for the Qt toolkit"
+
+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}"
+
+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"
+
+src_configure() {
+	myconf+="
+		-openvg -egl
+		$(qt_use qt3support)"
+
+	qt4-build-multilib_src_configure
+}
+
+src_install() {
+	qt4-build-multilib_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/Manifest b/dev-qt/qtphonon/Manifest
new file mode 100644
index 0000000..27884f4
--- /dev/null
+++ b/dev-qt/qtphonon/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84

diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
new file mode 100644
index 0000000..55db6be
--- /dev/null
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Phonon module for the Qt toolkit"
+
+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/qtcore-${PV}[aqua=,debug=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
+	!kde-base/phonon-kde
+	!kde-base/phonon-xine
+	!media-libs/phonon
+	!media-sound/phonon
+	aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+	!aqua? (
+		media-libs/gstreamer:0.10
+		media-plugins/gst-plugins-meta:0.10
+	)
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/phonon
+	src/plugins/phonon"
+
+QT4_EXTRACT_DIRECTORIES="
+	include
+	src"
+
+QCONFIG_ADD="phonon"
+
+pkg_setup() {
+	QCONFIG_DEFINE="QT_PHONON
+		$(use aqua || echo QT_GSTREAMER)"
+
+	qt4-build-multilib_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-phonon -phonon-backend
+		-no-opengl -no-svg
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)"
+
+	qt4-build-multilib_src_configure
+}

diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 986f44c..53eda7d 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtscript-opensource-src-5.3.0.tar.xz 2586396 SHA256 a86067103ffb4c307619aeaef68fbe25e7219ffd34b369e445cdd4deb4108390 SHA512 2191b72072055faf2bd2caee1607db4d910d8deb2eb8b3bde5d47b3e95a7db2d896988c0b6383e1140e879a20c4d57e7b5d03e5962689fc376440ccba495bbce WHIRLPOOL 1c378f0499440021ded1899930ea6afa464ffca46137a99b894914eec3d25e293eae55f873093fe3889b784771ca3b5bb0d3d38104a0d614534da8e7b99c1e64

diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild b/dev-qt/qtscript/qtscript-4.8.6.ebuild
new file mode 100644
index 0000000..33ef722
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The QtScript module for the Qt toolkit"
+
+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}"
+
+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"
+
+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-multilib_src_configure
+}

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 9e3bcf5..cb17a52 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.0.tar.xz 46643328 SHA256 07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab SHA512 8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42 WHIRLPOOL f167e8a284d0fc7d6d6fa8d457fc1ddfb6f78def728a4a6c3c83b2254964a01bb9052cd8e8bc1c0151e36eed43a3acfee74ff2133d1129920c38adb56dcd3787

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
new file mode 100644
index 0000000..05ad99c
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib qt4-build-multilib
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+
+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-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/sql
+	src/plugins/sqldrivers"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	include/Qt
+	include/QtCore
+	include/QtSql
+	src/corelib
+	src/plugins"
+
+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-multilib_src_configure
+}

diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index b9118f8..77f9ef1 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtsvg-opensource-src-5.3.0.tar.xz 1762676 SHA256 8006ca1cb13844772ac2926e662ab7a0eb16cb26157954cd415e0f6d641b4ed0 SHA512 c705c013fb1ddd754551c8ebc390e9fc4a38d1caf30b3e6307c4384bba71ef8463e6aa2035abb08562dcdd4581863dd25767cf23c7adf7470ded5646b38a2c57 WHIRLPOOL 0055e253739616b2dab27786463c0ce7f5ecaea57f6ddb56599315c58cb60de75a3235056a450feb3461a5e9c9702d3c466b38f07de4fe8cc4b10181903e0e4a

diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
new file mode 100644
index 0000000..6e4baef
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The SVG module for the Qt toolkit"
+
+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}"
+
+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"
+
+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-multilib_src_configure
+}

diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 9e3bcf5..cb17a52 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.3.0.tar.xz 46643328 SHA256 07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab SHA512 8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42 WHIRLPOOL f167e8a284d0fc7d6d6fa8d457fc1ddfb6f78def728a4a6c3c83b2254964a01bb9052cd8e8bc1c0151e36eed43a3acfee74ff2133d1129920c38adb56dcd3787

diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild b/dev-qt/qttest/qttest-4.8.6.ebuild
new file mode 100644
index 0000000..a0292cb
--- /dev/null
+++ b/dev-qt/qttest/qttest-4.8.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
+
+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}"
+
+QT4_TARGET_DIRECTORIES="
+	src/testlib"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	include/QtTest
+	include/QtCore
+	src/corelib"
+
+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-multilib_src_configure
+}

diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 9333226..1286b0c 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttranslations-opensource-src-5.3.0.tar.xz 1044260 SHA256 a4398d99ce7510ad13d0cb7df96aca8e13b978bdd6dc80447a5daffb06cc55cc SHA512 d41b1dc9c345c56c2a052af644b700f16f8ee5ed2a3fed68c1af2b5ea90549e03e5a4e0c41d5198168e9e301c41b31b3f3b71e664f9b84f7bfbfcf701c6a9005 WHIRLPOOL 7ba900dc0656556006606aa4bee9fca998ce24872d030e30569a91810b1c13b2f35c77f3ef0b83576dbb5333f1f565eea6955399204b3f7bd19d1208f144c9e9

diff --git a/dev-qt/qttranslations/qttranslations-4.8.6.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6.ebuild
new file mode 100644
index 0000000..77e8103
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-4.8.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="Translation files for the Qt toolkit"
+
+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}
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="translations"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	src
+	tools"
+
+src_configure() {
+	cd translations || die
+	"${QT4_BINDIR}"/qmake || die
+}
+
+src_compile() {
+	emake -C translations
+}

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index bb138d4..74495ae 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtwebkit-opensource-src-5.3.0.tar.xz 33351392 SHA256 ceb1aeeede1febddbc10c5c23e6bcb18a90a5eb4d162d6f0b5075ff4ff3ba335 SHA512 8a43f189012bf143c03322ebad4145f1b6629a836189450f1717e1f659893e5d44127979d0934e0d375fa8eac2be844ad4a99cdd219942945ec6edd2fca07681 WHIRLPOOL 7ef71c0b05f6640f0b9dc69f295930bd278369e52b45a04848239feaa9d8ac8d1b6f8b6e6240ae343c711172ca97840a896d392eb846c38f2e7931c66ab2a0f4

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
new file mode 100644
index 0000000..eb66856
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The WebKit module for the Qt toolkit"
+
+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"
+)
+
+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"
+
+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-multilib_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		-webkit
+		-system-sqlite
+		$(qt_use icu)
+		$(qt_use jit javascript-jit)
+		$(use gstreamer || echo -DENABLE_VIDEO=0)"
+
+	qt4-build-multilib_src_configure
+}

diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 4db7d1f..050a29c 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1 +1,2 @@
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtxmlpatterns-opensource-src-5.3.0.tar.xz 1314008 SHA256 ac66c182f28a3909dc939a111d2bf701056f6c68cecde54074c9c34637cdc988 SHA512 51d3408cf7eef14846a8a0aef7c6808cf00e94375963ba57d81d5361873c86b17ac6fa0245698e40d524f7536e8031591e2cd65465559f926ac4dd1ed994f416 WHIRLPOOL 2b81d41c8a3377b3764a21e4ef448870bd9351e35244a4401ff43f900fb6216216736bd997b48f6649939a4aadebcf34dcad85f5eef6c8f6f5cba35e746dbc91

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
new file mode 100644
index 0000000..9f6a15b
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The XmlPatterns module for the Qt toolkit"
+
+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}"
+
+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"
+
+src_configure() {
+	myconf+=" -xmlpatterns"
+
+	qt4-build-multilib_src_configure
+}