Backport patch from upstream to solve CVE-2015-0295 wrt bug #541972.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 285 insertions, 18 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 9c5810187b7b..589f2fc5ee6a 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.61 2015/03/17 14:24:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.62 2015/03/17 14:41:53 kensington Exp $
+
+*qtgui-4.8.6-r2 (17 Mar 2015)
+*qtgui-4.8.5-r4 (17 Mar 2015)
+
+  17 Mar 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/qtgui-4.8.5-CVE-2015-0295.patch, +qtgui-4.8.5-r4.ebuild,
+  +qtgui-4.8.6-r2.ebuild, -qtgui-4.8.6-r1.ebuild:
+  Backport patch from upstream to solve CVE-2015-0295 wrt bug #541972.
 
 *qtgui-5.4.1-r1 (17 Mar 2015)
 
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 8676220bdfcc..31fe8d210e56 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
+AUX qtgui-4.8.5-CVE-2015-0295.patch 1619 SHA256 07bbb715bcb6d0a75f9b77c95b536ac8c8b8a3c3fcbe59470a19e56f0a193424 SHA512 42fca5fade432dabe987dced28147aa46104bb89fd8e05b365ce2f7178e8788f7fbbcd05b12eebed2b63c7ce694a125150d5598f9d1dedf1531376a492864ebc WHIRLPOOL d2c56391b598bfc93e7f01f63a7e24246acc0adfb79f1bcbfeb7f82628be7ce1753376c0c43c8ecd73e37569eced4286834406c2bd65dc9db621c2b70158b197
 AUX qtgui-4.8.5-cleanlooks-floating-point-exception.patch 1699 SHA256 739e0eb48e1797c7b2b67705378d1a1abe993b0930b1c1ca4092bb49165a73f5 SHA512 e404e0f6203bfe53859fb3f3043f11103e5fa4c99b16c5c1cd5310e61c2cf15d3ae1ae5425013e686eaaf5991bfe6db32701155afbcd26691fe88d82813e7b21 WHIRLPOOL 2843c7b3cd7c3d586044455545211f289d71fe66b556ac3189cf67356ac43b761f173e91093c422f24397d31d6725e6aef3c43c7cb3a4076312f6844d4377081
 AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 SHA256 9c0f263d4ebfefa1ee892badaed5a3640449863f0113884c9e1b19ba9ec5f324 SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14 WHIRLPOOL 0fb982a19e7a0acc5110aea534f8bab3509aaabe8a74ffa58f6b2d8f35a0eceb4ec9224d2acdcf03fc5291f065c89c860d10a6371c3022b7740f7416b9c5befa
 AUX qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch 1440 SHA256 f76ec92367e32cbff23b7fd5064ca7da4fa1146f458630b8897862072cbca554 SHA512 ce1a06dbb52f200b21621a4b7febbd2938d9fb2fa9117c7e1fd2e24283784d645b36bb79ebf411f07ecff774f8c4cde1fa5d27956e4f95f28e0181e5953817b3 WHIRLPOOL a4ee9986ab5df6a6c85282b7367afb2f1708b1a1f8b52e940fe09669bf2e9c6db0fd2cb1fe0b98df9a95a22ad2a6f35f7901d1521ea7acb798327716f53a3817
@@ -14,25 +15,26 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0
 DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
 EBUILD qtgui-4.8.5-r3.ebuild 6299 SHA256 d49aca808e9bfb951a2fcec3893c4d6f396c0719b284fe658f3cbbf6ad86a114 SHA512 5293d98e566e39f6f0f9130fbca7453aeff394643735a6206e60d7469300f5faaa29f14f4786cbc3539e16cb8569d2e0fe1c1d84706c7449e253a15d509eeb39 WHIRLPOOL 261fc5e58658a0a06f77980f5027d77f0d341ca17d4b59120a6599641ccccc746f5964e277cf4d2bb0233d18555dbf73fd1da82749082fc20a7f99ce7dda0239
-EBUILD qtgui-4.8.6-r1.ebuild 6103 SHA256 b4f7f3c899282aef7207fb66f8d077f8e67443b3e89e14277c161880355b1147 SHA512 4136a0d9dd7894e51dc3be5f63bf2137e8d099eaf4b2fb0d58e587a4c53da26fcad9ac33bd2e0bf02645cf43e6c64085bdaf7963364280410d1013d9046ff73b WHIRLPOOL ba69efbc58ec919a7abdece6437521d5e1965a1adda6732de969e41f60fc5efb0be3588f8f46b65d0c9c94f6fce7a97e0a2f9fada0d1f052d8c2250ca322c8c4
+EBUILD qtgui-4.8.5-r4.ebuild 6370 SHA256 a387530fae1939edd926cf42f26da1f97d7c23b83c9c16b2349884638a47badc SHA512 30196f864dc2a698a412fd166d3bc487c8aa253d8f8d21d9244e4aaee98755debf9e7ced5bbd3e8efa1a2716970e2f8d9978cc73f8f7a499bac4be5596111360 WHIRLPOOL b4eac393ec1180ca2fe2e8daaa9065e5de7eb46222aa68cc0dd8b482550f4d1f7a15627b3590138efa746bd78fff410eeca08bc1e4ebc17a2c10d2a81d57f786
+EBUILD qtgui-4.8.6-r2.ebuild 6169 SHA256 b18f06e3786e8776071606e0f6ce040db91e44c9dff861ed34219ac1dc78d08f SHA512 f7ffd0c7b325d81bb65f0e6cb24628fbe2234ae537ae0bff16299c9d2cb698620622d5f26d452d60902ef9d6fdc9c48dcb3eb897af45234d530c50a04944f761 WHIRLPOOL 70db7b0d6d1d7cf37db12d6359fbb482431eb85f79253d1e215202f9fe4bdb313896801bd724afb2d2805b1941ebfeeb22d2d4e89d7562c21a43030fe8a38b08
 EBUILD qtgui-5.4.1-r1.ebuild 3438 SHA256 808969499a1a19c849b30e495ff302b0c99cea08b5109878bc3ee5d56e371fb2 SHA512 19d61fdf25e5cc666d2d153e5dd365e20c8851cb8f42498520af2d9e72377b0ba02783ea5340bf0106e90469a745174ad4def1f4779d5276c2facb32ebff8af4 WHIRLPOOL 8954a8bd034d8d97bac92a63ba5136a2e56decea737a3d28364902aa4282c17baf6b30b5d8a90695862fb4c85dcd0b35bef68a130b63470958c3ce6b19100ae4
-MISC ChangeLog 41105 SHA256 60f7e2e735b7c8854934e46ffcafe4a3f3586e7d3989aaebdb82962fc4de6d31 SHA512 7a28bab6c20517283fb072101bf2e81a13f6f88279a64db3bf66994ddf8f57c7e7e41cf317bea10bb519f64686196248d54bc9a445d7ac5e7854f5fad4d52a6b WHIRLPOOL bca4fc1cbce5076e5f9b764b209da3712196c904ed8783d296fd9bc3c981589e792cb850f80d528b90b999dceb4965d6c6bec32ece792f60bbe4e5ea9f62c62c
+MISC ChangeLog 41410 SHA256 1924717bb9184ef05d62a5a305aba3f166066063461c9605b36e7cbcde9859da SHA512 46e4014a3ed15149fa646616bd9536ed467601d91ea5085d1aa01f3467e78ca7a0dde6777b0c29da4fe1fbdbb0a16f5d3af1d96b06ce752a179ce90ce0894950 WHIRLPOOL 2239e89f1eb84a0b142e9deb2646d816d0ad97fe548b1b0a6147f3e016918b0943a908084c5927d835187bd44fe6414f8676b35ed3f0744655ebc195c3c618a3
 MISC metadata.xml 1611 SHA256 da317017f121f7acacc658d65facb20779201ee298d329540d86b8c078050d4b SHA512 6f2a48dc6396a64ee1cc472de618f54d8653090e8f57cd7997f3ff8d6f5ade41af5204a92f99426b71986c3313675ec55c655de0c9475b066cc0fbd3b8933500 WHIRLPOOL 10cc6992a3505ee99485125e9988ee9a40d95ad670ed81be6fe3f1f47292a980ab97f14dbf551390dd67dfaaa92862fb106810ead8ea379e814eb97e1a067096
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVCDkMRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVCD0yRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7DZeEACKFXfX2Q/zkqd6zmnVACNB+JZ575IE6Sej3qSCeSZCNDJFM6E4/AqAOYEa
-5SLWVJlw1eNbHv0WFZBHo6lwi016AzaLKRt2nNckOQPyQqD93hSvOxt4L7h13m+u
-TAgk9sbFagRmmUcqLe5RTuq9Vg415VqfBu0XKPZY9jyatsgyYuqC/3butrIoaL8c
-qZRKQ5vIZA3dMhjtkXVbQOEfKpt43EXN6vhPe8b3p/odBoFC/h+dM4sR//C9K7Xq
-7Cw0MqBuN7R00PqUZ5Sx4xNgj6tvLlrBtoRG4xmEMl1/HDnD5fPBQwGbGi/Z7dgd
-q7HcJfHi1JppkzgLhvGN1s6kNb7RI+wJ26HlWE5aEGY91gXTtYeDjZemmwhNblIS
-HYZVD0IMa3lWJYg5rqDO9qSmYxlR+VH4vQmcsf81gnugsiQDmiGg/c576coFsd74
-+QJSKRqL5MHijsBz5qv0RixManlNJ2V/3PgaEzvh7G+PIfkNlp7N/lrhB7p83NTH
-HzgLdpgeoUZOvP8Aoyqmp7B1IrAbT4IYzXWGvnN9PU68UvXRU3JbCCnvr6gw3x1F
-kCvPm3mCh6QXJGHEMRv+cd/Nw2aj19SJVl6v+cJt6f7UvEbjP88t3UoTqizMWikf
-dRoKtb2uDE3M+AWxiJy2iEzOwh+yBZqNz8BAhbDzNJQbax0Dqg==
-=jpSN
+7L/nD/9jJFi3Yps+esuMJNEU+aVdCuLaUyWSDiN1hoMruK9YJa80As68TL4+hrae
+BlNpdc4QlbFa6Z72jzGulgOYIq223VpMrDTl408SvCqYO/Gh/sMP1CTfWuiEdMwD
+gJQNCHpFrZqW1hOn7m6JXYhfgrNBLbzYHdgYY1dfEwpx1Mq4muioPjPSt9GbMO68
+sWWiYTjlLsHiVK2tBxfSsQMJqQ9raRt6Zc9M5x4i8NWOg0y7m7CFfiOI1JlOHhdj
+7BR7QmR432qH8mXNKBZW10FLdQBRiHXs6cddJZecA/igzUAL8j6vdWk+E/rDsBj3
+WQFnAMvwPyhke+jRDntQmylZ0OaSxHj1Qk4iuuTanAE9detawJSNIdnEt3qUck7S
+ODjkIvbtNl0EZM33YUKNdDWPFmYBaqRNiJV0LnTkpHXfKTWURHd6BWeftJW6Kv67
+JrllYhYyWOaMKC8KXobH20mGn8blCxM/YUd61JHGmGRK00O0UtiQksZuki0Xqbde
+zAwql10F8rToopnd3efiEJC7+77ar8r3f+IDQFjGTZFhkn30uuhafonn/Zlcqudj
+6I5k47hVfsRk6zFgq3R7a18dA1LZY8EvtcXdPB//SwyUN7EK/2uigITjrEeGIMa6
+Idt2eCyu9IjIc1D8ZB+yeXpVflwVMreLO63YdeOb39uhvB09QQ==
+=LDi4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch
new file mode 100644
index 000000000000..3ac87d8dc369
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch
@@ -0,0 +1,40 @@
+From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001
+From: "Richard J. Moore" <rich@kde.org>
+Date: Tue, 24 Feb 2015 19:02:35 +0000
+Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
+
+This fixes a division by 0 when processing a maliciously crafted BMP
+file. No impact beyond DoS.
+
+Backport of 661f6bfd032dacc62841037732816a583640e187
+
+Task-number: QTBUG-44547
+Change-Id: I43f06e752b11cb50669101460902a82b885ae618
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/gui/image/qbmphandler.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
+index b22e842..30fa9e0 100644
+--- a/src/gui/image/qbmphandler.cpp
++++ b/src/gui/image/qbmphandler.cpp
+@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
+         }
+     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
+         red_shift = calc_shift(red_mask);
++        if (((red_mask >> red_shift) + 1) == 0)
++            return false;
+         red_scale = 256 / ((red_mask >> red_shift) + 1);
+         green_shift = calc_shift(green_mask);
++        if (((green_mask >> green_shift) + 1) == 0)
++            return false;
+         green_scale = 256 / ((green_mask >> green_shift) + 1);
+         blue_shift = calc_shift(blue_mask);
++        if (((blue_mask >> blue_shift) + 1) == 0)
++            return false;
+         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
+     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
+         blue_mask = 0x000000ff;
+-- 
+2.0.5
\ No newline at end of file
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
new file mode 100644
index 000000000000..2eb8b8cc58e3
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild,v 1.1 2015/03/17 14:41:53 kensington Exp $
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
+
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="+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=(
+	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
+	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
+	"${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124
+	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
+	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
+	"${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796
+	"${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182
+	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/imageformats/tga
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		examples/desktop/systray
+		include
+		src"
+
+	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
+	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
+	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
+
+	# mac version does not contain qtconfig?
+	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Add -xvideo to the list of accepted configure options
+	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
+}
+
+src_configure() {
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nas nas-sound system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use gtkstyle)
+		$(qt_use xinerama)
+		$(qt_use xv xvideo)"
+
+	myconf+="
+		-system-libpng -system-libjpeg -system-zlib
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
+
+	# bug 367045
+	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
+
+	qt4-build_src_configure
+
+	if use gtkstyle; then
+		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
+	fi
+
+	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
+}
+
+src_install() {
+	QCONFIG_ADD="
+		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		fontconfig system-freetype gif png system-png jpeg system-jpeg
+		$(usev accessibility)
+		$(usev cups)
+		$(use mng && echo system-mng)
+		$(usev nas)
+		$(usev nis)
+		$(use tiff && echo system-tiff)
+		$(usev xinerama)
+		$(use xv && echo xvideo)"
+	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS)
+			$(use egl && echo QT_EGL)
+			QT_FONTCONFIG QT_FREETYPE
+			$(use gtkstyle && echo QT_STYLE_GTK)
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS)
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
+			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
+			$(use xinerama && echo QT_XINERAMA)
+			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+			$(use xv && echo QT_XVIDEO)"
+
+	qt4-build_src_install
+
+	# install private headers
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
+	else
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+	fi
+	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
+
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		# rerun to get links to headers right
+		fix_includes
+	fi
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+
+	# bug 388551
+	if use gtkstyle; then
+		local tempfile=${T}/${PN}${SLOT}.sh
+		cat <<-EOF > "${tempfile}"
+		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
+		EOF
+		insinto /etc/profile.d
+		doins "${tempfile}"
+	fi
+}
+
+pkg_postinst() {
+	qt4-build_pkg_postinst
+
+	# raster is the default graphicssystem, set it on first install
+	eselect qtgraphicssystem set raster --use-old
+}
diff --git a/dev-qt/qtgui/qtgui-4.8.6-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.6-r2.ebuild
index b94369dc567b..0b44ca908e10 100644
--- a/dev-qt/qtgui/qtgui-4.8.6-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.6-r2.ebuild,v 1.1 2015/03/17 14:41:53 kensington Exp $
 
 EAPI=5
 
@@ -75,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
 	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
 	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
 )
 
 QT4_TARGET_DIRECTORIES="