moved Qt's GTK style to x11-themes/qgtkstyle - this fixes the nasty qt-gui/cairo bug #336801

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 346 insertions, 15 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 99f7d9a14775..8c5a93ae8644 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.125 2010/11/09 15:47:19 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.126 2010/11/10 10:43:45 wired Exp $
+
+*qt-gui-4.7.1-r1 (10 Nov 2010)
+*qt-gui-4.6.3-r1 (10 Nov 2010)
+
+  10 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-gui-4.6.3-r1.ebuild,
+  +qt-gui-4.7.1-r1.ebuild:
+  moved Qt's GTK style to x11-themes/qgtkstyle - this fixes the nasty
+  qt-gui/cairo bug #336801
 
 *qt-gui-4.7.1 (09 Nov 2010)
 
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 54a5a151bfb5..eccf7b0e3235 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -13,26 +13,28 @@ DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eed
 EBUILD qt-gui-4.5.3-r2.ebuild 6122 RMD160 a6bcdfad1c798a825075c98416e3092af01271e6 SHA1 648459726c15f2eae1a5f884b924b9986272375b SHA256 39b0a0e7f7266adcb4acadbc455be2817836521302e30438dc9680f459dba2cc
 EBUILD qt-gui-4.6.2-r1.ebuild 5406 RMD160 2d1fffa346058e96ad5bb286f7da1fbb590c0c5a SHA1 d0ab4fe67490e083980dafdfe0f87b834bd00a6c SHA256 9b74117d6ae32f657902eb6a60a6e38fa2117c52b0f02a498257817ec9dafc41
 EBUILD qt-gui-4.6.2.ebuild 5278 RMD160 eada721c870c85bd495967649243a01b2988f0c0 SHA1 81e16ec0d5c6933238094891a636fabeff219abf SHA256 7e2eec54f7767bc1ce464f84b48e020de38388e37e60d29f5d6ba59009d4038d
+EBUILD qt-gui-4.6.3-r1.ebuild 5317 RMD160 92b3ac618441311296164871ae0e63ea6eb3a750 SHA1 d421b3b2acff831e9800afa375b4171c29bd15b4 SHA256 57bd556d53092c61c3a7d83a26935c6c9e96ba45b81949df493c5499cf033e60
 EBUILD qt-gui-4.6.3.ebuild 5383 RMD160 509c738771c1942c33bfe1807b201b2885003fef SHA1 81ee7cd0dcf8b3ddd07343567b8c0e82f65cc9dc SHA256 ff8258103b4deb9dff3fc04d33bc4bf15b691ed4e79e127ab04c1cbf3afb313b
 EBUILD qt-gui-4.7.0-r1.ebuild 5755 RMD160 e80835b6a9822839d7833a805f2043a5fe99fdfe SHA1 43ba02a86a0d89b58ba9a6df6b4ebcd3f0e0ea90 SHA256 8bec24382a8eff8efca575446b44c0cbf901ce86812525d46dda382de1498e5c
 EBUILD qt-gui-4.7.0.ebuild 5638 RMD160 c85c46fb886f5d99d00ef4fed9c3313e7f598c0c SHA1 d4aa761e03094877e67d0c5210cc24dd27b2a563 SHA256 97d5c633c762d10cce97f34888eb54cb9656c815fd8dad52940c5d8f65dd1f6a
+EBUILD qt-gui-4.7.1-r1.ebuild 5561 RMD160 178c8cff5837335525d6804c90cf9125750c2ab2 SHA1 35151d3ce5f0cb0e16fd5574df67555368b3449a SHA256 e0ad39c32880e3265ce6de07191209c34bb9fbee2ef62cd152334c240b96549a
 EBUILD qt-gui-4.7.1.ebuild 5636 RMD160 75cffc665d9c6d4398a3d29270b3ce1c46d3f8e5 SHA1 0a7f51f849f0f2ec0642722d913c93f903ffb5bf SHA256 c06915e80c7dba48c7c6db2f91a446addb78042e86b9ddedd4c691083431b4ed
-MISC ChangeLog 19063 RMD160 15a144d1b0a3d56db6f9c60cf0a7fd64dff0a822 SHA1 04ed55d34e9e1350ea1604ce740b6e1cea63dc5a SHA256 2986f1fba061b84e4a75b8e7d279904c8ea7e7fbc8965a6834f411bc62e60f63
+MISC ChangeLog 19325 RMD160 6f20ea0583fb7e1714e2cdbe1d753ba8e12a4fe6 SHA1 1b9167d33259f5a39c7d0be5f6ee9ac5e430d0f1 SHA256 746eb1f0571557cac7604aad0a3774bd4323ae8ca55a13ee2071be98d4b62f54
 MISC metadata.xml 1084 RMD160 bc1dd67f584f23b4dd4e5529f38b5f20921076f9 SHA1 c80b810f2a6aac61175e55274f9791439b48a1b4 SHA256 d96e2b40aa3339e1366105deb89479864167e3ce72f94d0aa907a07861abad4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM2W0jAAoJEDZF8K7rm0r6Qz4QAJZ+Vzpei5jWLfiVNHdo/WE3
-4hlUbtPnefZsja0QUPh2DmxMjur+vGhteFSGe19P1TYHxTUq7g42PJfKMI37ttqL
-trZbDUCjzHZN5HFmM3ejw5y8Lb1TlMj9GR1/2UED7KW1QBcMRtsTuHHaMWsl2eLf
-CWhP3j4EvaPdfQkrHPQ4uUE7Srl4ECquKTXOZqJg8U5ysP4fYky6wXbNmBRUmgQs
-AxA0iyoMKWCFM0TuJnz8nDkjJGwD95BDN0vMe3rNktEM1pmV8LCXe9bfyoRxBjoc
-C2Gt4F/6bjRCbsJcjNwsxZmMKoVO80Xar8ninKvmQqT01CLwuIVQBDUviDR6d824
-D5v1jdbA8Xp886uMfZVXMuDXuDui7k7fPuyq0J+uR3xhmH0XzBSJnIneTmr9f8Wd
-ZBQ1i/wBkKiLpti2eqNlDmGFOmJo1C1xJKcdeddSDEG7e2Fdxi78Lxi8DCqHWV+l
-iiBc6/McrH1Q5lwk0rIh2h9kgCtSxYmiQUlUCDPgXssW0Ye8LpuahQ174nWRcCF+
-Egpbs9DyK/QwZ0gosdbxl7iYT9LC4XqUCGmvm/qQLT9WVOIelbeSv/63scKsuWT8
-qWMTIiAWykIn9dsHegXqrzTedTe/VYlgqciFyw/RhkgZaoQfnNEUqui7jCoXSHiD
-dK0Pd51xQqWO/SpGsz0x
-=Xnch
+iQIcBAEBCAAGBQJM2nd4AAoJEDZF8K7rm0r67TsP/3fIOhg6Lxk0z8zjHZNNQLK3
+vtuadsIDG6sLVZNt2nPMOQVWy3O+4EJpnzpOa1ysZPKH+W9IVjTJCLHBToPBymkM
+ghTe0Oo+ZkzUwFR2Wbgor/ogP5GsbIXXwScMcNkihihgxmUy0mdRH653o1bw+IQ8
+DpmjZeeIn6sK5dxmKK3fVumdnx52qTGc2z/QqwQ3mKZ6RGJ9ziE9OvHiCkGkAmti
+S7hWerE0zVi7WOgIDvUTuxE2R1XGNHUx0nbwaeV3TN8YOrCUlpOnRKzEt2F+Mcvh
+SjpUswAU0a0JGf5ioAA9IVLrIDMEu6OcJGYNUsouT2yetVKGe7EzGDHLVZT3InOo
+DL6mGzCrAd+l3lam4L6smyfgr8VZ8x6A0S1lO7CkG3LQrktISR089pfxRwr+85Pw
+r+RXhe+Du0DC+AERWaj6j+mj20p4s/zvB0A7bf0sPJ/yiWZ9Kwz8YJp67bKzwxkb
+AQaQASqtuvqJAKXV9GbdNAww+jzB6gOL/f3qFiPy2YulFx5WIGi8Hisr/4SlrpTl
+CXOsLYL0wZO/fkGJDT9HDyEnCORGOamF9X5XdgQmRDGHu2WiL9BYu4Bmop4ktIXH
+UkYpBjxWIDQljVMH4L5l55Z2CS2UD1QaFgYYdxq/HtqpsmxQHmAGO4p4yAfo8TyO
+Qeh2RApRy5rAldX+ZY1a
+=L55k
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..3443e743b63f
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild,v 1.1 2010/11/10 10:43:45 wired Exp $
+
+EAPI="2"
+inherit confutils eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+accessibility cups dbus +glib mng nas nis raster tiff trace qt3support xinerama"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXfont
+		x11-libs/libSM
+		x11-libs/libXi
+	)
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/inputproto
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+pkg_setup() {
+	echo
+	elog "Qt's GTK style was moved to x11-themes/qgtkstyle to fix bug #336801"
+	echo
+
+	if ! use qt3support; then
+		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
+	fi
+
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		tools/designer
+		tools/linguist/linguist
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
+
+	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
+	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
+	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
+	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Don't build plugins this go around, because they depend on qt3support lib
+	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+	use raster && myconf="${myconf} -graphicssystem raster"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-xrender -xrandr -xkb -xshape -sm -no-svg"
+
+	# Explicitly don't compile these packages.
+	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
+	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
+		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
+		gif png system-png system-jpeg
+		$(use mng && echo system-mng)
+		$(use tiff && echo system-tiff)"
+	QCONFIG_REMOVE="no-gif no-png"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
+			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+
+	qt4-build_src_install
+
+	# qt-creator
+	# some qt-creator headers are located
+	# under /usr/include/qt4/QtDesigner/private.
+	# those headers are just includes of the headers
+	# which are located under tools/designer/src/lib/*
+	# So instead of installing both, we create the private folder
+	# and drop tools/designer/src/lib/* headers in it.
+	dodir /usr/include/qt4/QtDesigner/private/
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	# install correct designer and linguist icons, bug 241208
+	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png \
+		|| die "doicon failed"
+	# Note: absolute image path required here!
+	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
+			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "linguist make_desktop_entry failed"
+	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
+			"${EPREFIX}"/usr/share/pixmaps/designer.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "designer make_desktop_entry failed"
+}
diff --git a/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..7188b5eadcda
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild,v 1.1 2010/11/10 10:43:45 wired Exp $
+
+EAPI="3"
+inherit confutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+accessibility cups dbus egl +glib mng nas nis private-headers qt3support +raster tiff trace xinerama"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	virtual/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXfont
+		x11-libs/libSM
+		x11-libs/libXi
+	)
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/inputproto
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+pkg_setup() {
+	echo
+	einfo "Qt's GTK style was moved to x11-themes/qgtkstyle to fix bug #336801"
+	echo
+
+	if ! use qt3support; then
+		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
+	fi
+
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		tools/designer
+		tools/linguist/linguist
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
+
+	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
+	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
+	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
+	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Don't build plugins this go around, because they depend on qt3support lib
+	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use dbus)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+	use raster && myconf="${myconf} -graphicssystem raster"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
+		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
+		-no-phonon -no-opengl"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
+		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
+		gif png system-png system-jpeg
+		$(use mng && echo system-mng)
+		$(use tiff && echo system-tiff)"
+	QCONFIG_REMOVE="no-gif no-png"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
+			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+
+	qt4-build_src_install
+
+	# remove some unnecessary headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
+		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
+
+	# 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.
+	dodir /usr/include/qt4/QtDesigner/private/ || die
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/* || die
+	doins "${S}"/tools/designer/src/lib/sdk/* || die
+	#install private headers
+	if use private-headers; then
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+		find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
+	fi
+
+	# install correct designer and linguist icons, bug 241208
+	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png \
+		|| die "doicon failed"
+	# Note: absolute image path required here!
+	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
+			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "linguist make_desktop_entry failed"
+	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
+			"${EPREFIX}"/usr/share/pixmaps/designer.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "designer make_desktop_entry failed"
+}