restored gtk USE flag for GTK style, fixed compilation with cairo[qt4] present.

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

3 files changed, 42 insertions, 10 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 02a59b19cb2a..ffbba998b098 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.139 2011/03/01 19:48:09 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.140 2011/03/10 23:53:08 wired Exp $
+
+  10 Mar 2011; Alex Alexander <wired@gentoo.org> qt-gui-4.7.2.ebuild:
+  restored gtk USE flag for GTK style, fixed compilation with cairo[qt4]
+  present.
 
   01 Mar 2011; Theo Chatzimichos <tampakrap@gentoo.org> qt-gui-4.7.2.ebuild:
   Raster is not default any more, bug 353248
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index c0a29fe856a8..4062880c47eb 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51
 AUX qt-gui-4.7.0-qtreeview-regression-fix.patch 490 RMD160 b3b5e806d6662c1216ca739c5f4c9655508e4811 SHA1 45a3cab07b1ba8a267efd9c7984d69e080798905 SHA256 aa1b9ac7ad0ff9b6bf715507dbf8bcf15cec1ed1e2f4da893598553de3f34340
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
@@ -11,6 +14,23 @@ EBUILD qt-gui-4.6.3-r2.ebuild 5459 RMD160 6541881d8db2078be86318b1a4e91828f3893e
 EBUILD qt-gui-4.6.3.ebuild 5454 RMD160 98d7baf9a0ee82968840ee5e2a510af7a838e00b SHA1 0ca2dff37896de1826e6290f975a76725f959f66 SHA256 1bcbf0f815173da4baa6526a9a833f40c5a753840789174e8297484d4efd7664
 EBUILD qt-gui-4.7.0-r1.ebuild 5755 RMD160 e80835b6a9822839d7833a805f2043a5fe99fdfe SHA1 43ba02a86a0d89b58ba9a6df6b4ebcd3f0e0ea90 SHA256 8bec24382a8eff8efca575446b44c0cbf901ce86812525d46dda382de1498e5c
 EBUILD qt-gui-4.7.1-r1.ebuild 6027 RMD160 11864bb2743b52296f3e464efc788e602473b4b5 SHA1 07b457b3fec085f94511872eb95e25c780787dd8 SHA256 ce81a35fe3af9ced225f6f7d547f286af098419ba99e341555f5889791faebfe
-EBUILD qt-gui-4.7.2.ebuild 6025 RMD160 173bc711df0f2c83aac10ce7f0db1288a8635e3d SHA1 3c7603f1ed087e63c0619a3e78c7b12d8425bc2d SHA256 21f632b7e8497e8413cede761e577b9540dcc25934a2ab15bb1dd44a9ee03378
-MISC ChangeLog 20933 RMD160 d1df3958d6c69152c38b394a51423eb4352192ed SHA1 d18ab22db4d0f804e2f70dd45dbdac8047230510 SHA256 64301aaa66547e8dbe2e2811ff1cb3c4fd08df2b343ae430ac575685dd762250
+EBUILD qt-gui-4.7.2.ebuild 6226 RMD160 7f9d21ee7e101499545b7ff562bd38cadbcc0b80 SHA1 d30bb8cfae170bc74230357ff00a7ddd85c35055 SHA256 86500cbb860ee98543aa055affa8b571944b1e91f00c382f9139074e1fcd5c47
+MISC ChangeLog 21084 RMD160 95d1b38f422e39e2498e0f0cede872212d98b66f SHA1 c5c77c648af79ae1515d7028507b9ccfc11227c9 SHA256 f8d8a824960c7a399c7c9693e2bd2744c1e30913899b9743ead92c39207db573
 MISC metadata.xml 1084 RMD160 bc1dd67f584f23b4dd4e5529f38b5f20921076f9 SHA1 c80b810f2a6aac61175e55274f9791439b48a1b4 SHA256 d96e2b40aa3339e1366105deb89479864167e3ce72f94d0aa907a07861abad4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNeWSBAAoJEDZF8K7rm0r6+u8P/3uYncLUtXLrWYinqHSf0SNw
+XiCTHkuVD3ntO//o0yPXOnfB/RKn43ueJVUK4lAUes1ZJUHA91NlnoYRMKKU/oMa
+dg4l0QA/P1l5XES+S5y+XBQFZR+wtgD3l+hM/vqRbBUCnl7Gb8talrIF7QnDUKa1
+6qf6GVPigqxcXUHQ2eUW2g+xSyo/n5CQKYnd1zjoPYnWkU08YirOzStsUST+QL+u
+mSTfgNMxqZAcTxORprLHgM5NLOix05NsDtlSgUYvLWfeveDM1vlHQ81qPBp0VDbT
+cDelxlLLQIku5HoqAdYYz89zhdoRYDxdaGiyqhRjaKCm6QgSQQSiB6hCxK6jBChN
+lU1PydnaJuYfuychQkPc59gG9T1hF8JA4nFOUb3xQknIIYf+mw1PncT3+rc9x/Nl
+QdUKrhel57+l0XatOn4XJ6KOKnGCrVv3noDwcphxuOSyuFBt6bHqhd+bKF2Yie+/
+V8VUMkgwlymLqLC/pU5R+fvcQXXvUEuK/BJEreVqtpEaAD+xUXFmzT2uXP7/nVCW
+bZb2CS1ALJuZAyiRPbbECZ2k4jdWUwIHYfL6iaSeG4L4US2FtYYWv278Fy3W6z4R
+sdVGJjUx2NwYkMSF+h+6Cs9oNtKWL8gGqaQ+Qhtca05f+WtjKpXyytY0sM6WFOEw
+/GRznAQ+IIMxP18Ngsoi
+=XXPv
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild
index 3d593357d58d..abbf35484af0 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7.2.ebuild,v 1.2 2011/03/01 19:18:22 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.3 2011/03/10 23:53:08 wired Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -8,7 +8,7 @@ inherit confutils qt4-build
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="~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 egl +glib mng nas nis private-headers qt3support raster tiff trace xinerama"
+IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support raster tiff trace xinerama"
 
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
@@ -28,6 +28,7 @@ RDEPEND="media-libs/fontconfig
 	)
 	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 )
@@ -39,17 +40,17 @@ DEPEND="${RDEPEND}
 		x11-proto/inputproto
 	)
 	xinerama? ( x11-proto/xineramaproto )"
+RDEPEND="${RDEPEND}
+	!~x11-themes/qgtkstyle-4.7.2"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
 pkg_setup() {
-	echo
-	einfo "Qt's GTK style was moved to x11-themes/qgtkstyle to fix bug #336801"
-	echo
-
 	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
@@ -99,6 +100,7 @@ src_configure() {
 		$(qt_use dbus)
 		$(qt_use egl)
 		$(qt_use qt3support)
+		$(qt_use gtk gtkstyle)
 		$(qt_use xinerama)"
 
 	use nas	&& myconf="${myconf} -system-nas-sound"
@@ -107,9 +109,15 @@ src_configure() {
 	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 -no-webkit
-		-no-phonon -no-opengl -no-gtkstyle"
+		-no-phonon -no-opengl"
 
 	qt4-build_src_configure
+
+	if use gtk; then
+		einfo "patching the Makefile to fix qgtkstyle compilation"
+		sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
+			die "sed failed"
+	fi
 }
 
 src_install() {