[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     68451d97c9bfbefa026b6cccb8fbc6426b614c90
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 16:40:49 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 16:40:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=68451d97

[dev-qt/qtgui:5] Add USE=tslib.

Package-Manager: portage-2.2.20

 dev-qt/qtgui/metadata.xml          | 5 +++--
 dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 5 ++++-
 dev-qt/qtgui/qtgui-5.5.9999.ebuild | 5 ++++-
 dev-qt/qtgui/qtgui-5.9999.ebuild   | 5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index ce6b0b5..3ecd8fd 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -17,10 +17,11 @@
 		<flag name="kms">Build the KMS platform 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">
-			Build the 'trace' graphicssystem engine which allows to record
+		<flag name="trace">Build the 'trace' graphicssystem engine which allows to record
 			all drawing operations into a trace buffer. The trace can be replayed
 			later with the qttracereplay tool.</flag>
+		<flag name="tslib">Enable support for touchscreen devices via
+			<pkg>x11-libs/tslib</pkg></flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>

diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index fc5f8b6..5f18a22 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png tslib udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev )
 	eglfs? ( egl )
@@ -45,6 +45,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
 	udev? ( virtual/libudev:= )
 	xcb? (
 		x11-libs/libICE
@@ -103,6 +104,7 @@ QT5_GENTOO_CONFIG=(
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
+	tslib
 	udev:libudev:
 	xcb:xcb:
 	xcb:xcb-glx:
@@ -140,6 +142,7 @@ src_configure() {
 		$(qt_use kms)
 		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
+		$(qt_use tslib)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon-x11 system)

diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
index fc5f8b6..5f18a22 100644
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png tslib udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev )
 	eglfs? ( egl )
@@ -45,6 +45,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
 	udev? ( virtual/libudev:= )
 	xcb? (
 		x11-libs/libICE
@@ -103,6 +104,7 @@ QT5_GENTOO_CONFIG=(
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
+	tslib
 	udev:libudev:
 	xcb:xcb:
 	xcb:xcb-glx:
@@ -140,6 +142,7 @@ src_configure() {
 		$(qt_use kms)
 		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
+		$(qt_use tslib)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon-x11 system)

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index fc5f8b6..5f18a22 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png tslib udev +xcb"
 REQUIRED_USE="
 	egl? ( evdev )
 	eglfs? ( egl )
@@ -45,6 +45,7 @@ RDEPEND="
 		x11-libs/libdrm
 	)
 	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
 	udev? ( virtual/libudev:= )
 	xcb? (
 		x11-libs/libICE
@@ -103,6 +104,7 @@ QT5_GENTOO_CONFIG=(
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
+	tslib
 	udev:libudev:
 	xcb:xcb:
 	xcb:xcb-glx:
@@ -140,6 +142,7 @@ src_configure() {
 		$(qt_use kms)
 		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
+		$(qt_use tslib)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon-x11 system)