Add QTCONFIG definition for EGL too. Bug 340355. Thanks to Andrei Slavoiu <ansla80@yahoo.com> for the patch

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

3 files changed, 67 insertions, 2 deletions

diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index e55bb61f263e..77d93e5db534 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-opengl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.77 2010/10/23 15:35:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.78 2010/10/29 11:17:45 hwoarang Exp $
+
+*qt-opengl-4.7.0-r1 (29 Oct 2010)
+
+  29 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qt-opengl-4.7.0-r1.ebuild:
+  Add QTCONFIG definition for EGL too. Bug 340355. Thanks to Andrei Slavoiu
+  <ansla80@yahoo.com> for the patch
 
   23 Oct 2010; Raúl Porcel <armin76@gentoo.org> qt-opengl-4.6.3.ebuild:
   alpha/arm/ia64/sparc stable wrt #341703
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
index dc2f54fcc6af..ec685e25c8dc 100644
--- a/x11-libs/qt-opengl/Manifest
+++ b/x11-libs/qt-opengl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
@@ -6,6 +9,14 @@ DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eed
 EBUILD qt-opengl-4.5.3-r1.ebuild 1061 RMD160 ed33455a1a82bbe32367c65446a8e95fb6f7278a SHA1 60d24930e8f700efc94d2618b6891725b0a110ba SHA256 c4c6f23f6ebfa4870abcad43aae5aff98951fd1557d1eb36fe6682c9473cb411
 EBUILD qt-opengl-4.6.2.ebuild 1096 RMD160 86e107a1583c965841653f2302556f49c76bb7e8 SHA1 51299e7b974a0ee097eaae7bb1fd66f6a5ca8128 SHA256 b7eb0cc771a759a485a6656e2e96a5c03d093b7c87c87f9c5723c804635b5554
 EBUILD qt-opengl-4.6.3.ebuild 1094 RMD160 70d303a2ee091b8bf0b39743b5b9bee0af63baf3 SHA1 aafc55d5ba4b50b78623d85086ebed65f3c07072 SHA256 b26a87532deaf29800c1211d663d849fb61925eaa2b4eba54cfd9a1d6fd1546b
+EBUILD qt-opengl-4.7.0-r1.ebuild 1217 RMD160 fb3c1632473c77a30de74d1c9299f2e0f4d64a1e SHA1 1869d1481753181d90ba32daab7438d001ca346d SHA256 b87612d0c5218b4ff1c3b763552f0d2cbb9411408037398060933099829c88bd
 EBUILD qt-opengl-4.7.0.ebuild 1188 RMD160 debafbedb47e6e98e2198b97116e858295d854a2 SHA1 b8d75ca70049db5bcd9e755ae79b9de77b37a285 SHA256 a75aeecda94da7b0964ccbe47a98f4a2168e526e21c491656eb41a8e9517f119
-MISC ChangeLog 9668 RMD160 d42e23b2ecaeba38356d63c30be75b5099138479 SHA1 443a6bc0e9f0e2c16a14c2a79a96e9f4237b81bf SHA256 81abc68692bb7b2fd1733536cf9d4811a16260b84be00e6618617c12048044b9
+MISC ChangeLog 9900 RMD160 411ae9c1aea88091e457d89a12a650d8d113865a SHA1 7d88ef675d28b698fece6f26e2ffe598c69fb9d1 SHA256 5ba045b97481257b1ce3bc7525d373a6fa1036def43e5142cb29367860230b55
 MISC metadata.xml 479 RMD160 61de0f0b09790652b18657d387d0cb0f4b3f2e0d SHA1 f69c4634719d34138fa1cdf92a1f017ffdd9b41e SHA256 7b918c6142c22badd56ba5c77dcb5c403321fa1b7ed7cd355da91a0dbc8b45e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzKrUcACgkQ9/cejkQaxBBZJACaAu2ASklrCg47UIXKAut6xlzE
+GEoAn3oXUXyxqCzfP5wE+YfhnhBaF0mS
+=po1O
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-opengl/qt-opengl-4.7.0-r1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..b26bee44b6c9
--- /dev/null
+++ b/x11-libs/qt-opengl/qt-opengl-4.7.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.7.0-r1.ebuild,v 1.1 2010/10/29 11:17:45 hwoarang Exp $
+
+EAPI="3"
+inherit qt4-build
+
+DESCRIPTION="The OpenGL module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="egl qt3support"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=]
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/opengl
+		src/plugins/graphicssystems/opengl"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtGui
+		include/QtOpenGL
+		src/corelib
+		src/gui
+		src/opengl
+		src/plugins
+		src/3rdparty"
+
+	QCONFIG_ADD="opengl"
+	QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf="${myconf} -opengl
+		$(qt_use qt3support)
+		$(qt_use egl)"
+
+	qt4-build_src_configure
+
+	# Not building tools/designer/src/plugins/tools/view3d as it's
+	# commented out of the build in the source
+}