Version bump. The designer, linguist and qdbusviewer applications have been moved into separate packages.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 225 insertions, 16 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 279f53226d9b..a21fba3b8b21 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.4 2013/03/12 05:51:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.5 2013/07/09 10:40:42 pesa Exp $
+
+*qtgui-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtgui-4.8.5.ebuild:
+  Version bump. The designer, linguist and qdbusviewer applications have been
+  moved into separate packages.
 
   12 Mar 2013; Davide Pesavento <pesa@gentoo.org> -qtgui-4.8.4.ebuild:
   Punt vulnerable version.
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 79f136f9428b..4f94dbe5e861 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9
 AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtgui-4.8.4-r1.ebuild 7204 SHA256 5b818eff711c7e5fe8b7324e4f6dbf4dec561fd685dc85815cc087643ee401bb SHA512 51dfc7359f8cdcfddd42b68f23f8295d0fc8c8f53304d669c0a541608331f416865a800399393d2d2c7b870279380ad61b50e01aa7ca3b36ec308d67bb37eaba WHIRLPOOL ec262059076ab41d31fd021ff5672d8d2c9a8d11b93afc0468400f11daf27f82292d35ef0669668832e15d4f25c3d7355a05bb2092d6a8fbf3412638d9eea481
-MISC ChangeLog 33881 SHA256 71e575b53c9d74eb4d8faea7f1eaff48bd29ab269b8ae76d0497d7700aaf70d2 SHA512 3192d08c7cee713aef1e262601eb6d39cbcc4393a05a0d9bcd86d24af89b63238c880ab832bea1f634a7d528f4baaaf1ce4cd07c5e3942802dd97e5ec3ce790b WHIRLPOOL 8020341605c19ecbf35f1a4891b8ec949317bc34d3b638ead56f2233c11d24edcbdc2e81841e58cbe8c1a30a6def35f8e9b1b0e979d1ea6f533b30d74402253c
+EBUILD qtgui-4.8.5.ebuild 5595 SHA256 6b6e4d7fb15eac74f224854b81446b37ea2fd4e2c8a6b90a9ee1c3902b0a8d7f SHA512 5b465f6f80ea0e9470a18438be27c75b499ae6e0f0bf17445e3cd6d741ac6d4fab33a3cc9fbb090591767d8cfd61cc3d2ec6ffbe3e2b77819d9276b87c418f36 WHIRLPOOL 1e177872760025384eec4ef77abca18f4dfc49f6cfb3f8a68a2db167c58a3bbc56d99aa4f42d777d655d06ef458a47b76bab4a8bc4328fe5b5e60dd49d510e17
+MISC ChangeLog 34091 SHA256 2ebf96851073023c4e614e37f3c1b9842b0d551f2a4a870fe889ad83334c2477 SHA512 ed772b222456069988f52a6b5adcaf8bf886c11ec4ef80fbceffaa2f938ba1e5997075a2a5695eadfcb285792b6c858722ab448d61dd099605da30c2be34f2ec WHIRLPOOL ab268c9ab624250284138336f6695547482c90facd6c510e5059f3a1800530481dccb69730896a59ffc052aa5d75f2ec2fa79db42cefee84c0cbdbc83797a80e
 MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRPsJZAAoJENXLsxwXqFxywl0P/R0yodwfEUy4pbpsCr4xBauJ
-dNxNUcok2vlFLJCLdv+D++UgEwPvifbExu8paEngClKF9E2suFOwpWD2dEugfMoT
-Ktw/iRyGvpVljkpXWhqCnOX9ITG04jIRg3sVs8OpOhMhzRRpDi8+CcuViZdpt5mh
-l2pvOCsQUpiZUT+xsPYxjeN+I7FBRIyxA3SJWOL2BA8JnRhNI6xIML8p2oILFj6q
-bhPjw8qflfGKsH/QbtEdoyirNiwBEQcUabaC4POx0Ccfk3O5NSjMcHUJYHI3xDsC
-WPN6kc+/TCRJQkvJOu3WqY/+GqaTCy83hbbMn26SaVMXyq+/ormKBU93lOV/iCBd
-DOqv8AujXy0/pU6zAYmdjDxAqVQoVXf+GZnzRTmCPZpVWFOZY7poqYj3T1nyI1qr
-zR0LpzvHoiyZ3cUPmGMWmVf3Zfy0N+HZLkPx8hJTeSvR/1ZJAiarK/lQhQOLVNsi
-mDYpmPRQgzI5oQiflX+UD2BzK2rVm0eqThxvSrqhyY/oZPqXWezfvmZ/BpmV7FCX
-IIq96vTTp1TJw/LpfyiTpQRNG22Rd8GjoPRdoHcp3Ktx5S6aKRsW1ed8Xn7OzQOB
-aBE3gs+QMNJbWuLdjyZVUe0cZzIXd1nnwXI+wV4w8xiFh0w5AH+vp6YHpXSo+Jl9
-7iPqJ5D2ZPHl7jRG0Df7
-=lsMP
+iQIcBAEBCAAGBQJR2+jKAAoJENXLsxwXqFxybJYP/jXrgH+geKOgeorFtEBgj1W5
+/2ksvuhLzMT8SRELZ9p0OObtel6kgfF3lAeZDvAGX4PZu7Y1UEmpdKnrmHS/aZ+d
+fex7jVAjZ95awVjnOYDF872pEa2GrDjiG0uiuqt+Cu8G+A+w3tEZa2Q+D5c72gPD
+USyxJ0R8zTjE6wQAYsWSS/30/x4RC/Ru4FIT2D53t4NLOHl/OK9/gQ+9H+egEPL1
+0bJCqNH7jJTIQU4XcX2CgmMLLfZbpsj9dfRzhbv+zfgK5u22HMwQE4/rS/qzFpT4
+FhXf0HJ7KYq5CFgGZ9a3dcZg+XgkS8VD1+yXoaCnoJPSL7hDQNeUMhAaTEwQe3tW
+J7rH3lLzEH1vKpyIhG4nf5JlDQYCRnxr4q7Zi+j/Zgoqn+t5WYES5XtIfRHzrmXq
+TgDNIFz1U1pUoGlehvCJ194MG6TXUbOi5sjEzDS6MaJyGIKl+JDQdqPKrkzfvj42
+qASZp74S2Vgw89C4cLqQJAuZ+Sw8GNI1dEqCye6kBRNHs+KeQALrHnPXDeUbK2WG
+RRIxuLHIp1sgKzWlVE74IwxhHleOMZAwOXkxzrCI24ppZ5Ewpg6uw8Y/2mpNQ0un
+uAiHpizwYRwiRztKTTyZKH+bTG3NGPEa8+KkWjTmCV25LLUncU4Bt7LW6A1+TVT+
+fdgHN/afzsX4Sx1pAgfn
+=q17H
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/qtgui-4.8.5.ebuild b/dev-qt/qtgui/qtgui-4.8.5.ebuild
new file mode 100644
index 000000000000..c79cd2508e18
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-4.8.5.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5.ebuild,v 1.1 2013/07/09 10:40:41 pesa Exp $
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
+
+REQUIRED_USE="
+	gtkstyle? ( glib )
+"
+
+# cairo[-qt4] is needed because of bug 454066
+RDEPEND="
+	app-admin/eselect-qtgraphicssystem
+	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
+	~dev-qt/qtscript-${PV}[aqua=,debug=]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	cups? ( net-print/cups )
+	egl? ( media-libs/mesa[egl] )
+	gtkstyle? (
+		x11-libs/cairo[-qt4]
+		x11-libs/gtk+:2[aqua=]
+	)
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		xinerama? ( x11-proto/xineramaproto )
+		xv? ( x11-proto/videoproto )
+	)
+"
+PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.3-cups.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+		src/scripttools
+		src/plugins/imageformats/gif
+		src/plugins/imageformats/ico
+		src/plugins/imageformats/jpeg
+		src/plugins/imageformats/tga
+		src/plugins/inputmethods"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src"
+
+	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
+	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
+	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
+
+	# 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
+}
+
+src_configure() {
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nas nas-sound system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use gtkstyle)
+		$(qt_use xinerama)
+		$(qt_use xv xvideo)"
+
+	myconf+="
+		-system-libpng -system-libjpeg -system-zlib
+		-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
+
+	if use gtkstyle; then
+		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
+	fi
+
+	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
+}
+
+src_install() {
+	QCONFIG_ADD="
+		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		fontconfig system-freetype gif png system-png jpeg system-jpeg
+		$(usev accessibility)
+		$(usev cups)
+		$(use mng && echo system-mng)
+		$(usev nas)
+		$(usev nis)
+		$(use tiff && echo system-tiff)
+		$(usev xinerama)
+		$(use xv && echo xvideo)"
+	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+			$(use cups && echo QT_CUPS)
+			$(use egl && echo QT_EGL)
+			QT_FONTCONFIG QT_FREETYPE
+			$(use gtkstyle && echo QT_STYLE_GTK)
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
+			$(use mng && echo QT_IMAGEFORMAT_MNG)
+			$(use nas && echo QT_NAS)
+			$(use nis && echo QT_NIS)
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
+			QT_SESSIONMANAGER QT_SHAPE QT_TABLET 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
+
+	# install private headers
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
+	else
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+	fi
+	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
+
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		# rerun to get links to headers right
+		fix_includes
+	fi
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+	touch "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+
+	# bug 388551
+	if use gtkstyle; then
+		local tempfile=${T}/${PN}${SLOT}.sh
+		cat <<-EOF > "${tempfile}"
+		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
+		EOF
+		insinto /etc/profile.d
+		doins "${tempfile}"
+	fi
+}
+
+pkg_postinst() {
+	qt4-build_pkg_postinst
+
+	# raster is the default graphicssystem, set it on first install
+	eselect qtgraphicssystem set raster --use-old
+}