renamed gtk USE to gtkstyle to avoid circular deps. added sed to fix bug #361277.

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

4 files changed, 33 insertions, 23 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index baad276835ae..2b7cd282457b 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,11 @@
 # 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.141 2011/04/13 21:06:17 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.142 2011/04/14 21:49:23 wired Exp $
+
+  14 Apr 2011; Alex Alexander <wired@gentoo.org> qt-gui-4.7.2.ebuild,
+  metadata.xml:
+  renamed gtk USE to gtkstyle to avoid circular deps. added sed to fix bug
+  #361277.
 
   13 Apr 2011; Alex Alexander <wired@gentoo.org> -qt-gui-4.7.0-r1.ebuild,
   -qt-gui-4.7.1-r1.ebuild:
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 686662e0b4df..b9616a9f4527 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -10,23 +10,23 @@ EBUILD qt-gui-4.6.2-r1.ebuild 5406 RMD160 2d1fffa346058e96ad5bb286f7da1fbb590c0c
 EBUILD qt-gui-4.6.2.ebuild 5296 RMD160 ab8bb6867607ff4cb26ab80a6c19fee98a3c153a SHA1 38dce089ecf480391beda7679f7584c95f5afb6d SHA256 ff77bcbeeaee3214b8cf66215caeede0b478f53bc3211ca3c246a6c968540286
 EBUILD qt-gui-4.6.3-r2.ebuild 5459 RMD160 6541881d8db2078be86318b1a4e91828f3893e78 SHA1 3913796098062a95abdd22dd3e4250260a46cfb1 SHA256 56614553e86dd21c156ff445f48c8308e86793547765323d6bac2dd9eaece462
 EBUILD qt-gui-4.6.3.ebuild 5454 RMD160 98d7baf9a0ee82968840ee5e2a510af7a838e00b SHA1 0ca2dff37896de1826e6290f975a76725f959f66 SHA256 1bcbf0f815173da4baa6526a9a833f40c5a753840789174e8297484d4efd7664
-EBUILD qt-gui-4.7.2.ebuild 6226 RMD160 7f9d21ee7e101499545b7ff562bd38cadbcc0b80 SHA1 d30bb8cfae170bc74230357ff00a7ddd85c35055 SHA256 86500cbb860ee98543aa055affa8b571944b1e91f00c382f9139074e1fcd5c47
-MISC ChangeLog 21208 RMD160 846a047da712890cf30db157936be0dde81d5dbe SHA1 7581935deb3e486a1c34c30288aabda3f1108c91 SHA256 f7e9878930cbc317b650a6d094e7464978dc1cb2d387b868331ff763d0180f2e
-MISC metadata.xml 1084 RMD160 bc1dd67f584f23b4dd4e5529f38b5f20921076f9 SHA1 c80b810f2a6aac61175e55274f9791439b48a1b4 SHA256 d96e2b40aa3339e1366105deb89479864167e3ce72f94d0aa907a07861abad4c
+EBUILD qt-gui-4.7.2.ebuild 6371 RMD160 02041643c251b40e5a113599445cc7659101a5ce SHA1 d3fca3ff2ae3937a189fba4e8baf97bee4fe67d5 SHA256 b8cb2808d08581f2659db454b3c1dc7a1180eefbc2f0ed4401fffcf9913981b7
+MISC ChangeLog 21381 RMD160 8eeaaa471557c7fd535df9989f5fbce7418ecb96 SHA1 1d0039cebf5235b596f636045bf040c5524e5b53 SHA256 9fc3198aa775da72e6938c615c3ec8b9caf6618d19fc5bc361e015dd68c07943
+MISC metadata.xml 1181 RMD160 74e177f4c687acb1df2637f28ac36cc80b4f224e SHA1 3ea8a8aba7d077d6a008b8360811f4e43538232b SHA256 49515885af0ad4b13d4f93911c0b8b84e25abcda3fdc8e5715b1aa956b18af15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNphCsAAoJEDZF8K7rm0r6u9YP/3LuMt16bZ5Nvty9xl7j7MIo
-w6+6JQZ2xBJH9kqQZp/r0Y4LKInzBpqTeefbAtUR9mWyRqbdFshX+8GstsY6fJm3
-xdFd7uJ+F4b95gW5c34nZw+aZfHAk59KV7DcptdMNIyxwtIiR00KiM2K4KCY0Ndq
-zk/xZOIF235Gv1foGy5s/iJirCw617RkVqXRwMGGsShneJDHin9V2KvqxBivq6ma
-9xGHpiYYzzhae5kNN8PV+jwIafMiomlf3yDHjzAmEPmoa+ZcCLQBdK1etA+tstN6
-WKArU7tX7fP8NMK5OYpFvGiIF/qSZ4Nqg6g5dhR1oF7wyUQ217UuvZsWTGJGGp6e
-/rsaSJfNeUKWbI06wzQY07GXC7y/nJEmKlnE7gwj2Bn2vo+w37EnUjKSs5NiXbJd
-3VRLvpjOgHNVU0p9Ojlv08dZ1xnxl1I/0C/MUzTbOHFfVByM+94mDCM/1qEK4BkN
-14vzfTWpjTTzS7ZXDrlzudkNYgsmPjBoWUFj3x1tQ6XC3QIs8/fiix6J5N3fbmQ/
-BKWN/+dqeIqI2JCdiXRVaMfxj8F4K1BsHZd4oMMpU0gjjeLYVIVVfuZHgCUjXA18
-cjOEY8MMIulkTDuFxpvdBHOgmSE2GtwQyjN7ADfyJ/QWFyz+36TdkocsQu/+IuF2
-lql8w0zVad2xq8NG69JS
-=iaue
+iQIcBAEBCAAGBQJNp2xUAAoJEDZF8K7rm0r6Yk4P/RoWqakp6/SJTIN8IsJIKQf1
+C7pEBYOaOLZMIYL8r8TEJ8mC5GoPENGpxAYTFXfsTnhnj2LGaucur8kOWuL5JeyT
+/ZqpPz/KrbAtjFLiUtT83lq5o+NmXcK3bWoSbWKBmoUQ7z03Zcva/sVzIrvDuQuu
+FQAT9Rzocg6m8jQvvSooyXzvDuzJVUuwNzMezU3RaoulVOt0kv/6bw6mTjHqOwbC
+jT4f+STJNmpeY80ZtgOhQV2X/RI2zlx0GMXIZTb2W5gnlmyslaXQsaTLod8j4ixp
+gx+R7FdnOWadojoNgsfosXvmRWMPWyjFtfkVu3i9J3jmknIknywv+ZwNXmshiJe5
+tSXC2b/bwLcjaHcDoO8iGIlPV4qUGo3Hqli+8M6/hbchqdMTU5zGYpLQ75SVN5sV
+b4is59xRFc6pHXJkQWywC1c4BBAAoUjFV4XntoNoPEMtfEgrLsPVE2K1sceUczzS
+ilt65e8yvTfqrW0jfYHLRozRxqj39wjByq8X5DG0WLjhHIn5nS000ApJXV+UMLk2
+sQoFQlzQlfaSENYdvdjKQAsg4gGJEPek69hkLFfIJqqDQyI4exZIWP6yjRemDBIG
+Wzepuyp4HP3jBbcM/6Bgn030ppTdRZiGeoZPPQpp3OqSGRqWi+6yq2CklRndaX6m
+oYBfXb4jRZ9ujxdaoTxu
+=zO90
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index ec335884371d..15807abbcc74 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -8,6 +8,8 @@
 		<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='gtkstyle'>Build a Qt style called GTK+ that mimics the active
+			GTK+ theme</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="private-headers">Install Qt declarative private headers
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 abbf35484af0..3061b8e485d3 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.3 2011/03/10 23:53:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.4 2011/04/14 21:49:23 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 gtk mng nas nis private-headers qt3support raster tiff trace xinerama"
+IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt3support raster tiff trace xinerama"
 
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
@@ -28,7 +28,7 @@ RDEPEND="media-libs/fontconfig
 	)
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
-	gtk? ( x11-libs/gtk+:2[aqua=] )
+	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff )
@@ -49,7 +49,7 @@ pkg_setup() {
 		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
 	fi
 
-	confutils_use_depend_all gtk glib
+	confutils_use_depend_all gtkstyle glib
 
 	QT4_TARGET_DIRECTORIES="
 		src/gui
@@ -100,7 +100,7 @@ src_configure() {
 		$(qt_use dbus)
 		$(qt_use egl)
 		$(qt_use qt3support)
-		$(qt_use gtk gtkstyle)
+		$(qt_use gtkstyle)
 		$(qt_use xinerama)"
 
 	use nas	&& myconf="${myconf} -system-nas-sound"
@@ -113,11 +113,14 @@ src_configure() {
 
 	qt4-build_src_configure
 
-	if use gtk; then
+	if use gtkstyle; then
 		einfo "patching the Makefile to fix qgtkstyle compilation"
 		sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
 			die "sed failed"
 	fi
+	einfo "patching the Makefile to fix bug #361277"
+	sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
+		die "sed failed"
 }
 
 src_install() {