[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Markos Chandras]

commit:     43277b1c86ed5bdbae6dacb303af56d0705d6283
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 09:17:28 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 09:17:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=43277b1c

x11-libs/qt-gui: Backport changes from bug #402183

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    1 +
 x11-libs/qt-gui/qt-gui-4.9999.ebuild   |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index f6ef449..6fee2ac 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 	)
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+	egl? ( media-libs/mesa[egl] )
 	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )

diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
index f6ef449..6fee2ac 100644
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 	)
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+	egl? ( media-libs/mesa[egl] )
 	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Markos Chandras]

commit:     2f5e6e58c3fa72a5a8f68d2a571a3cc965dc812f
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 09:26:27 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 09:26:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2f5e6e58

x11-libs/qt-gui:Sync with portage ebuild

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |   25 ++++++++++++++-----------
 x11-libs/qt-gui/qt-gui-4.9999.ebuild   |   25 ++++++++++++++-----------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 6fee2ac..43f119b 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -3,7 +3,10 @@
 # $Header: $
 
 EAPI="4"
-inherit eutils confutils qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+    QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
@@ -103,11 +106,11 @@ pkg_setup() {
 	# mac version does not contain qtconfig?
 	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
 
-	qt4-build-edge_pkg_setup
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 src_prepare() {
-	qt4-build-edge_src_prepare
+	qt4-build${QT_ECLASS}_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 || die
@@ -140,7 +143,7 @@ src_configure() {
 		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
 		-no-phonon -no-opengl"
 
-	qt4-build-edge_src_configure
+	qt4-build${QT_ECLASS}_src_configure
 
 	if use gtkstyle; then
 		einfo "patching the Makefile to fix qgtkstyle compilation"
@@ -167,7 +170,7 @@ src_install() {
 			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
 			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
 
-	qt4-build-edge_src_install
+	qt4-build${QT_ECLASS}_src_install
 
 	# qt-creator
 	# some qt-creator headers are located
@@ -185,12 +188,12 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 
 	#touch the available graphics systems
-	mkdir -p "${D}/usr/share/qt4/graphicssystems/" || 
-		die "could not create ${D}/usr/share/qt4/graphicssystems/"
-	echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" ||
-		die "could not create ${D}/usr/share/qt4/graphicssystems/raster"
-	touch "${D}/usr/share/qt4/graphicssystems/native" ||
-		die "could not touch ${D}/usr/share/qt4/graphicssystems/native"
+	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || 
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
+	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
+	touch "${ED}/usr/share/qt4/graphicssystems/native" ||
+		die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
 
 	#install private headers
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then

diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
index 6fee2ac..43f119b 100644
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
@@ -3,7 +3,10 @@
 # $Header: $
 
 EAPI="4"
-inherit eutils confutils qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+    QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
@@ -103,11 +106,11 @@ pkg_setup() {
 	# mac version does not contain qtconfig?
 	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
 
-	qt4-build-edge_pkg_setup
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 src_prepare() {
-	qt4-build-edge_src_prepare
+	qt4-build${QT_ECLASS}_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 || die
@@ -140,7 +143,7 @@ src_configure() {
 		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
 		-no-phonon -no-opengl"
 
-	qt4-build-edge_src_configure
+	qt4-build${QT_ECLASS}_src_configure
 
 	if use gtkstyle; then
 		einfo "patching the Makefile to fix qgtkstyle compilation"
@@ -167,7 +170,7 @@ src_install() {
 			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
 			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
 
-	qt4-build-edge_src_install
+	qt4-build${QT_ECLASS}_src_install
 
 	# qt-creator
 	# some qt-creator headers are located
@@ -185,12 +188,12 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 
 	#touch the available graphics systems
-	mkdir -p "${D}/usr/share/qt4/graphicssystems/" || 
-		die "could not create ${D}/usr/share/qt4/graphicssystems/"
-	echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" ||
-		die "could not create ${D}/usr/share/qt4/graphicssystems/raster"
-	touch "${D}/usr/share/qt4/graphicssystems/native" ||
-		die "could not touch ${D}/usr/share/qt4/graphicssystems/native"
+	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || 
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
+	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
+		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
+	touch "${ED}/usr/share/qt4/graphicssystems/native" ||
+		die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
 
 	#install private headers
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Markos Chandras]

commit:     08e14c11a203e3d3e781cdb2dca5a05fcaf192c5
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 12:56:24 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 12:57:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=08e14c11

x11-libs/qt-gui: Fix my last commit and inherit missing eclasses

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    2 +-
 x11-libs/qt-gui/qt-gui-4.9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 43f119b..ea4f375 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 if [[ ${PV} == 4*9999 ]]; then
     QT_ECLASS="-edge"
 fi
-inherit qt4-build${QT_ECLASS}
+inherit eutils confutils qt4-build${QT_ECLASS}
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"

diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
index 43f119b..ea4f375 100644
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 if [[ ${PV} == 4*9999 ]]; then
     QT_ECLASS="-edge"
 fi
-inherit qt4-build${QT_ECLASS}
+inherit eutils confutils qt4-build${QT_ECLASS}
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Michael Palimaka]

commit:     444b2ffe267627956da30867dc7739f8eecb3482
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Mar 17 15:56:38 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Mar 17 15:56:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=444b2ffe

[x11-libs/qt-gui] Sync metadata from portage. Fix whitespace. Update
copyright year.

(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/metadata.xml           |   21 +++++++--------------
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    6 +++---
 x11-libs/qt-gui/qt-gui-4.9999.ebuild   |    6 +++---
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index 2dbfd0b..c342d36 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -3,28 +3,21 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<flag name='egl'>Use EGL instead of default GLX to manage OpenGL
+		      contexts on the desktop</flag>
 		<flag name='exceptions'>Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name='glib'>
-			Enable <pkg>dev-libs/glib</pkg> eventloop support
-		</flag>
-		<flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
-			this does not mean you can compile pure Qt3 programs with Qt4.
-		</flag>
+		<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
 		<flag name='gtkstyle'>Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
-		<flag name='raster'>
-			Use the alternative raster graphicssystem as default rendering engine
-		</flag>
+		<flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
+			this does not mean you can compile pure Qt3 programs with Qt4.</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>
-		<flag name="private-headers">Install Qt declarative private headers required
-			by qt-creator's QmlDesigner and QmlInspector plugins"</flag>
-		<flag name='stable-branch'>Use the stable git branch - it is slightly behind
-			master but guaranteed by Nokia to compile</flag>
-		<flag name="egl">Enable EGL graphics engine</flag>
+		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index ea4f375..fb41abd 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 if [[ ${PV} == 4*9999 ]]; then
-    QT_ECLASS="-edge"
+	QT_ECLASS="-edge"
 fi
 inherit eutils confutils qt4-build${QT_ECLASS}
 
@@ -188,7 +188,7 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 
 	#touch the available graphics systems
-	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || 
+	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
 		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
 	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
 		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"

diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
index ea4f375..fb41abd 100644
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 if [[ ${PV} == 4*9999 ]]; then
-    QT_ECLASS="-edge"
+	QT_ECLASS="-edge"
 fi
 inherit eutils confutils qt4-build${QT_ECLASS}
 
@@ -188,7 +188,7 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 
 	#touch the available graphics systems
-	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || 
+	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
 		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
 	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
 		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     bb9ffb46874f49cd36b02e42f905009ec759a1b6
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun May  6 15:08:55 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May  6 15:08:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bb9ffb46

[x11-libs/qt-gui] Sync with portage.

(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 309bd3b..2105011 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -8,11 +8,7 @@ inherit qt4-build
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS=""
 IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
 
 REQUIRED_USE="

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     aeeb11c5b9c414f023ca61b370babc7eb238c1b0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 10 21:00:39 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 21:00:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=aeeb11c5

[x11-libs/qt-gui] QtGui live ebuild for Qt5.

Includes also QtPlatformSupport and the xcb platform plugin.
It does not include the QtWidgets module.

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/metadata.xml         |    3 +-
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |   68 ++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index c342d36..0216004 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='c++11'>Build Qt using the C++11 standard</flag>
 		<flag name='egl'>Use EGL instead of default GLX to manage OpenGL
 		      contexts on the desktop</flag>
 		<flag name='exceptions'>Add support for exceptions - like catching them
@@ -17,7 +19,6 @@
 			all drawing operations into a trace buffer. Later it can be replayed
 			with the qttracereplay utility
 		</flag>
-		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
 		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
new file mode 100644
index 0000000..9c8adbd
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# TODO: directfb, eglfs, evdev, ibus
+
+IUSE="egl +fontconfig gif +glib jpeg opengl +png udev +xcb"
+
+DEPEND="
+	media-libs/freetype:2
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[debug=,glib=]
+	egl? ( media-libs/mesa[egl] )
+	fontconfig? ( media-libs/fontconfig )
+	gif? ( media-libs/giflib )
+	glib? ( dev-libs/glib:2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0 )
+	udev? ( sys-fs/udev )
+	xcb? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libxcb
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/platformsupport
+	src/plugins/imageformats
+	src/plugins/platforms
+)
+
+src_configure() {
+	local myconf=(
+		-accessibility
+		$(qt_use egl)
+		$(qt_use fontconfig)
+		$(use gif || echo -no-gif)
+		$(qt_use glib)
+		$(qt_use jpeg libjpeg system)
+		$(qt_use opengl)
+		$(qt_use png libpng system)
+		$(use udev || echo -no-libudev)
+		$(qt_use xcb)
+		-no-cups -no-dbus
+		-no-eglfs -no-directfb
+	)
+	qt5-build_src_configure
+}

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     cceafbdae1d411b2e87cc55ebea948e41f6b24cd
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jul  2 16:00:43 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 16:00:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cceafbda

[x11-libs/qt-gui:5] qt-network is required for tests.

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 984bd29..0f21519 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 IUSE="egl +fontconfig gif +glib jpeg opengl +png udev +xcb"
 
-DEPEND="
+RDEPEND="
 	media-libs/freetype:2
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[debug=,glib=]
@@ -40,7 +40,9 @@ DEPEND="
 		x11-libs/xcb-util-wm
 	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( ~x11-libs/qt-network-${PV}[debug=] )
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/gui

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     1ac99896c73ca58c39bb4eea4d3c12f23763128a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jul  2 17:26:38 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 17:26:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1ac99896

[x11-libs/qt-gui:5] Add QCONFIG_{ADD,DEFINE}.

(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 0f21519..ca484dc 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -51,6 +51,18 @@ QT5_TARGET_SUBDIRS=(
 	src/plugins/platforms
 )
 
+pkg_setup() {
+	QCONFIG_ADD="accessibility
+			$(usev fontconfig)
+			$(usev opengl)
+			$(use udev && echo libudev)"
+
+	QCONFIG_DEFINE="$(use egl && echo QT_EGL)
+			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
+
+	qt5-build_pkg_setup
+}
+
 src_configure() {
 	local myconf=(
 		-accessibility

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     848d0d0bd09bde657f1c9f3a28052cf5ed504b82
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jul  5 15:57:59 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul  5 15:57:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=848d0d0b

[x11-libs/qt-gui:5] Pass -no-dbus to configure.

(Portage version: 2.2.0_alpha115/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index ca484dc..5e3f932 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -75,6 +75,7 @@ src_configure() {
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(qt_use xcb)
+		-no-dbus
 		-no-eglfs -no-directfb
 	)
 	qt5-build_src_configure

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Ben de Groot]

commit:     27a90ddc6b6b7fa65dab8a73010040accc776c00
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Fri Jul 13 11:19:09 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 11:19:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=27a90ddc

x11-libs/qt-gui: add elog wrt bug 388551 gtkstyle

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 1519be4..eb7cbb2 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -238,4 +238,11 @@ pkg_postinst() {
 	elog "Run"
 	elog "  eselect qtgraphicssystem"
 	elog "for more information."
+	if use gtkstyle ; then
+		# see bug 388551
+		elog "For Qt's GTK style to work, you need to either export"
+		elog "the following variable into your environment:"
+		elog '  GTK2_RC_FILES="$HOME/.gtkrc-2.0"'
+		elog "or alternatively install gnome-base/libgnomeui"
+	fi
 }

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     0f3a8f1532234bc04873b466830badd35caa2292
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 02:18:20 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 02:18:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f3a8f15

[x11-libs/qt-gui:5] Update TODO comment now that kms is covered by configure.

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 5e3f932..33824a7 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# TODO: directfb, eglfs, evdev, ibus
+# TODO: directfb, eglfs, kms, evdev, ibus
 
 IUSE="egl +fontconfig gif +glib jpeg opengl +png udev +xcb"
 

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     3ae83f5dd5370eb83c7cce667e399905f0987aee
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jul 23 06:47:00 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 18:10:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3ae83f5d

[x11-libs/qt-gui:5] Also xrender is needed with USE=xcb.

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 4cea36d..442804d 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 		$(qt_use opengl)
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
-		$(qt_use xcb)
+		$(use xcb && echo -xcb -xrender)
 		-no-dbus
 	)
 	qt5-build_src_configure

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     e6aae956daebf4a3ea7438469e68de5a2981b2e2
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Aug 12 09:25:46 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 09:25:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e6aae956

[x11-libs/qt-gui:5] Implement several new USE flags, make fontconfig mandatory.

This should also fix bug 430290.

---
 x11-libs/qt-gui/metadata.xml         |    7 +++-
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |   52 ++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index 98454c7..d86d15d 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -5,13 +5,16 @@
 	<use>
 		<flag name="c++0x">Build Qt using the C++11 standard</flag>
 		<flag name="c++11">Build Qt using the C++11 standard</flag>
-		<flag name="egl">Use EGL instead of default GLX to manage OpenGL
-		      contexts on the desktop</flag>
+		<flag name="egl">Use EGL instead of default GLX to manage OpenGL contexts</flag>
+		<flag name="eglfs">Compile EGL Full Screen/Single Surface support</flag>
+		<flag name="evdev">Enable evdev input support</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
+		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
+		<flag name="kms">Enable KMS-based QPA plugin</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 		<flag name="trace">

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 442804d..3ad5546 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -14,19 +14,34 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# TODO: directfb, eglfs, kms, linuxfb, evdev, ibus
+# TODO: directfb, linuxfb, ibus
 
-IUSE="egl +fontconfig gif +glib jpeg opengl +png udev +xcb"
+IUSE="egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+REQUIRED_USE="
+	egl? ( gles2 )
+	eglfs? ( egl evdev )
+	gles2? ( opengl )
+	kms? ( egl )
+"
 
 RDEPEND="
+	media-libs/fontconfig
 	media-libs/freetype:2
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[debug=,glib=]
 	egl? ( media-libs/mesa[egl] )
-	fontconfig? ( media-libs/fontconfig )
 	gif? ( media-libs/giflib )
+	gles2? ( || (
+		media-libs/mesa[gles2]
+		media-libs/mesa[gles]
+	) )
 	glib? ( dev-libs/glib:2 )
 	jpeg? ( virtual/jpeg )
+	kms? (
+		media-libs/mesa[gbm]
+		sys-fs/udev
+		x11-libs/libdrm
+	)
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0 )
 	udev? ( sys-fs/udev )
@@ -41,6 +56,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
 	test? ( ~x11-libs/qt-network-${PV}[debug=] )
 "
 
@@ -52,26 +68,44 @@ QT5_TARGET_SUBDIRS=(
 )
 
 pkg_setup() {
-	QCONFIG_ADD="accessibility
-			$(usev fontconfig)
-			$(usev opengl)
-			$(use udev && echo libudev)"
+	QCONFIG_ADD="
+		accessibility
+		$(usev egl)
+		$(usev eglfs)
+		$(usev evdev)
+		fontconfig
+		$(use gles2 && echo opengles2)
+		$(usev kms)
+		$(usev opengl)
+		$(use udev && echo libudev)
+		$(usev xcb)"
 
 	QCONFIG_DEFINE="$(use egl && echo QT_EGL)
+			$(use eglfs && echo QT_EGLFS)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 
 	qt5-build_pkg_setup
 }
 
 src_configure() {
+	local opengl="-no-opengl"
+	if use gles2; then
+		opengl="-opengl es2"
+	elif use opengl; then
+		opengl="-opengl desktop"
+	fi
+
 	local myconf=(
 		-accessibility
 		$(qt_use egl)
-		$(qt_use fontconfig)
+		$(qt_use eglfs)
+		$(qt_use evdev)
+		-fontconfig
 		$(use gif || echo -no-gif)
 		$(qt_use glib)
 		$(qt_use jpeg libjpeg system)
-		$(qt_use opengl)
+		$(qt_use kms)
+		${opengl}
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(use xcb && echo -xcb -xrender)

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     601d1aa24a1dc4612279044dea825e393717c50c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Aug 28 03:05:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 03:05:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=601d1aa2

[x11-libs/qt-gui:5] Introduce USE=accessibility, add missing deps.

This fixes bug 431320 by Patrick Lauer.

(Portage version: 2.2.0_alpha122/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-5.9999.ebuild |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 3ad5546..9a17a92 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -16,7 +16,7 @@ fi
 
 # TODO: directfb, linuxfb, ibus
 
-IUSE="egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
 	egl? ( gles2 )
 	eglfs? ( egl evdev )
@@ -53,6 +53,10 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
+		accessibility? (
+			app-accessibility/at-spi2-core
+			~x11-libs/qt-dbus-${PV}[debug=]
+		)
 	)
 "
 DEPEND="${RDEPEND}
@@ -69,7 +73,7 @@ QT5_TARGET_SUBDIRS=(
 
 pkg_setup() {
 	QCONFIG_ADD="
-		accessibility
+		$(usev accessibility)
 		$(usev egl)
 		$(usev eglfs)
 		$(usev evdev)
@@ -88,6 +92,11 @@ pkg_setup() {
 }
 
 src_configure() {
+	local dbus="-no-dbus"
+	if use accessibility && use xcb; then
+		dbus="-dbus"
+	fi
+
 	local opengl="-no-opengl"
 	if use gles2; then
 		opengl="-opengl es2"
@@ -96,7 +105,8 @@ src_configure() {
 	fi
 
 	local myconf=(
-		-accessibility
+		$(qt_use accessibility)
+		${dbus}
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
@@ -109,7 +119,6 @@ src_configure() {
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(use xcb && echo -xcb -xrender)
-		-no-dbus
 	)
 	qt5-build_src_configure
 }

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     42acd288e4e7b27a54d4428926aeda8d8cb02e7a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Sep  3 08:11:21 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 08:11:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=42acd288

[x11-libs/qt-gui:4] Sync with portage.

(Portage version: 2.2.0_alpha123-r2/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index eb7cbb2..f77df95 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -198,7 +198,7 @@ src_install() {
 	# which are located under tools/designer/src/lib/*
 	# So instead of installing both, we create the private folder
 	# and drop tools/designer/src/lib/* headers in it.
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
 	else
 		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
@@ -207,14 +207,14 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/*
 
 	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+	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
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		# rerun to get links to headers right
 		fix_includes
 	fi
@@ -226,20 +226,22 @@ src_install() {
 
 	doicon tools/designer/src/designer/images/designer.png \
 		tools/linguist/linguist/images/icons/linguist-128-32.png
+	use dbus && doicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
 	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
 	make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
 }
 
 pkg_postinst() {
-	# raster is the default graphicssystems, set it if first install
+	# raster is the default graphicssystems, set it on first install
 	eselect qtgraphicssystem set raster --use-old
-	elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System"
+
+	elog "Starting with Qt 4.8, you may choose the active Qt Graphics System"
 	elog "by using a new eselect module called qtgraphicssystem."
-	elog "Run"
-	elog "  eselect qtgraphicssystem"
-	elog "for more information."
-	if use gtkstyle ; then
+	elog "Run \`eselect qtgraphicssystem\` for more information."
+
+	if use gtkstyle; then
 		# see bug 388551
+		elog
 		elog "For Qt's GTK style to work, you need to either export"
 		elog "the following variable into your environment:"
 		elog '  GTK2_RC_FILES="$HOME/.gtkrc-2.0"'

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     3f99eedb96d52172c9a66747e6cbc0578d9a0cea
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Sep 19 23:22:37 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 23:22:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3f99eedb

[x11-libs/qt-gui:5] Add libXi dependency.

Thanks to orzel on irc.

(Portage version: 2.2.0_alpha129/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-gui/qt-gui-5.0.0_beta1.ebuild |    5 +++--
 x11-libs/qt-gui/qt-gui-5.9999.ebuild      |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.0.0_beta1.ebuild b/x11-libs/qt-gui/qt-gui-5.0.0_beta1.ebuild
index 9a17a92..da7f0e0 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.0_beta1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.0_beta1.ebuild
@@ -46,9 +46,10 @@ RDEPEND="
 	png? ( media-libs/libpng:0 )
 	udev? ( sys-fs/udev )
 	xcb? (
-		x11-libs/libX11
+		>=x11-libs/libX11-1.5
+		>=x11-libs/libXi-1.6
 		x11-libs/libXrender
-		x11-libs/libxcb
+		>=x11-libs/libxcb-1.8.1
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 9a17a92..da7f0e0 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -46,9 +46,10 @@ RDEPEND="
 	png? ( media-libs/libpng:0 )
 	udev? ( sys-fs/udev )
 	xcb? (
-		x11-libs/libX11
+		>=x11-libs/libX11-1.5
+		>=x11-libs/libXi-1.6
 		x11-libs/libXrender
-		x11-libs/libxcb
+		>=x11-libs/libxcb-1.8.1
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     0928a5f75b0597f8f9597d55503341ae9723acb8
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Nov 14 10:26:50 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 10:26:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0928a5f7

[x11-libs/qt-gui:4] Sync with gentoo-x86.

Package-Manager: portage-2.2.0_alpha142

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |   10 ++++++----
 x11-libs/qt-gui/qt-gui-5.9999.ebuild   |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index f77df95..c21b719 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -224,11 +224,13 @@ src_install() {
 	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
 	touch "${ED}"/usr/share/qt4/graphicssystems/native || die
 
-	doicon tools/designer/src/designer/images/designer.png \
-		tools/linguist/linguist/images/icons/linguist-128-32.png
-	use dbus && doicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
+	doicon tools/designer/src/designer/images/designer.png
+	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
 	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-	make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
+	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
 }
 
 pkg_postinst() {

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index da7f0e0..b84012e 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -15,6 +15,7 @@ else
 fi
 
 # TODO: directfb, linuxfb, ibus
+# FIXME: at-spi2 no longer needed since 5.0.0_beta2
 
 IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     f6856cec4f992735b163f143a245c5715e95258e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Dec 10 08:35:01 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 08:35:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f6856cec

[x11-libs/qt-gui:5] sys-fs/udev -> virtual/udev

Package-Manager: portage-2.2.0_alpha147

---
 x11-libs/qt-gui/qt-gui-5.0.9999.ebuild |    4 ++--
 x11-libs/qt-gui/qt-gui-5.9999.ebuild   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index 467036d..f76c02a 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -40,12 +40,12 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	kms? (
 		media-libs/mesa[gbm]
-		sys-fs/udev
+		virtual/udev
 		x11-libs/libdrm
 	)
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0 )
-	udev? ( sys-fs/udev )
+	udev? ( virtual/udev )
 	xcb? (
 		>=x11-libs/libX11-1.5
 		>=x11-libs/libXi-1.6

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 467036d..f76c02a 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -40,12 +40,12 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	kms? (
 		media-libs/mesa[gbm]
-		sys-fs/udev
+		virtual/udev
 		x11-libs/libdrm
 	)
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0 )
-	udev? ( sys-fs/udev )
+	udev? ( virtual/udev )
 	xcb? (
 		>=x11-libs/libX11-1.5
 		>=x11-libs/libXi-1.6

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     40d99c977afbff012a5112cba66bf29146f7c92c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Dec 23 03:35:06 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 03:35:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=40d99c97

[x11-libs/qt-gui:5] Remove unneeded dep.

Package-Manager: portage-2.2.0_alpha149

---
 x11-libs/qt-gui/qt-gui-5.0.0.ebuild    |    6 +-----
 x11-libs/qt-gui/qt-gui-5.0.9999.ebuild |    6 +-----
 x11-libs/qt-gui/qt-gui-5.9999.ebuild   |    6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.0.0.ebuild b/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
index f76c02a..148c81e 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
@@ -15,7 +15,6 @@ else
 fi
 
 # TODO: directfb, linuxfb, ibus
-# FIXME: at-spi2 no longer needed since 5.0.0_beta2
 
 IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
@@ -55,10 +54,7 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
-		accessibility? (
-			app-accessibility/at-spi2-core
-			~x11-libs/qt-dbus-${PV}[debug=]
-		)
+		accessibility? ( ~x11-libs/qt-dbus-${PV}[debug=] )
 	)
 "
 DEPEND="${RDEPEND}

diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index f76c02a..148c81e 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -15,7 +15,6 @@ else
 fi
 
 # TODO: directfb, linuxfb, ibus
-# FIXME: at-spi2 no longer needed since 5.0.0_beta2
 
 IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
@@ -55,10 +54,7 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
-		accessibility? (
-			app-accessibility/at-spi2-core
-			~x11-libs/qt-dbus-${PV}[debug=]
-		)
+		accessibility? ( ~x11-libs/qt-dbus-${PV}[debug=] )
 	)
 "
 DEPEND="${RDEPEND}

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index f76c02a..148c81e 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -15,7 +15,6 @@ else
 fi
 
 # TODO: directfb, linuxfb, ibus
-# FIXME: at-spi2 no longer needed since 5.0.0_beta2
 
 IUSE="+accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
@@ -55,10 +54,7 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
-		accessibility? (
-			app-accessibility/at-spi2-core
-			~x11-libs/qt-dbus-${PV}[debug=]
-		)
+		accessibility? ( ~x11-libs/qt-dbus-${PV}[debug=] )
 	)
 "
 DEPEND="${RDEPEND}

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     10b6602aa36972fa7ecaefc5da7d8feb372b1271
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jan  2 01:14:37 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 01:14:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=10b6602a

[x11-libs/qt-gui:4] Call qt4-build_pkg_postinst() wrt bug 449362.

Package-Manager: portage-2.2.0_alpha149

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index c21b719..44b4174 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -234,6 +234,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	qt4-build_pkg_postinst
+
 	# raster is the default graphicssystems, set it on first install
 	eselect qtgraphicssystem set raster --use-old
 

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     7a1853fba901253c8cda5c7850fa3416795166a6
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jan 25 09:06:45 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 09:06:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7a1853fb

[x11-libs/qt-gui:5] Define QT_NO_ACCESSIBILITY with USE=-accessibility.

Should fix bug #448628.

Package-Manager: portage-2.2.0_alpha159

---
 x11-libs/qt-gui/qt-gui-5.0.0.ebuild    |    3 ++-
 x11-libs/qt-gui/qt-gui-5.0.9999.ebuild |    3 ++-
 x11-libs/qt-gui/qt-gui-5.9999.ebuild   |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.0.0.ebuild b/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
index 0ed680d..5f6f1f0 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
@@ -82,7 +82,8 @@ pkg_setup() {
 		$(use udev && echo libudev)
 		$(usev xcb)"
 
-	QCONFIG_DEFINE="$(use egl && echo QT_EGL)
+	QCONFIG_DEFINE="$(use accessibility || echo QT_NO_ACCESSIBILITY)
+			$(use egl && echo QT_EGL)
 			$(use eglfs && echo QT_EGLFS)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 

diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index 0ed680d..5f6f1f0 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -82,7 +82,8 @@ pkg_setup() {
 		$(use udev && echo libudev)
 		$(usev xcb)"
 
-	QCONFIG_DEFINE="$(use egl && echo QT_EGL)
+	QCONFIG_DEFINE="$(use accessibility || echo QT_NO_ACCESSIBILITY)
+			$(use egl && echo QT_EGL)
 			$(use eglfs && echo QT_EGLFS)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 0ed680d..5f6f1f0 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -82,7 +82,8 @@ pkg_setup() {
 		$(use udev && echo libudev)
 		$(usev xcb)"
 
-	QCONFIG_DEFINE="$(use egl && echo QT_EGL)
+	QCONFIG_DEFINE="$(use accessibility || echo QT_NO_ACCESSIBILITY)
+			$(use egl && echo QT_EGL)
 			$(use eglfs && echo QT_EGLFS)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     a29a4c6631f30661e67e78fd7512f42b67183093
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Jan 26 11:23:56 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 11:23:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a29a4c66

[x11-libs/qt-gui:4] Remove elog about qtgraphicssystem eselect module.

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index bccef2f..3d3ce7d 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -236,16 +236,11 @@ src_install() {
 pkg_postinst() {
 	qt4-build_pkg_postinst
 
-	# raster is the default graphicssystems, set it on first install
+	# raster is the default graphicssystem, set it on first install
 	eselect qtgraphicssystem set raster --use-old
 
-	elog "Starting with Qt 4.8, you may choose the active Qt Graphics System"
-	elog "by using a new eselect module called qtgraphicssystem."
-	elog "Run \`eselect qtgraphicssystem\` for more information."
-
 	if use gtkstyle; then
 		# see bug 388551
-		elog
 		elog "For Qt's GTK style to work, you need to either export"
 		elog "the following variable into your environment:"
 		elog '  GTK2_RC_FILES="$HOME/.gtkrc-2.0"'

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Michael Palimaka]

commit:     52420f0c2ce7ccc836ca94720d9c6f4a7b949f0f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 29 17:59:17 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 17:59:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=52420f0c

[x11-libs/qt-gui] Add media-libs/libpng subslot dependency.

Package-Manager: portage-2.1.11.50

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |    4 ++--
 x11-libs/qt-gui/qt-gui-5.0.0.ebuild    |    2 +-
 x11-libs/qt-gui/qt-gui-5.0.9999.ebuild |    2 +-
 x11-libs/qt-gui/qt-gui-5.9999.ebuild   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 3d3ce7d..acf33ef 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit eutils qt4-build
 
@@ -23,7 +23,7 @@ RDEPEND="
 	app-admin/eselect-qtgraphicssystem
 	media-libs/fontconfig
 	media-libs/freetype:2
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]

diff --git a/x11-libs/qt-gui/qt-gui-5.0.0.ebuild b/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
index 5f6f1f0..63692ac 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.0.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0 )
+	png? ( media-libs/libpng:0= )
 	udev? ( virtual/udev )
 	xcb? (
 		>=x11-libs/libX11-1.5

diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index 5f6f1f0..63692ac 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0 )
+	png? ( media-libs/libpng:0= )
 	udev? ( virtual/udev )
 	xcb? (
 		>=x11-libs/libX11-1.5

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index 5f6f1f0..63692ac 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0 )
+	png? ( media-libs/libpng:0= )
 	udev? ( virtual/udev )
 	xcb? (
 		>=x11-libs/libX11-1.5

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     ef58d3d2c39b219152829c458d5fd40de1933caa
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Feb 13 08:37:31 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 08:37:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ef58d3d2

[x11-libs/qt-gui:4] Sync with portage.

---
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild |   33 +++++++------------------------
 1 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index acf33ef..9fc733f 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	gtkstyle? ( glib )
 "
 
+# cairo[-qt4] is needed because of bug 454066
 RDEPEND="
 	app-admin/eselect-qtgraphicssystem
 	media-libs/fontconfig
@@ -43,7 +44,10 @@ RDEPEND="
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
 	egl? ( media-libs/mesa[egl] )
-	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
+	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 )
@@ -63,27 +67,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	# this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
-	# was planning to use a dep, but to reproduce this you have to
-	# clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
-	# no need to restrict normal first time users for that :)
-	if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
-		echo
-		eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
-		eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
-		eerror "style cannot be built."
-		ewarn
-		eerror "You have the following options:"
-		eerror "  - rebuild cairo with -qt4 USE"
-		eerror "  - build qt-gui with -gtkstyle USE"
-		ewarn
-		eerror "After you successfully install qt-gui, you'll be able to"
-		eerror "re-enable the disabled use flag and/or reinstall cairo."
-		ewarn
-		echo
-		die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
-	fi
-
 	QT4_TARGET_DIRECTORIES="
 		src/gui
 		src/scripttools
@@ -144,7 +127,7 @@ src_configure() {
 		$(qt_use xv xvideo)"
 
 	myconf+="
-		-system-libpng -system-libjpeg
+		-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"
@@ -163,7 +146,7 @@ src_configure() {
 
 src_install() {
 	QCONFIG_ADD="
-		mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
 		fontconfig gif png system-png jpeg system-jpeg
 		$(usev accessibility)
 		$(usev cups)
@@ -184,7 +167,7 @@ src_install() {
 			$(use nas && echo QT_NAS)
 			$(use nis && echo QT_NIS)
 			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
-			QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES
+			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)"

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/

[Davide Pesavento]

commit:     d09a3acfdc7aed6dbfdc51019ecf574569618e25
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Feb 22 08:38:10 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 08:38:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d09a3acf

[x11-libs/qt-gui:5] Merge egl and gles2 USE flags.

Fixes bug 450492.

Package-Manager: portage-2.2.0_alpha163

---
 x11-libs/qt-gui/qt-gui-5.0.9999.ebuild |   26 +++++++++++---------------
 x11-libs/qt-gui/qt-gui-5.9999.ebuild   |   26 +++++++++++---------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index fe5e056..045a91c 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -16,12 +16,11 @@ fi
 
 # TODO: directfb, linuxfb, ibus
 
-IUSE="accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="accessibility eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
-	egl? ( gles2 )
-	eglfs? ( egl evdev )
+	eglfs? ( evdev gles2 )
 	gles2? ( opengl )
-	kms? ( egl )
+	kms? ( gles2 )
 "
 
 RDEPEND="
@@ -29,11 +28,10 @@ RDEPEND="
 	media-libs/freetype:2
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[debug=,glib=]
-	egl? ( media-libs/mesa[egl] )
 	gif? ( media-libs/giflib )
 	gles2? ( || (
-		media-libs/mesa[gles2]
-		media-libs/mesa[gles]
+		media-libs/mesa[egl,gles2]
+		media-libs/mesa[egl,gles]
 	) )
 	glib? ( dev-libs/glib:2 )
 	jpeg? ( virtual/jpeg )
@@ -72,19 +70,18 @@ QT5_TARGET_SUBDIRS=(
 pkg_setup() {
 	QCONFIG_ADD="
 		$(use accessibility && echo accessibility-atspi-bridge)
-		$(usev egl)
 		$(usev eglfs)
 		$(usev evdev)
 		fontconfig
-		$(use gles2 && echo opengles2)
+		$(use gles2 && echo egl opengles2)
 		$(usev kms)
 		$(usev opengl)
 		$(use udev && echo libudev)
 		$(usev xcb)"
 
 	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
-			$(use egl && echo QT_EGL)
 			$(use eglfs && echo QT_EGLFS)
+			$(use gles2 && echo QT_EGL)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 
 	qt5-build_pkg_setup
@@ -96,24 +93,23 @@ src_configure() {
 		dbus="-dbus"
 	fi
 
-	local opengl="-no-opengl"
+	local gl="-no-egl -no-opengl"
 	if use gles2; then
-		opengl="-opengl es2"
+		gl="-egl -opengl es2"
 	elif use opengl; then
-		opengl="-opengl desktop"
+		gl="-no-egl -opengl desktop"
 	fi
 
 	local myconf=(
 		${dbus}
-		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		-fontconfig
 		$(use gif || echo -no-gif)
+		${gl}
 		$(qt_use glib)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
-		${opengl}
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(use xcb && echo -xcb -xrender)

diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index fe5e056..045a91c 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -16,12 +16,11 @@ fi
 
 # TODO: directfb, linuxfb, ibus
 
-IUSE="accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="accessibility eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
 REQUIRED_USE="
-	egl? ( gles2 )
-	eglfs? ( egl evdev )
+	eglfs? ( evdev gles2 )
 	gles2? ( opengl )
-	kms? ( egl )
+	kms? ( gles2 )
 "
 
 RDEPEND="
@@ -29,11 +28,10 @@ RDEPEND="
 	media-libs/freetype:2
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[debug=,glib=]
-	egl? ( media-libs/mesa[egl] )
 	gif? ( media-libs/giflib )
 	gles2? ( || (
-		media-libs/mesa[gles2]
-		media-libs/mesa[gles]
+		media-libs/mesa[egl,gles2]
+		media-libs/mesa[egl,gles]
 	) )
 	glib? ( dev-libs/glib:2 )
 	jpeg? ( virtual/jpeg )
@@ -72,19 +70,18 @@ QT5_TARGET_SUBDIRS=(
 pkg_setup() {
 	QCONFIG_ADD="
 		$(use accessibility && echo accessibility-atspi-bridge)
-		$(usev egl)
 		$(usev eglfs)
 		$(usev evdev)
 		fontconfig
-		$(use gles2 && echo opengles2)
+		$(use gles2 && echo egl opengles2)
 		$(usev kms)
 		$(usev opengl)
 		$(use udev && echo libudev)
 		$(usev xcb)"
 
 	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
-			$(use egl && echo QT_EGL)
 			$(use eglfs && echo QT_EGLFS)
+			$(use gles2 && echo QT_EGL)
 			$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
 
 	qt5-build_pkg_setup
@@ -96,24 +93,23 @@ src_configure() {
 		dbus="-dbus"
 	fi
 
-	local opengl="-no-opengl"
+	local gl="-no-egl -no-opengl"
 	if use gles2; then
-		opengl="-opengl es2"
+		gl="-egl -opengl es2"
 	elif use opengl; then
-		opengl="-opengl desktop"
+		gl="-no-egl -opengl desktop"
 	fi
 
 	local myconf=(
 		${dbus}
-		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		-fontconfig
 		$(use gif || echo -no-gif)
+		${gl}
 		$(qt_use glib)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
-		${opengl}
 		$(qt_use png libpng system)
 		$(use udev || echo -no-libudev)
 		$(use xcb && echo -xcb -xrender)