Version bump.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

76 files changed, 1808 insertions, 38 deletions

diff --git a/dev-qt/assistant/ChangeLog b/dev-qt/assistant/ChangeLog
index ebd341b59e90..90036c9923c2 100644
--- a/dev-qt/assistant/ChangeLog
+++ b/dev-qt/assistant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/assistant
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.16 2014/11/15 02:31:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.17 2014/12/12 14:30:05 kensington Exp $
+
+*assistant-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +assistant-5.4.0.ebuild:
+  Version bump.
 
   15 Nov 2014; Davide Pesavento <pesa@gentoo.org> assistant-4.8.6-r1.ebuild:
   Sign manifest
diff --git a/dev-qt/assistant/assistant-5.4.0.ebuild b/dev-qt/assistant/assistant-5.4.0.ebuild
new file mode 100644
index 000000000000..7c64c43df876
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qthelp-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtprintsupport-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/assistant
+)
+
+src_prepare() {
+	qt_use_disable_mod webkit webkitwidgets \
+		src/assistant/assistant/assistant.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/designer/ChangeLog b/dev-qt/designer/ChangeLog
index 037c380be887..731385cac727 100644
--- a/dev-qt/designer/ChangeLog
+++ b/dev-qt/designer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/designer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.20 2014/11/15 02:34:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.21 2014/12/12 14:30:04 kensington Exp $
+
+*designer-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +designer-5.4.0.ebuild:
+  Version bump.
 
 *designer-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/designer/designer-5.4.0.ebuild b/dev-qt/designer/designer-5.4.0.ebuild
new file mode 100644
index 000000000000..183b1ffef27a
--- /dev/null
+++ b/dev-qt/designer/designer-5.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="declarative webkit"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtprintsupport-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtxml-${PV}:5[debug=]
+	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/designer
+)
+
+src_prepare() {
+	qt_use_disable_mod declarative quickwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist-tools/ChangeLog b/dev-qt/linguist-tools/ChangeLog
index 2681429903fe..7e4fd6f807ff 100644
--- a/dev-qt/linguist-tools/ChangeLog
+++ b/dev-qt/linguist-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/linguist-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/ChangeLog,v 1.4 2014/09/16 14:44:06 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/ChangeLog,v 1.5 2014/12/12 14:30:04 kensington Exp $
+
+*linguist-tools-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +linguist-tools-5.4.0.ebuild:
+  Version bump.
 
 *linguist-tools-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/linguist-tools/linguist-tools-5.4.0.ebuild b/dev-qt/linguist-tools/linguist-tools-5.4.0.ebuild
new file mode 100644
index 000000000000..a454cda23c1d
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Tools for working with Qt translation data files"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtxml-${PV}:5[debug=]
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist
+)
+
+src_prepare() {
+	sed -i -e '/SUBDIRS += linguist/d' \
+		src/linguist/linguist.pro || die
+
+	qt_use_disable_mod qml qmldevtools-private \
+		src/linguist/lupdate/lupdate.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/ChangeLog b/dev-qt/linguist/ChangeLog
index fc2cfaa0e059..307b85fb2b97 100644
--- a/dev-qt/linguist/ChangeLog
+++ b/dev-qt/linguist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/linguist
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/ChangeLog,v 1.19 2014/11/15 02:34:48 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/ChangeLog,v 1.20 2014/12/12 14:30:05 kensington Exp $
+
+*linguist-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +linguist-5.4.0.ebuild:
+  Version bump.
 
 *linguist-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/linguist/linguist-5.4.0.ebuild b/dev-qt/linguist/linguist-5.4.0.ebuild
new file mode 100644
index 000000000000..0504d800600e
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/designer-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtprintsupport-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtxml-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist/linguist
+)
diff --git a/dev-qt/pixeltool/ChangeLog b/dev-qt/pixeltool/ChangeLog
index 432cb649f40b..9723d6daf8ab 100644
--- a/dev-qt/pixeltool/ChangeLog
+++ b/dev-qt/pixeltool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/pixeltool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/ChangeLog,v 1.18 2014/11/15 02:35:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/ChangeLog,v 1.19 2014/12/12 14:30:05 kensington Exp $
+
+*pixeltool-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +pixeltool-5.4.0.ebuild:
+  Version bump.
 
 *pixeltool-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/pixeltool/pixeltool-5.4.0.ebuild b/dev-qt/pixeltool/pixeltool-5.4.0.ebuild
new file mode 100644
index 000000000000..54b63a857e34
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/pixeltool
+)
diff --git a/dev-qt/qdbus/ChangeLog b/dev-qt/qdbus/ChangeLog
index c8b70652e3d6..4831b715e6b4 100644
--- a/dev-qt/qdbus/ChangeLog
+++ b/dev-qt/qdbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qdbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/ChangeLog,v 1.4 2014/09/16 14:44:21 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/ChangeLog,v 1.5 2014/12/12 14:30:04 kensington Exp $
+
+*qdbus-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qdbus-5.4.0.ebuild:
+  Version bump.
 
 *qdbus-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qdbus/qdbus-5.4.0.ebuild b/dev-qt/qdbus/qdbus-5.4.0.ebuild
new file mode 100644
index 000000000000..bdaa0b6322ed
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Interface to Qt applications communicating over D-Bus"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtdbus-${PV}:5[debug=]
+	>=dev-qt/qtxml-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbus
+)
diff --git a/dev-qt/qdbusviewer/ChangeLog b/dev-qt/qdbusviewer/ChangeLog
index 2eea8b4d07e5..b9479b996358 100644
--- a/dev-qt/qdbusviewer/ChangeLog
+++ b/dev-qt/qdbusviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdbusviewer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/ChangeLog,v 1.17 2014/11/15 02:35:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/ChangeLog,v 1.18 2014/12/12 14:30:04 kensington Exp $
+
+*qdbusviewer-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qdbusviewer-5.4.0.ebuild:
+  Version bump.
 
 *qdbusviewer-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.4.0.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.4.0.ebuild
new file mode 100644
index 000000000000..ca74f2e0917c
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtdbus-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtxml-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbusviewer
+)
diff --git a/dev-qt/qdoc/ChangeLog b/dev-qt/qdoc/ChangeLog
index b48696045622..b8e2de8eec48 100644
--- a/dev-qt/qdoc/ChangeLog
+++ b/dev-qt/qdoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qdoc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/ChangeLog,v 1.2 2014/09/16 14:44:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/ChangeLog,v 1.3 2014/12/12 14:30:05 kensington Exp $
+
+*qdoc-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qdoc-5.4.0.ebuild:
+  Version bump.
 
 *qdoc-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qdoc/qdoc-5.4.0.ebuild b/dev-qt/qdoc/qdoc-5.4.0.ebuild
new file mode 100644
index 000000000000..58fe3e8e0e00
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtxml-${PV}[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qdoc
+)
diff --git a/dev-qt/qtconcurrent/ChangeLog b/dev-qt/qtconcurrent/ChangeLog
index 01e944c6ef03..96f3717a69c1 100644
--- a/dev-qt/qtconcurrent/ChangeLog
+++ b/dev-qt/qtconcurrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtconcurrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/ChangeLog,v 1.4 2014/09/16 14:44:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/ChangeLog,v 1.5 2014/12/12 14:30:05 kensington Exp $
+
+*qtconcurrent-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtconcurrent-5.4.0.ebuild:
+  Version bump.
 
 *qtconcurrent-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.4.0.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.4.0.ebuild
new file mode 100644
index 000000000000..8e8c8f3faeae
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index 3076d471d75d..235b2f758323 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.59 2014/11/20 02:48:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.60 2014/12/12 14:30:05 kensington Exp $
+
+*qtcore-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtcore-5.4.0.ebuild:
+  Version bump.
 
 *qtcore-5.3.2-r1 (20 Nov 2014)
 
diff --git a/dev-qt/qtcore/qtcore-5.4.0.ebuild b/dev-qt/qtcore/qtcore-5.4.0.ebuild
new file mode 100644
index 000000000000..f412423d9333
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libpcre-8.30[pcre16]
+	sys-libs/zlib
+	virtual/libiconv
+	icu? ( dev-libs/icu:= )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdbus/ChangeLog b/dev-qt/qtdbus/ChangeLog
index 729526690d73..115604710125 100644
--- a/dev-qt/qtdbus/ChangeLog
+++ b/dev-qt/qtdbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtdbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.17 2014/11/15 02:36:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.18 2014/12/12 14:30:05 kensington Exp $
+
+*qtdbus-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtdbus-5.4.0.ebuild:
+  Version bump.
 
 *qtdbus-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtdbus/qtdbus-5.4.0.ebuild b/dev-qt/qtdbus/qtdbus-5.4.0.ebuild
new file mode 100644
index 000000000000..4f885fb5799f
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="The D-Bus module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	>=sys-apps/dbus-1.4.20
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/dbus
+	src/tools/qdbusxml2cpp
+	src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+	:dbus
+	:dbus-linked:
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog
index e0a8cbc5e17d..c26b5a2666b3 100644
--- a/dev-qt/qtdeclarative/ChangeLog
+++ b/dev-qt/qtdeclarative/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdeclarative
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.18 2014/11/15 02:36:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.19 2014/12/12 14:30:04 kensington Exp $
+
+*qtdeclarative-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtdeclarative-5.4.0.ebuild:
+  Version bump.
 
 *qtdeclarative-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.4.0.ebuild
new file mode 100644
index 000000000000..e8d98adb003c
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qttest-${PV}:5[debug=]
+	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use localstorage || sed -i -e '/localstorage/d' \
+		src/imports/imports.pro || die
+
+	use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
+		src/qmltest/qmltest.pro || die
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/imports/imports.pro \
+		tests/auto/quick/quick.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdiag/ChangeLog b/dev-qt/qtdiag/ChangeLog
index ad037128f16e..79891cdb67f1 100644
--- a/dev-qt/qtdiag/ChangeLog
+++ b/dev-qt/qtdiag/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtdiag
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/ChangeLog,v 1.2 2014/09/16 14:45:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/ChangeLog,v 1.3 2014/12/12 14:30:05 kensington Exp $
+
+*qtdiag-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtdiag-5.4.0.ebuild:
+  Version bump.
 
 *qtdiag-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtdiag/qtdiag-5.4.0.ebuild b/dev-qt/qtdiag/qtdiag-5.4.0.ebuild
new file mode 100644
index 000000000000..b6e98d7ae8bf
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+opengl +ssl"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=,ssl=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
diff --git a/dev-qt/qtgraphicaleffects/ChangeLog b/dev-qt/qtgraphicaleffects/ChangeLog
index 7b00fa654574..036bd3ee6ae5 100644
--- a/dev-qt/qtgraphicaleffects/ChangeLog
+++ b/dev-qt/qtgraphicaleffects/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtgraphicaleffects
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/ChangeLog,v 1.5 2014/09/16 14:45:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/ChangeLog,v 1.6 2014/12/12 14:30:04 kensington Exp $
+
+*qtgraphicaleffects-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtgraphicaleffects-5.4.0.ebuild:
+  Version bump.
 
 *qtgraphicaleffects-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.0.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.0.ebuild
new file mode 100644
index 000000000000..f7493fe75f49
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build virtualx
+
+DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtdeclarative-${PV}:5[debug=]
+	>=dev-qt/qtxmlpatterns-${PV}:5[debug=]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtgui-${PV}:5[debug=] )
+"
+
+src_test() {
+	local VIRTUALX_COMMAND="qt5-build_src_test"
+	virtualmake
+}
diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 2d4676460728..88031f533cb0 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.49 2014/11/15 02:36:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.50 2014/12/12 14:30:05 kensington Exp $
+
+*qtgui-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtgui-5.4.0.ebuild:
+  Version bump.
 
 *qtgui-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtgui/qtgui-5.4.0.ebuild b/dev-qt/qtgui/qtgui-5.4.0.ebuild
new file mode 100644
index 000000000000..1e529021ef90
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.4.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+
+IUSE="accessibility egl eglfs evdev +gif gles2 +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+REQUIRED_USE="
+	egl? ( evdev opengl )
+	eglfs? ( egl )
+	gles2? ( opengl )
+	kms? ( egl gles2 )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}[debug=]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-libs/zlib
+	egl? ( media-libs/mesa[egl] )
+	evdev? ( sys-libs/mtdev )
+	gles2? ( media-libs/mesa[gles2] )
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
+	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	jpeg? ( virtual/jpeg:0 )
+	kms? (
+		media-libs/mesa[gbm]
+		virtual/libudev:=
+		x11-libs/libdrm
+	)
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	udev? ( virtual/libudev:= )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		>=x11-libs/libX11-1.5
+		>=x11-libs/libXi-1.6
+		x11-libs/libXrender
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+		accessibility? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	!:no-gui:
+	harfbuzz:system-harfbuzz:HARFBUZZ
+	!harfbuzz:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	kms:kms:
+	opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+)
+
+pkg_setup() {
+	use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
+	use ibus   && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
+	use xcb	   && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+}
+
+src_configure() {
+	local gl="-no-opengl"
+	if use gles2; then
+		gl="-opengl es2"
+	elif use opengl; then
+		gl="-opengl desktop"
+	fi
+
+	local myconf=(
+		$(use accessibility && use xcb && echo -dbus-linked)
+		$(use ibus && echo -dbus-linked)
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(use gif || echo -no-gif)
+		${gl}
+		$(qt_use harfbuzz harfbuzz system)
+		$(qt_use jpeg libjpeg system)
+		$(qt_use kms)
+		$(qt_use png libpng system)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 1b185ef1eccb..7f42e8e9b910 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qthelp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.25 2014/11/26 18:26:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.26 2014/12/12 14:30:04 kensington Exp $
+
+*qthelp-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qthelp-5.4.0.ebuild:
+  Version bump.
 
   26 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild:
   Restore mv of compat headers in src_unpack, accidentally deleted in the
diff --git a/dev-qt/qthelp/qthelp-5.4.0.ebuild b/dev-qt/qthelp/qthelp-5.4.0.ebuild
new file mode 100644
index 000000000000..f6152b0f8b2d
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="The Help module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/clucene
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats/ChangeLog b/dev-qt/qtimageformats/ChangeLog
index c3e35f0ad02e..a9cdd1dad9cd 100644
--- a/dev-qt/qtimageformats/ChangeLog
+++ b/dev-qt/qtimageformats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtimageformats
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/ChangeLog,v 1.3 2014/09/28 00:44:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/ChangeLog,v 1.4 2014/12/12 14:30:05 kensington Exp $
+
+*qtimageformats-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtimageformats-5.4.0.ebuild:
+  Version bump.
 
   28 Sep 2014; Davide Pesavento <pesa@gentoo.org> qtimageformats-5.3.2.ebuild:
   Add ~x86.
diff --git a/dev-qt/qtimageformats/qtimageformats-5.4.0.ebuild b/dev-qt/qtimageformats/qtimageformats-5.4.0.ebuild
new file mode 100644
index 000000000000..0ac88e017256
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/qtimageformats-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	media-libs/jasper
+	media-libs/libmng:=
+	media-libs/libwebp:=
+	media-libs/tiff:0
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog
index 3c977e44fa19..4ec32f77c60e 100644
--- a/dev-qt/qtmultimedia/ChangeLog
+++ b/dev-qt/qtmultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtmultimedia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.16 2014/11/15 02:37:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.17 2014/12/12 14:30:04 kensington Exp $
+
+*qtmultimedia-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtmultimedia-5.4.0.ebuild:
+  Version bump.
 
 *qtmultimedia-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild
new file mode 100644
index 000000000000..c684fdb39cc2
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-bad:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
+		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
+		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+	)
+"
+DEPEND="${RDEPEND}
+	x11-proto/videoproto
+"
+
+src_prepare() {
+	qt_use_compile_test alsa
+	qt_use_compile_test gstreamer
+	qt_use_compile_test openal
+	qt_use_compile_test pulseaudio
+
+	qt_use_disable_mod opengl opengl \
+		src/multimediawidgets/multimediawidgets.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtnetwork/ChangeLog b/dev-qt/qtnetwork/ChangeLog
index 34db2910f1e6..c138d4a6c6f7 100644
--- a/dev-qt/qtnetwork/ChangeLog
+++ b/dev-qt/qtnetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtnetwork
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/ChangeLog,v 1.4 2014/09/16 14:46:06 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/ChangeLog,v 1.5 2014/12/12 14:30:04 kensington Exp $
+
+*qtnetwork-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtnetwork-5.4.0.ebuild:
+  Version bump.
 
 *qtnetwork-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtnetwork/qtnetwork-5.4.0.ebuild b/dev-qt/qtnetwork/qtnetwork-5.4.0.ebuild
new file mode 100644
index 000000000000..9c933f627be6
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/qtnetwork-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="connman networkmanager +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	sys-libs/zlib
+	connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	ssl? ( dev-libs/openssl:0[-bindist] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(use connman || use networkmanager && echo -dbus-linked)
+		$(use ssl && echo -openssl-linked)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtopengl/ChangeLog b/dev-qt/qtopengl/ChangeLog
index c38d0b774517..5bd9bbc85661 100644
--- a/dev-qt/qtopengl/ChangeLog
+++ b/dev-qt/qtopengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtopengl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.18 2014/11/15 02:37:18 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.19 2014/12/12 14:30:05 kensington Exp $
+
+*qtopengl-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtopengl-5.4.0.ebuild:
+  Version bump.
 
 *qtopengl-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtopengl/qtopengl-5.4.0.ebuild b/dev-qt/qtopengl/qtopengl-5.4.0.ebuild
new file mode 100644
index 000000000000..a44e4fc0ca6b
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/opengl
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtpaths/ChangeLog b/dev-qt/qtpaths/ChangeLog
index e797300f740c..c9830befe688 100644
--- a/dev-qt/qtpaths/ChangeLog
+++ b/dev-qt/qtpaths/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtpaths
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/ChangeLog,v 1.2 2014/09/16 14:46:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/ChangeLog,v 1.3 2014/12/12 14:30:05 kensington Exp $
+
+*qtpaths-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtpaths-5.4.0.ebuild:
+  Version bump.
 
 *qtpaths-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtpaths/qtpaths-5.4.0.ebuild b/dev-qt/qtpaths/qtpaths-5.4.0.ebuild
new file mode 100644
index 000000000000..7c6dcc18a3e0
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/qtpaths-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="Tool to query Qt path information"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtpositioning/ChangeLog b/dev-qt/qtpositioning/ChangeLog
index c1d2d2957311..322079df8fed 100644
--- a/dev-qt/qtpositioning/ChangeLog
+++ b/dev-qt/qtpositioning/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtpositioning
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/ChangeLog,v 1.1 2014/09/28 00:38:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/ChangeLog,v 1.2 2014/12/12 14:30:04 kensington Exp $
+
+*qtpositioning-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtpositioning-5.4.0.ebuild:
+  Version bump.
 
 *qtpositioning-5.3.2 (28 Sep 2014)
 
diff --git a/dev-qt/qtpositioning/qtpositioning-5.4.0.ebuild b/dev-qt/qtpositioning/qtpositioning-5.4.0.ebuild
new file mode 100644
index 000000000000..35f5a67988a5
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/qtpositioning-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtlocation"
+
+inherit qt5-build
+
+DESCRIPTION="Physical position determination library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: src/plugins/position/gypsy
+IUSE="geoclue qml"
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	geoclue? (
+		app-misc/geoclue:0
+		dev-libs/glib:2
+	)
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+"
+DEPEND="${RDEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/positioning
+	src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
+}
diff --git a/dev-qt/qtprintsupport/ChangeLog b/dev-qt/qtprintsupport/ChangeLog
index 12558f258e97..c117d6fb67f3 100644
--- a/dev-qt/qtprintsupport/ChangeLog
+++ b/dev-qt/qtprintsupport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtprintsupport
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.4 2014/09/16 14:46:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.5 2014/12/12 14:30:05 kensington Exp $
+
+*qtprintsupport-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtprintsupport-5.4.0.ebuild:
+  Version bump.
 
 *qtprintsupport-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild
new file mode 100644
index 000000000000..9f1560902e52
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="cups"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=]
+	~dev-qt/qtwidgets-${PV}[debug=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtquick1/ChangeLog b/dev-qt/qtquick1/ChangeLog
index 7a9cc686ac75..6e8a40c28ff9 100644
--- a/dev-qt/qtquick1/ChangeLog
+++ b/dev-qt/qtquick1/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtquick1
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.6 2014/10/06 09:54:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.7 2014/12/12 14:30:04 kensington Exp $
+
+*qtquick1-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtquick1-5.4.0.ebuild:
+  Version bump.
 
   06 Oct 2014; Michael Palimaka <kensington@gentoo.org> qtquick1-5.3.2.ebuild:
   dev-qt/qtwebkit:5 no longer has a widgets USE flag.
diff --git a/dev-qt/qtquick1/qtquick1-5.4.0.ebuild b/dev-qt/qtquick1/qtquick1-5.4.0.ebuild
new file mode 100644
index 000000000000..4d79f3205397
--- /dev/null
+++ b/dev-qt/qtquick1/qtquick1-5.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Legacy declarative framework for Qt4 compatibility for building dynamic user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="designer +opengl webkit xml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtscript-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	designer? (
+		>=dev-qt/designer-${PV}:5[debug=]
+		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+	)
+	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod designer designer \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod opengl opengl \
+		src/imports/imports.pro \
+		tools/qml/qml.pri
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/imports/imports.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/declarative/declarative.pro \
+		src/declarative/util/util.pri
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols/ChangeLog b/dev-qt/qtquickcontrols/ChangeLog
index 72d548b79d93..9edaeaf4437d 100644
--- a/dev-qt/qtquickcontrols/ChangeLog
+++ b/dev-qt/qtquickcontrols/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtquickcontrols
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/ChangeLog,v 1.4 2014/09/16 14:46:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/ChangeLog,v 1.5 2014/12/12 14:30:04 kensington Exp $
+
+*qtquickcontrols-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtquickcontrols-5.4.0.ebuild:
+  Version bump.
 
 *qtquickcontrols-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.4.0.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.4.0.ebuild
new file mode 100644
index 000000000000..608cb0c1f7b7
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/qtquickcontrols-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtdeclarative-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtscript/ChangeLog b/dev-qt/qtscript/ChangeLog
index 2c90716db6fb..b51bab0e427c 100644
--- a/dev-qt/qtscript/ChangeLog
+++ b/dev-qt/qtscript/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtscript
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.19 2014/11/15 02:37:51 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.20 2014/12/12 14:30:05 kensington Exp $
+
+*qtscript-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtscript-5.4.0.ebuild:
+  Version bump.
 
 *qtscript-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtscript/qtscript-5.4.0.ebuild b/dev-qt/qtscript/qtscript-5.4.0.ebuild
new file mode 100644
index 000000000000..19410f1d6d78
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Application scripting library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="scripttools"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	scripttools? (
+		>=dev-qt/qtgui-${PV}:5[debug=]
+		>=dev-qt/qtwidgets-${PV}:5[debug=]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod scripttools widgets \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtsensors/ChangeLog b/dev-qt/qtsensors/ChangeLog
index 59cf58963f96..3b4b9c4fd0ef 100644
--- a/dev-qt/qtsensors/ChangeLog
+++ b/dev-qt/qtsensors/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtsensors
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/ChangeLog,v 1.2 2014/09/28 00:45:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/ChangeLog,v 1.3 2014/12/12 14:30:04 kensington Exp $
+
+*qtsensors-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtsensors-5.4.0.ebuild:
+  Version bump.
 
   28 Sep 2014; Davide Pesavento <pesa@gentoo.org> qtsensors-5.3.2.ebuild:
   Add ~x86.
diff --git a/dev-qt/qtsensors/qtsensors-5.4.0.ebuild b/dev-qt/qtsensors/qtsensors-5.4.0.ebuild
new file mode 100644
index 000000000000..141a43e075b2
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/qtsensors-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Hardware sensor access library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialport/ChangeLog b/dev-qt/qtserialport/ChangeLog
index c3023f72b2bb..7d10e7a0a8f0 100644
--- a/dev-qt/qtserialport/ChangeLog
+++ b/dev-qt/qtserialport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtserialport
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/ChangeLog,v 1.4 2014/09/16 14:46:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/ChangeLog,v 1.5 2014/12/12 14:30:05 kensington Exp $
+
+*qtserialport-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtserialport-5.4.0.ebuild:
+  Version bump.
 
 *qtserialport-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtserialport/qtserialport-5.4.0.ebuild b/dev-qt/qtserialport/qtserialport-5.4.0.ebuild
new file mode 100644
index 000000000000..69c3e0038d19
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/qtserialport-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Serial port abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	virtual/udev
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index 1e2ad3efe489..7047e349f017 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtsql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.20 2014/11/15 02:38:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.21 2014/12/12 14:30:04 kensington Exp $
+
+*qtsql-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtsql-5.4.0.ebuild:
+  Version bump.
 
 *qtsql-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtsql/qtsql-5.4.0.ebuild b/dev-qt/qtsql/qtsql-5.4.0.ebuild
new file mode 100644
index 000000000000..8ef8384dd356
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit multilib qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql:= )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( virtual/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(use sqlite && echo -system-sqlite)
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsvg/ChangeLog b/dev-qt/qtsvg/ChangeLog
index 3de69cf278a7..163486298335 100644
--- a/dev-qt/qtsvg/ChangeLog
+++ b/dev-qt/qtsvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtsvg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.18 2014/11/15 02:38:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.19 2014/12/12 14:30:05 kensington Exp $
+
+*qtsvg-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtsvg-5.4.0.ebuild:
+  Version bump.
 
 *qtsvg-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtsvg/qtsvg-5.4.0.ebuild b/dev-qt/qtsvg/qtsvg-5.4.0.ebuild
new file mode 100644
index 000000000000..52b981d5f6c0
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtxml-${PV}:5[debug=] )
+"
diff --git a/dev-qt/qttest/ChangeLog b/dev-qt/qttest/ChangeLog
index 23d3e15b0107..9ed9c955339e 100644
--- a/dev-qt/qttest/ChangeLog
+++ b/dev-qt/qttest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qttest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.18 2014/11/15 02:38:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.19 2014/12/12 14:30:05 kensington Exp $
+
+*qttest-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qttest-5.4.0.ebuild:
+  Version bump.
 
 *qttest-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qttest/qttest-5.4.0.ebuild b/dev-qt/qttest/qttest-5.4.0.ebuild
new file mode 100644
index 000000000000..fe6c7b2c6dd8
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}[debug=]
+		~dev-qt/qtxml-${PV}[debug=]
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
diff --git a/dev-qt/qttranslations/ChangeLog b/dev-qt/qttranslations/ChangeLog
index 588ae8957a52..41eeb6d5994d 100644
--- a/dev-qt/qttranslations/ChangeLog
+++ b/dev-qt/qttranslations/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qttranslations
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.6 2014/11/15 02:38:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.7 2014/12/12 14:30:04 kensington Exp $
+
+*qttranslations-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qttranslations-5.4.0.ebuild:
+  Version bump.
 
 *qttranslations-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qttranslations/qttranslations-5.4.0.ebuild b/dev-qt/qttranslations/qttranslations-5.4.0.ebuild
new file mode 100644
index 000000000000..3c5c9eb83fca
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/linguist-tools-${PV}:5
+	>=dev-qt/qtcore-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 2d3478cf307a..c9ac0a227d80 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.21 2014/11/15 02:38:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.22 2014/12/12 14:30:04 kensington Exp $
+
+*qtwebkit-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtwebkit-5.4.0.ebuild:
+  Version bump.
 
 *qtwebkit-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild
new file mode 100644
index 000000000000..8a116400e298
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# TODO: qttestlib, geolocation, orientation/sensors
+
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${PV}:5[debug=,icu]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	media-libs/fontconfig:1.0
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	udev? ( virtual/udev )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
+	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use opengl       || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use qml          || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
+		Source/QtWebKit.pro || die
+	use udev         || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp         || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
+	# bug 458222
+	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebsockets/ChangeLog b/dev-qt/qtwebsockets/ChangeLog
index 71e9556adc10..1e91080a49d2 100644
--- a/dev-qt/qtwebsockets/ChangeLog
+++ b/dev-qt/qtwebsockets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwebsockets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.3 2014/09/16 14:47:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.4 2014/12/12 14:30:04 kensington Exp $
+
+*qtwebsockets-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtwebsockets-5.4.0.ebuild:
+  Version bump.
 
 *qtwebsockets-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.4.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.4.0.ebuild
new file mode 100644
index 000000000000..a826e87ca3f6
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/qtwebsockets-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog
index 213112279285..ce742a918f1e 100644
--- a/dev-qt/qtwidgets/ChangeLog
+++ b/dev-qt/qtwidgets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtwidgets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.5 2014/09/16 14:47:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.6 2014/12/12 14:30:05 kensington Exp $
+
+*qtwidgets-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtwidgets-5.4.0.ebuild:
+  Version bump.
 
 *qtwidgets-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.0.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.0.ebuild
new file mode 100644
index 000000000000..eb68cfcac748
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
+REQUIRED_USE="
+	gles2? ( opengl )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+)
+
+QT5_GENTOO_CONFIG=(
+	!:no-widgets:
+)
+
+src_configure() {
+	local gl="-no-opengl"
+	if use gles2; then
+		gl="-opengl es2"
+	elif use opengl; then
+		gl="-opengl desktop"
+	fi
+
+	local myconf=(
+		# copied from qtgui
+		${gl}
+		$(qt_use png libpng system)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon system)
+		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtx11extras/ChangeLog b/dev-qt/qtx11extras/ChangeLog
index c932035b6ade..6d88d76d7fac 100644
--- a/dev-qt/qtx11extras/ChangeLog
+++ b/dev-qt/qtx11extras/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtx11extras
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/ChangeLog,v 1.4 2014/09/16 14:47:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/ChangeLog,v 1.5 2014/12/12 14:30:05 kensington Exp $
+
+*qtx11extras-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtx11extras-5.4.0.ebuild:
+  Version bump.
 
 *qtx11extras-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtx11extras/qtx11extras-5.4.0.ebuild b/dev-qt/qtx11extras/qtx11extras-5.4.0.ebuild
new file mode 100644
index 000000000000..3bbd608d88ee
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/qtx11extras-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,xcb]
+	~dev-qt/qtwidgets-${PV}[debug=]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtxml/ChangeLog b/dev-qt/qtxml/ChangeLog
index 3c0d2c793b18..3ab4872cd69c 100644
--- a/dev-qt/qtxml/ChangeLog
+++ b/dev-qt/qtxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtxml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/ChangeLog,v 1.5 2014/09/16 14:48:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/ChangeLog,v 1.6 2014/12/12 14:30:04 kensington Exp $
+
+*qtxml-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org> +qtxml-5.4.0.ebuild:
+  Version bump.
 
 *qtxml-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtxml/qtxml-5.4.0.ebuild b/dev-qt/qtxml/qtxml-5.4.0.ebuild
new file mode 100644
index 000000000000..fef30766dcec
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/qtxml-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="SAX and DOM implementation library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}[debug=]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
diff --git a/dev-qt/qtxmlpatterns/ChangeLog b/dev-qt/qtxmlpatterns/ChangeLog
index 5d0e40819b4e..c095113a88df 100644
--- a/dev-qt/qtxmlpatterns/ChangeLog
+++ b/dev-qt/qtxmlpatterns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtxmlpatterns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.18 2014/11/15 02:39:06 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.19 2014/12/12 14:30:05 kensington Exp $
+
+*qtxmlpatterns-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtxmlpatterns-5.4.0.ebuild:
+  Version bump.
 
 *qtxmlpatterns-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.0.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.0.ebuild
new file mode 100644
index 000000000000..5bd6ccff95c7
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.0.ebuild,v 1.1 2014/12/12 14:30:05 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="XPath, XQuery, and XSLT support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"