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

["Michael Palimaka" <kensington@astralcloak.net>]

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"