[x11-libs/(core|gui)] version bump to 4.8.3

4 files changed, 30 insertions, 56 deletions

diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index aa53f1a..716b4b5 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -5,5 +5,5 @@ AUX qt-ccache.patch 2126 SHA256 f300bf8c218060111b7b9d3abaf50802eeb0cba11b7a284e
 AUX qt-core-4.7.4-fix-libreoffice-crash.patch 1958 SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844 SHA512 245968b50d3753bce819858b016c3c2338ef8edd5565c6ebaf5eabb97970a7b7d45e03a235be41d0fec371db9cc97fdb93987e6b837563f8fe2eece791d7395e WHIRLPOOL bda1d5134ebca9f98b38e6eee876ae57cfa26f3ecc465cb1f89d13ad8a4e372a0410d4ec0da18cbe18cc7b86e8f9ab402b99e113d741c80c55660ac8225cc854
 AUX qt-core-4.8.1-localized-time.patch 414 SHA256 cfba302368ff281f94541549c9489517a5f13467583d87dd966ec255b92ff92e SHA512 f98e64ef6d866bb285c4eaeb891113bdc39e060fb990b44cce5d9fd969084b6acb0a215c2116753282e73b4d5c1892dc08326625c713d64317c6553b783192c0 WHIRLPOOL e4c4e0becffa91520b26bed2925832341c4156212e9e53c75b6313a3b98a02c96d000be8d625286bed2f7a89e11a8961c8354901e3c8cb0e6d2bc89d1ee1e132
 AUX qt-cxxflags.patch 791 SHA256 f2a7391dd78f152f1cd90cd62b84e4001be2176addfe1e3ca7c50c09b3a686fd SHA512 5bcdfc5ef0e7f0a2d388f13348ac66a6c0acbed7c043eef77e299d4cbb5e7d36cd172b585e560d96ee21de5482c4c31473ce9cee21525f301d8d659d68974b5d WHIRLPOOL aec5f5103302a3d8253ef904aace2e65f594c36e30a5584ea93406a770372757432ec5ec9e43105b8f7e113e8937d1f1fcbc7c1f7e7c8af0a10fb4b50d9cea9b
-DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
-EBUILD qt-core-4.8.2-r1201.ebuild 4808 SHA256 f99810262624dc8cfbfaae6198c3fa86b7005b91f3efbaa7165b0e35d84bd9d8 SHA512 bcc983aec40a451be84b0d48cd71f5c7d877703ef5160f6e661adbdcf350e6d3ed49074bcfc16117df42f6d7696cd58146fb0a2a1334bf69284ee8e361b10e39 WHIRLPOOL 31070c4ef90026788e3615409a49119cd765a6f13fb8c6f8d45a595f742a9d6ccd3b24cb36bac485bcbd7cbf725e29a6219d225acc28222322676325ddc3e102
+DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+EBUILD qt-core-4.8.3-r121.ebuild 4817 SHA256 043b27b5ffd581acb985e868990edc58c14e84e90deab8cac0ee62da4a556a72 SHA512 129ff5b16897cb5d512408255e41d41032cf98a4540beb6bfd322e72b9ea0171774ffff564d17abe82ae519d3b829d637c11312c914085c500400e27178e122b WHIRLPOOL 5307fb1d1a7e0f9ebc6625a14fe2b70d90c6c348cb9ca995444f119389c9c4f9f816c4e63e0ffe03739222d1beb67ada496300c2e2fe95324e90d4d0564bdcf7
diff --git a/x11-libs/qt-core/qt-core-4.8.2-r1201.ebuild b/x11-libs/qt-core/qt-core-4.8.3-r121.ebuild
index 3c73874..62831e4 100644
--- a/x11-libs/qt-core/qt-core-4.8.2-r1201.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.3-r121.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.2.ebuild,v 1.9 2012/07/19 20:49:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.3.ebuild,v 1.1 2012/09/14 07:33:26 yngwin Exp $
 
 EAPI=4
 
 inherit qt4-build
 
-DESCRIPTION="Qt Core with CXXFLAGS and ccache fixes"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 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"
+	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="+glib iconv icu optimized-qmake qt3support ssl"
 
@@ -25,14 +25,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
-	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
+	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qt3support] )
 "
 
 PATCHES=(
 	"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
-	"${FILESDIR}/${PV}-qatomic-x32.patch"
-	"${FILESDIR}/qt-cxxflags.patch"
-	"${FILESDIR}/qt-ccache.patch"
+        "${FILESDIR}/qt-cxxflags.patch"
+        "${FILESDIR}/qt-ccache.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 87953cd..b46b243 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -3,5 +3,5 @@ AUX qt-cxxflags.patch 791 SHA256 f2a7391dd78f152f1cd90cd62b84e4001be2176addfe1e3
 AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
 AUX qt-gui-4.7.4-fix-libreoffice-crash.patch 1958 SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844 SHA512 245968b50d3753bce819858b016c3c2338ef8edd5565c6ebaf5eabb97970a7b7d45e03a235be41d0fec371db9cc97fdb93987e6b837563f8fe2eece791d7395e WHIRLPOOL bda1d5134ebca9f98b38e6eee876ae57cfa26f3ecc465cb1f89d13ad8a4e372a0410d4ec0da18cbe18cc7b86e8f9ab402b99e113d741c80c55660ac8225cc854
 AUX qt-gui-4.8.1-fix-calligra-crash.patch 1074 SHA256 94bcdce1b4d737bf7492bb1936502054fa9c66d1d55dfb437c644166b0281d7e SHA512 2cd94d03f9126548052d93c52ca6050cb908bdad55c6a4cba42f3d87cf17ae55976765a4d5bfc7b62c20faeb5f10ec679812ef8b4cd5e17e7c004a7932242257 WHIRLPOOL 610ebd81e8603fdacbc86d62cad001bc9d7a2c750ddda218bc38c9e4f9c90da9354b7f385989d93dbc90f144c1ca1e0853df5b2a6c927650c9f725719d368bfb
-DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
-EBUILD qt-gui-4.8.2-r1201.ebuild 8067 SHA256 e5bb9a71b017fc86935a021cc9972a8163b9ceafa1a9dd938e1dcc27bc273438 SHA512 be7737c9e973ee5490faf13a0e0b03d25f3d165e5beee02ad7894a1364c5042d7370bc59bded1f4ffe46c818ccc6716d16c86778496ed9d4a359a4790d46bd01 WHIRLPOOL 8823db3f8d315686553eec85e364939bd6e43761e09d0a46fd81678646e4153f0295d9e0158786a6c930533f9a3589e8d6b6129009d49ff142fb80b3f6bdc29c
+DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+EBUILD qt-gui-4.8.3-r121.ebuild 6987 SHA256 8fdba055f031d245e7faa3d61bdba3cbc51c7f5cb89e4e9be332df4f2337d3b4 SHA512 85e8af676ebb555a2b926a3722eb652a69cfb14d62b18a6ebb2642a63aae1b9a9c97daa5d69a29699a53e4d61029f1714b68543d19874b4f0f2b730783b4711b WHIRLPOOL 3f73986600d1fda8d33ae122f33a2a91177792c086c07aa86cfe88b5a27a1e475712f0a4f19903293d249ab700817adbe12d3a6f3975f4e433d1e5945f66a997
diff --git a/x11-libs/qt-gui/qt-gui-4.8.2-r1201.ebuild b/x11-libs/qt-gui/qt-gui-4.8.3-r121.ebuild
index bf87920..381814e 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.2-r1201.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.3-r121.ebuild
@@ -1,17 +1,17 @@
 # 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.2.ebuild,v 1.10 2012/07/19 21:01:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.3.ebuild,v 1.1 2012/09/14 07:49:53 yngwin Exp $
 
 EAPI=4
 
 inherit eutils qt4-build
 
-DESCRIPTION="Qt GUI with CXXFLAGS fix"
+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"
+	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 dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
 
@@ -26,8 +26,8 @@ RDEPEND="
 	media-libs/libpng:0
 	sys-libs/zlib
 	virtual/jpeg
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,c++0x=,debug=]
 	!aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
@@ -41,9 +41,10 @@ RDEPEND="
 		xv? ( x11-libs/libXv )
 	)
 	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,debug=] )
 	egl? ( media-libs/mesa[egl] )
-	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
+	gtkstyle? ( x11-libs/gtk+:2[aqua=]
+		!x11-libs/cairo[qt4] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
@@ -56,36 +57,14 @@ DEPEND="${RDEPEND}
 		xv? ( x11-proto/videoproto )
 	)
 "
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=,qpa=] )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=] )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-cups.patch"
-	"${FILESDIR}/${PV}-qatomic-x32.patch"
 	"${FILESDIR}/qt-cxxflags.patch"
 )
 
 pkg_setup() {
-	# this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
-	# was planning to use a dep, but to reproduce this you have to
-	# clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
-	# no need to restrict normal first time users for that :)
-	if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
-		echo
-		eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
-		eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
-		eerror "style cannot be built."
-		ewarn
-		eerror "You have the following options:"
-		eerror "  - rebuild cairo with -qt4 USE"
-		eerror "  - build qt-gui with -gtkstyle USE"
-		ewarn
-		eerror "After you successfully install qt-gui, you'll be able to"
-		eerror "re-enable the disabled use flag and/or reinstall cairo."
-		ewarn
-		echo
-		die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
-	fi
-
 	QT4_TARGET_DIRECTORIES="
 		src/gui
 		src/scripttools
@@ -200,7 +179,7 @@ src_install() {
 	# 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.
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
 	else
 		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
@@ -209,14 +188,14 @@ src_install() {
 	doins "${S}"/tools/designer/src/lib/sdk/*
 
 	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+	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
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		# rerun to get links to headers right
 		fix_includes
 	fi
@@ -228,23 +207,19 @@ src_install() {
 
 	doicon tools/designer/src/designer/images/designer.png \
 		tools/linguist/linguist/images/icons/linguist-128-32.png
+	use dbus && doicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
 	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
 	make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
+
+	# see bug 388551
+	use gtkstyle && doenvd "${FILESDIR}"/44qt4-gtkstyle
 }
 
 pkg_postinst() {
-	# raster is the default graphicssystems, set it if first install
+	# raster is the default graphicssystems, set it on first install
 	eselect qtgraphicssystem set raster --use-old
-	elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System"
+
+	elog "Starting with Qt 4.8, you may choose the active Qt Graphics System"
 	elog "by using a new eselect module called qtgraphicssystem."
-	elog "Run"
-	elog "  eselect qtgraphicssystem"
-	elog "for more information."
-	if use gtkstyle ; then
-		# see bug 388551
-		elog "For Qt's GTK style to work, you need to either export"
-		elog "the following variable into your environment:"
-		elog '  GTK2_RC_FILES="$HOME/.gtkrc-2.0"'
-		elog "or alternatively install gnome-base/libgnomeui"
-	fi
+	elog "Run \`eselect qtgraphicssystem\` for more information."
 }