Add xv USE flag; update QCONFIG_* handling; add libICE and libXrender deps; remove libXfont dep.

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

3 files changed, 75 insertions, 43 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index e9d213679743..be3918780931 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.170 2012/03/27 18:24:29 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.171 2012/03/27 23:14:20 pesa Exp $
+
+*qt-gui-4.8.0-r4 (27 Mar 2012)
+
+  27 Mar 2012; Davide Pesavento <pesa@gentoo.org> +qt-gui-4.8.0-r4.ebuild,
+  -qt-gui-4.8.0-r3.ebuild:
+  Add xv USE flag; update QCONFIG_* handling; add libICE and libXrender deps;
+  remove libXfont dep.
 
   27 Mar 2012; Johannes Huber <johu@gentoo.org> -qt-gui-4.6.2.ebuild,
   -qt-gui-4.6.2-r1.ebuild:
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 0255737abe49..28dc76f1bf01 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -12,17 +12,23 @@ EBUILD qt-gui-4.6.3-r2.ebuild 5507 RMD160 12202a5ad50432a891b3a86fe3aed2002cc390
 EBUILD qt-gui-4.6.3.ebuild 5483 RMD160 000cc1f41b04464e87fa72556484fb8bdbc17c8d SHA1 e3ff17f716fb8ca8d2b687b65d29cb4ad3ccbcab SHA256 2b2bfc833533b1ff33756aede685b1fc02b8ae25a9517098c9536bb12bc03e69
 EBUILD qt-gui-4.7.2.ebuild 6350 RMD160 a47834c6bc9471eeb188fd26ca1394083b08225a SHA1 8e34ec70e3a1a10a7302171629f8754ea13eabdf SHA256 43e21b9cea2aac8d8ee82d46585168436bfad570e3e0695244eb300d41c02110
 EBUILD qt-gui-4.7.4-r1.ebuild 6299 RMD160 091b2d9d4479eecf0ca94b38e3aef941a0c52ff0 SHA1 53c380c416c36356a6c7c3677287b3ade92790bf SHA256 1b651c907acc0efd16bde3dee2ea109442bf609c788937f652327a01a0154cc1
-EBUILD qt-gui-4.8.0-r3.ebuild 7298 RMD160 b838520f36d6f5207a1819ee977fff71f00beaba SHA1 7e50445be94f3deb728067bccfa431b127b96701 SHA256 b7932bd734867399f5402b016482681d18b798aa4ac16a7b960abb175bddb6ea
-MISC ChangeLog 25765 RMD160 2d64a26d30747a57535117ca5120f1ab5a9a773d SHA1 8a13a297d944251f86062502a1137ca807cd7689 SHA256 d81b51bc53ae840b65824c297e32eb8c0c89febca72c84af36d26db5b0f3bf54
+EBUILD qt-gui-4.8.0-r4.ebuild 7683 RMD160 383764f98c6110deaa0925ffbe81d2d78a562c99 SHA1 9c1572236fa1757590bbf1042645a5afd51211c8 SHA256 47612c49f8cb0faeaa58a27bddbaf43d71715e8e61ca3a5f04958b1babdb98fd
+MISC ChangeLog 26001 RMD160 3eba0766801034acddcedfa09fe5530f79c61293 SHA1 fc7a54821e1f1e6ecd70fbdeb77d4bf7f9c8de4e SHA256 ca24ce8428016ce230860acc7f26c25f57dea325d9ff27b7018b9e1c67ba5c38
 MISC metadata.xml 1321 RMD160 1542571f692bb2835d37878f355c92d733e67723 SHA1 da96dabea1aa946e1a5d9a983d6ea618dee58999 SHA256 a494da2f630a67491fd5f1950247277abce91216ed93b879cd511a13672da903
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPcgXlAAoJEO+t9ga+3I3aM3gIAIOz4P7mI84j7niBBD84crEb
-Mi4xXILjqliITxAKneRSPhKGqWCce7bNYuPO6tatR4Nx951TzqlOLfiSCP0GdT/E
-cnK5xGnK+OYiWUufEUO47+2PtLyfmEzlcY1Djn1ZctYsVGAbnKMR8luYIZmzeH8W
-zJ2TG+F7GOy9PjqphuOAYdKERm1QcMHolCa6HMYLrBZaJpYgNraMy+OVCBqIddOP
-+NuOVWTwI+TinnxlLw4o+h6B/5/30YpGIeTc230+yjZXcHT61vlIcUnTf3WHIlvR
-lYDJCH8pMjx0GaO6iGIziAWgbnnrMccaaYSVAtAFX1osXhN40HZv8+cXxklvTDE=
-=ucam
+iQIcBAEBCgAGBQJPcknSAAoJENXLsxwXqFxyMTwP/iEcfLGJH+UPh7ai+TYh+0ZP
+m3TVKAs8Fdvp0aQhfAdBHNJV8e9qkzk/2Ms6uQQB62S2h8XBB8xP5eSSrLCtzlgj
+e0gSaYKc3xsWv/OWklhGC5lLp/p3xKfwH4U/xk5BEczZ0705Q//eebftecBGV++t
+bcLWpLFRS9eZmCmZjVz+NO+A8bbtI7YyqrA5VILZa8K/H6DvEwkxBTjRJ97TDTlZ
+r3zfU4wMX4xy4GR62bh1WHP11WEbDO6FsKmPuOjHA/xSEBL2616Saq3WmsUT4OfE
+W12KNeRxEXOBqu0v/WTw0BOdxx7DXg8+Wi3Mc9q7Bm9GrdZIdpvK7oAIg28tg4hS
+5BkFGkCyf1Twz42qLEx5jMphIfqs3vYJaYTFSg5LW5nPEwDRMbVYLDQlPiEzDzDo
+Hd9847FAtIYzV+J4Gg04BZtIn8oYQnJEcIomQQKffbJlFnOq0QUYPhEl1/K2PtWa
+9DYGBlDfugmnKYG/ov24UzIJCiT0hi/WW6TVhLP/LY1ZOabLjlRrvFrZFkl98aJo
+BnSpM/KRVXT8tq8Md4EVh5r/esjWoexWlj+kjJS5HCdekEW18raE/a2GDOM1KZzD
+qHZFvI2nVfSyyq1N1tuGmrSHrHFb1hKhFHDLRZZK9105ykCmt2vZ3gtkfRh/JpCY
+FP0UV6kSZ9oowNvOYrNV
+=p2B6
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild b/x11-libs/qt-gui/qt-gui-4.8.0-r4.ebuild
index d9fb51a1a9f2..a5d3e85366a4 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.0-r3.ebuild,v 1.3 2012/03/25 18:52:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r4.ebuild,v 1.1 2012/03/27 23:14:20 pesa 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 gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama"
+IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
 
 RDEPEND="
 	app-admin/eselect-qtgraphicssystem
@@ -20,13 +20,16 @@ RDEPEND="
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
 	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
 		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
 		x11-libs/libXcursor
-		x11-libs/libXfont
-		x11-libs/libSM
+		x11-libs/libXext
 		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
@@ -35,15 +38,18 @@ RDEPEND="
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )"
+"
 DEPEND="${RDEPEND}
 	!aqua? (
-		x11-proto/xextproto
 		x11-proto/inputproto
+		x11-proto/xextproto
+		xinerama? ( x11-proto/xineramaproto )
+		xv? ( x11-proto/videoproto )
 	)
-	xinerama? ( x11-proto/xineramaproto )"
+"
 RDEPEND="${RDEPEND}
-	!~x11-themes/qgtkstyle-4.7.2"
+	!x11-themes/qgtkstyle
+"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )"
 
 PATCHES=(
@@ -69,7 +75,7 @@ pkg_setup() {
 		eerror "re-enable the disabled use flag and/or reinstall cairo."
 		ewarn
 		echo
-		die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled"
+		die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
 	fi
 
 	confutils_use_depend_all gtkstyle glib
@@ -89,25 +95,28 @@ pkg_setup() {
 		src
 		tools"
 
+	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
 	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
 	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
 	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
-	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
 	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
 
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
 	# mac version does not contain qtconfig?
 	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
 
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
 	qt4-build_pkg_setup
 }
 
 src_prepare() {
 	qt4-build_src_prepare
 
+	# Add -xvideo to the list of accepted configure options
+	sed -i -e 's:|-xinerama|:&-xvideo|:' configure
+
 	# Don't build plugins this go around, because they depend on qt3support lib
-	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
+	sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro
 }
 
 src_configure() {
@@ -116,8 +125,10 @@ src_configure() {
 
 	myconf="$(qt_use accessibility)
 		$(qt_use cups)
+		$(use gif || echo -no-gif)
 		$(qt_use glib)
 		$(qt_use mng libmng system)
+		$(qt_use nas nas-sound system)
 		$(qt_use nis)
 		$(qt_use tiff libtiff system)
 		$(qt_use dbus qdbus)
@@ -125,18 +136,16 @@ src_configure() {
 		$(qt_use egl)
 		$(qt_use qt3support)
 		$(qt_use gtkstyle)
-		$(qt_use xinerama)"
-
-	use gif || myconf+=" -no-gif"
-	use nas	&& myconf+=" -system-nas-sound"
-
-	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
+		$(qt_use xinerama)
+		$(qt_use xv xvideo)"
 
 	myconf+="
 		-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-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
+
+	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
 
 	qt4-build_src_configure
 
@@ -150,19 +159,29 @@ src_configure() {
 }
 
 src_install() {
-	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
-		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
-		gif png system-png system-jpeg
+	QCONFIG_ADD="
+		mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		fontconfig gif png system-png jpeg system-jpeg
+		$(usev accessibility)
+		$(usev cups)
 		$(use mng && echo system-mng)
-		$(use tiff && echo system-tiff)"
-	QCONFIG_REMOVE="no-gif no-png"
+		$(usev nas)
+		$(usev nis)
+		$(use tiff && echo system-tiff)
+		$(usev xinerama)
+		$(use xv && echo xvideo)"
+	QCONFIG_REMOVE="no-gif no-jpeg no-png"
 	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+			$(use cups && echo QT_CUPS)
+			QT_FONTCONFIG QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
 			$(use mng && echo QT_IMAGEFORMAT_MNG)
 			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
-			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+			$(use nis && echo QT_NIS)
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
+			QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES
+			$(use xinerama && echo QT_XINERAMA)
+			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+			$(use xv && echo QT_XVIDEO)"
 
 	qt4-build_src_install