Add trace use flag to build trace graphicssystem egine. Fixes bug #317809

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 171 insertions, 3 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 544e2c5e6684..5ee19bdabfc3 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,12 @@
 # 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.102 2010/04/18 13:06:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.103 2010/05/01 17:56:29 hwoarang Exp $
+
+*qt-gui-4.6.2-r1 (01 May 2010)
+
+  01 May 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qt-gui-4.6.2-r1.ebuild, metadata.xml:
+  Add trace use flag to build trace graphicssystem egine. Fixes bug #317809
 
   18 Apr 2010; <nixnut@gentoo.org> qt-gui-4.6.2.ebuild:
   ppc stable #297299
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index ca8ea471bea4..f65f37a1837c 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -5,6 +5,7 @@ DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba27
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-gui-4.5.3-r2.ebuild 5954 RMD160 7c920064963fc0ca6cc6cb6f6953c70b224ac9a1 SHA1 396265aea4631ebabaf6e917832c7513d1baf277 SHA256 1c927ed5eb92dbb54d77bfea26aaf755e3bd1a275578ec618724169ccc3bd64d
 EBUILD qt-gui-4.6.1.ebuild 5218 RMD160 093978d7fcae41c0305e8dd8ab9a2c3c18c78652 SHA1 380188b06ec8fcdf47e1fdec649feffe15b96d0f SHA256 b2ecf81adbab2d02e3ed3f4fe253e1431ddbf5977a7ac073fb1638bfe1a214a8
+EBUILD qt-gui-4.6.2-r1.ebuild 5328 RMD160 d0b7ca8d772c6de8252eb1e0b5526af12ef75387 SHA1 ebd57edf8ffa195e2ef30d5a46569d8a612aa0e1 SHA256 6d93ac1ca58607014552554fec2d58a890f30c759157a47ddb8f85784bc21d4f
 EBUILD qt-gui-4.6.2.ebuild 5215 RMD160 6b1c4cbeaf5ea17799b1a6b9e0204909c4943ceb SHA1 eafd55a233f4ab515fdde61febfa5547d2281886 SHA256 a771de1bbb2bcb35b9ef1638d1514e3811edd5de7f5f809a9d81b9a14bf75da3
-MISC ChangeLog 16114 RMD160 71794bbd705170b3a816b252d535f17032fd3e10 SHA1 9b9edc61e9ebafdaed0892ed750d032021cb5a92 SHA256 a78c9e525a4786f3705d40d36568adb0f8af82d43f354a149935cbb739f37673
-MISC metadata.xml 643 RMD160 8149038235f76911b216f264dd8e3f8180f6e348 SHA1 5086fe61b33cac614754fa0cb24cbe7bfe8704f7 SHA256 f3d8f2e44aae006846d84056248292308057be3a87b618eda273cd11ee8301a7
+MISC ChangeLog 16319 RMD160 62fa4b04f96484965a766c6cdf0417599f4de245 SHA1 0624f25f74b86fa214ceec4476db22b63b2a6627 SHA256 1ce863fa200bb3ac23c89bdce2d077ab478a407687c37539b8e52436663d5dd5
+MISC metadata.xml 851 RMD160 8180a368a140c2223e3c0d99bac31a0b1284b639 SHA1 84f35f3fe344072bd38c58cf7ed39a4bbfbecbff SHA256 7129b71867455575817f2f6915813ca84a059a8f878a73782278700edd50ab31
diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index 9940d8a3e90a..e82f687f2484 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -14,5 +14,10 @@
 		<flag name='raster'>
 			Use the alternative raster graphicssystem as default rendering engine
 		</flag>
+		<flag name='trace'>
+			Build the new 'trace' graphicsssytem engine which allows to record
+			all drawing operations into a trace buffer. Later it can be replayed
+			with the qttracereplay utility
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..d6cef7356f4b
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.6.2-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.2-r1.ebuild,v 1.1 2010/05/01 17:56:29 hwoarang 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 gtk mng nas nis raster tiff trace qt3support xinerama"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/jpeg:0
+	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=] )
+	gtk? ( x11-libs/gtk+:2[aqua=] )
+	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() {
+	if ! use qt3support; then
+		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
+	fi
+
+	confutils_use_depend_all gtk glib
+
+	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 gtk gtkstyle)
+		$(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"
+}