revbumped r0 to r2 for users who are using the masked r1.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 181 insertions, 15 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 5db017cd721d..5d014bea0623 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.130 2010/11/14 11:06:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.131 2010/11/14 11:46:40 wired Exp $
+
+*qt-gui-4.6.3-r2 (14 Nov 2010)
+
+  14 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-gui-4.6.3-r2.ebuild:
+  revbumped -r0 to -r2 for unlucky users who upgraded to -r1.
 
   14 Nov 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.6.3.ebuild:
   added qgtkstyle block
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 589cd9778cd3..87198658fa87 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -14,27 +14,28 @@ EBUILD qt-gui-4.5.3-r2.ebuild 6122 RMD160 a6bcdfad1c798a825075c98416e3092af01271
 EBUILD qt-gui-4.6.2-r1.ebuild 5406 RMD160 2d1fffa346058e96ad5bb286f7da1fbb590c0c5a SHA1 d0ab4fe67490e083980dafdfe0f87b834bd00a6c SHA256 9b74117d6ae32f657902eb6a60a6e38fa2117c52b0f02a498257817ec9dafc41
 EBUILD qt-gui-4.6.2.ebuild 5278 RMD160 eada721c870c85bd495967649243a01b2988f0c0 SHA1 81e16ec0d5c6933238094891a636fabeff219abf SHA256 7e2eec54f7767bc1ce464f84b48e020de38388e37e60d29f5d6ba59009d4038d
 EBUILD qt-gui-4.6.3-r1.ebuild 5331 RMD160 23c227e49df64206b2a2056edc927c8367d4943a SHA1 15f70f48396932e6ebbf3163bb8f8c5b4b9c88af SHA256 73c0d3715538932b7c7aa95d3480eac0c17c7304bc15802fd0032e235c26ede2
+EBUILD qt-gui-4.6.3-r2.ebuild 5439 RMD160 93c850ac2b42f750f92a0e36ee024a16ad42ba02 SHA1 be337a8287d8f1e8139a0fbea17785650090341a SHA256 8e9cc6fb9aec33e30698df689e9b06e3ec65dec0e5022e162cf980c482d21d3d
 EBUILD qt-gui-4.6.3.ebuild 5430 RMD160 76985495039e7098e6a8c807fd09b38bd9006be6 SHA1 b62fa5afa984ef5fb419d2f8be9d66b2e9a7ad1d SHA256 10790999b575378f0da31700eefb93cb5dbb9153f0f3a6a17686ef0b7fc91a56
 EBUILD qt-gui-4.7.0-r1.ebuild 5755 RMD160 e80835b6a9822839d7833a805f2043a5fe99fdfe SHA1 43ba02a86a0d89b58ba9a6df6b4ebcd3f0e0ea90 SHA256 8bec24382a8eff8efca575446b44c0cbf901ce86812525d46dda382de1498e5c
 EBUILD qt-gui-4.7.0.ebuild 5638 RMD160 c85c46fb886f5d99d00ef4fed9c3313e7f598c0c SHA1 d4aa761e03094877e67d0c5210cc24dd27b2a563 SHA256 97d5c633c762d10cce97f34888eb54cb9656c815fd8dad52940c5d8f65dd1f6a
 EBUILD qt-gui-4.7.1-r1.ebuild 5574 RMD160 09f774096b3a609ab9b3750cb27bf349b2d84fbc SHA1 7faf52614d74fa9e05742f5666fb56cc5ea4eecc SHA256 ff8917f59ab5494eccea4cd79c76ac1c538d8ecc7a0f8d3f1d61f374750eab44
 EBUILD qt-gui-4.7.1.ebuild 5636 RMD160 75cffc665d9c6d4398a3d29270b3ce1c46d3f8e5 SHA1 0a7f51f849f0f2ec0642722d913c93f903ffb5bf SHA256 c06915e80c7dba48c7c6db2f91a446addb78042e86b9ddedd4c691083431b4ed
-MISC ChangeLog 19768 RMD160 64d5191f758ec4fa668c40aeb088ad73ddf54ae4 SHA1 e4bbabb61174b2fd45875baf7fc2d157bfee64a6 SHA256 b8e11b5bd0cb0824f998f86f42e7dcafbfaab043028fbf89ecd13567e33ed722
+MISC ChangeLog 19937 RMD160 0f2c836155fbfdd6a6e9e85cd4d07ca87023cd49 SHA1 e5299bf9a7529a582b9b23bd56161277de9cc45f SHA256 a7b2a71047072c8fcc9683df8d427127d4212f81f10655615ba22df6b7ab43f1
 MISC metadata.xml 1084 RMD160 bc1dd67f584f23b4dd4e5529f38b5f20921076f9 SHA1 c80b810f2a6aac61175e55274f9791439b48a1b4 SHA256 d96e2b40aa3339e1366105deb89479864167e3ce72f94d0aa907a07861abad4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM38M1AAoJEDZF8K7rm0r6GzcP/jhfAgS1Htovm9YVJKNuB2cU
-71adU7PXD0a88F5zMult++jFME0TouOHCDKXr8mR2U982f22wLRVJFF1xPLj1H5D
-h/nr3cmlD6dor7T4fYDnO6d4pAkFr9FD84a/qw2O8ndPYo9niyS4bjxSidjWem7z
-doxLFlsjnGtmC9faXjbTVkwL2Gh3CICz3xdcoXVsKF43/fJLIRB3fwNJm1nMn9yO
-2aqou1BE3vy+/SIbIHXaOLn0Y8iyoWAIusi0f/2bvbLuYrVyj9DHyO10QHqNbabH
-N4NERafuFyV427J/01Cf9Y0B2gxRniVVNADIepyI0VckTcuPYNYluz1aQ8nbT6J9
-vQw0B1vVpZbZPVGGREazCiySb/1NRjJ03l8pUTN659qJYF9pdmaHurUMps/QkcRO
-ysZJNLGg9xnT+5v548I92dj+YaXQvINY70bu7qsMuo9n1nKeD22hPz6M3Ct05hxQ
-us3F4VMbI+3x92lLqU63E/Q5TPJw68lEg9MyIodHnN1StukRFktYCGwxIFdb3R+w
-rhgcfw5oKd702kCmBrQl2WYltu2hNJhRMDkz+sJLdowNPx87MqLj98UGAjdLxr8Y
-2LFW0dfFoh3XdzvDmMKhxXRYaXAvkfTzHhExpsFqrxpbQcz7ZNm5Bb+RCUNAYqcK
-PxvgkXisOEFGceNJuRVS
-=/vnM
+iQIcBAEBCAAGBQJM38yLAAoJEDZF8K7rm0r6jBEP/RoLcBBA+aHs/jXaLy5At0bz
+F1zTTAV6g2nnUSQlzMCeTcXOHFj4Ci9tShWUP2lbXRqr//uLpcJ7lw/nq6eOuRAp
+OA/n0r6oY0Epl3Ah4J1Wa+eElXH5+pCjGh4ryl9cKmeE0O9gOWwzS8h8k8Z9Q+Wv
+h0N0je+yoyP7ZEXchZ9MB14yIBdoiKkS66vnjU7tPQm8c3Q47y1D4o3zNDwdCdmD
+LGwOVE9WzQvSWSqxCRvmRFVT0C4wPDZ3Bh3+gNxQPHL3nJbeUIC8Q1Nh1gGBB/Kq
+y/Zsq8Ys+HFBo2pe03Cmx9Ty/iGgdHvmDMjUR4j8/yPpAp3hkFkWpvSA5U37fNNR
+u//iIE21NNmeHZ0xL/qxEaATSJiY28Ihv6spCeBPB9rzUKiOff4p6YkteR+OBLpL
++yWe+HHgDHpHmycCWxzRPxJMR6B3qRXYtd6DmzBK1NFb2TOjlsG/a5uW5zK8+NP6
+a0iXhA2OOSYd6DFDrlOHvqiwZjMF9wh1uh/w1DFSq1bBJGqI8bInwg/LdZkR4Asi
+t00uAoQbNaVqRu/Svs6qudhfFIjDPKMdz+VKAaboROhxl3I/6WrP0xBoIEN/QGNC
+hnSc3rQXsGfRKwhMCv3yYbOEfEmO1MSLKNpMxLfMtPjrm8ykZoKt087EIU90bAyQ
+P7xrt/A/AqLiJnRi7s+7
+=p3CD
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild
new file mode 100644
index 000000000000..480e4fb85a2f
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2010 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.6.3-r2.ebuild,v 1.1 2010/11/14 11:46:40 wired Exp $
+
+EAPI="2"
+inherit confutils eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha 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 +glib gtk mng nas nis raster tiff trace qt3support xinerama"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXfont
+		x11-libs/libSM
+		x11-libs/libXi
+	)
+	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 )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/inputproto
+	)
+	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
+	xinerama? ( x11-proto/xineramaproto )"
+RDEPEND="${RDEPEND}
+	!x11-themes/qgtkstyle
+"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+pkg_setup() {
+	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
+		tools/designer
+		tools/linguist/linguist
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
+
+	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}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# 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
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)
+		$(qt_use gtk gtkstyle)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+	use raster && myconf="${myconf} -graphicssystem raster"
+
+	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"
+
+	# Explicitly don't compile these packages.
+	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
+	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
+
+	qt4-build_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
+		$(use mng && echo system-mng)
+		$(use tiff && echo system-tiff)"
+	QCONFIG_REMOVE="no-gif no-png"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+			$(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"
+
+	qt4-build_src_install
+
+	# qt-creator
+	# some qt-creator headers are located
+	# under /usr/include/qt4/QtDesigner/private.
+	# those headers are just includes of the headers
+	# which are located under tools/designer/src/lib/*
+	# So instead of installing both, we create the private folder
+	# and drop tools/designer/src/lib/* headers in it.
+	dodir /usr/include/qt4/QtDesigner/private/
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	# install correct designer and linguist icons, bug 241208
+	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png \
+		|| die "doicon failed"
+	# Note: absolute image path required here!
+	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
+			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "linguist make_desktop_entry failed"
+	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
+			"${EPREFIX}"/usr/share/pixmaps/designer.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "designer make_desktop_entry failed"
+}