Qt 4.8.4 version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
author: Ben de Groot <yngwin@gentoo.org> 2012-12-05 03:29:12 +0000
committer: Ben de Groot <yngwin@gentoo.org> 2012-12-05 03:29:12 +0000
commit: 0258073525bebf0fadcded9e354d75c76c367c4a (patch)
tree: fbf1bd0adee70fe7f43e26381a2302cf81a6e64e
parent: temp bump mask for Qt 4.8.4 (diff)
download: historical-0258073525bebf0fadcded9e354d75c76c367c4a.tar.gz
historical-0258073525bebf0fadcded9e354d75c76c367c4a.tar.bz2
historical-0258073525bebf0fadcded9e354d75c76c367c4a.zip
39 files changed, 1291 insertions, 146 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 8af558e5fe76..b7b7f7b1564a 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.153 2012/10/14 17:16:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.154 2012/12/05 03:15:34 yngwin Exp $
+
+*qt-assistant-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-assistant-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-assistant-4.8.2-r1.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index eaa5eb9f4e3e..6727f51d4fc5 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX disable-webkit.patch 872 SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b WHIRLPOOL 13848f7cc0f8df9b05da590cc61b7872f1eff7cc09d004d77c78b459ad5c0ae6623eb229484e256a3e582d43fd6573f06dbc01ccadd3cf6cb1f0d1d84e9bc92c
 AUX qt-assistant-4.7-fix-compat.patch 2987 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc SHA512 db10e2ba5fa7c513b39faef25dd160bc9cef8f28b6b11e879b66dadbc7bb9fbc2bfb1b25363c0d0d9c09cd97fba8734898ad6edef4a311234be65571c74c63ce WHIRLPOOL c4faaf70e3c836164abcafb3c1e6ec830e6e1871952291c11e3b8573dc51c8c6cb268c8455425cc6982e709f8f7cdc9a71865cf96165c504b9555776d884023e
@@ -11,16 +8,11 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-assistant-4.7.4.ebuild 3819 SHA256 6ffaa6f6fe3551239fb2c61dc143f83538e61ce85ce6c2e8fbdb9867737f6025 SHA512 12f463b6cb1ec21ce575c0be2e5922ba59fa9b04c1c4064832aed3e48e082e888493ac9e3779a1860a8481bd82fde1091d49b04483f837c0f6406becc299ee87 WHIRLPOOL 4f5a583efffdbf29e713d28300a3ebc2a3f366add64e67cc09561af47a8e07ff9d5ac68593ffaf48dc7479fd6b5d89f7baffb424acd6a54410ef233178329fb4
 EBUILD qt-assistant-4.8.1-r1.ebuild 3331 SHA256 974e8b49d83619957d37e1c9bd070420a7c67f28b3554070de48309c9618be76 SHA512 4bf68391b2d7b818141956b3de03a158b42a76e46908d0268ed8052951ee80c2c005dafce12453879ac9150ca19b04d57e49153c2b968d212f37a46706f2a762 WHIRLPOOL 3bbdac512082fbede27a6d2b7e29003913b09334601d34b9eb304dedbdf75678947eb00dd1799de9fb1ae0f6729e158476fa33dfa523499dac27d96e9708409b
 EBUILD qt-assistant-4.8.2-r1.ebuild 3596 SHA256 5f48d9742cb9f0b7f436381a0044a6f050018bf1cfb1a31dbf4c18a7e8ffa7fa SHA512 d88bdbf29b4c0080d956991b607037e302083cc27070201a065d1f0d041c62be004b639e525b05750f007c1f2dd7ef7726e617c2678f0910741c804dc8dc4edc WHIRLPOOL 00dc44b04757b1e6b0e459741b15653b500ec6f13c35227200f03abd55eb19613d71cb6a58414842eac310c3acc54cae697645076f1936be13a9e6826f2cb5c7
 EBUILD qt-assistant-4.8.3.ebuild 3539 SHA256 ccb3b00761fe9d273a535fb2133b1e865f018ee0b80534ce2035a9886de38f0d SHA512 2e22d8af06e5a16c4cfa3df5b4ac8f469b656943d5ac94ba765d02b8f3619687d24ebb8895ad8f10a30103a7d037e24325dc15d194ccc2d1cccdc887096f7963 WHIRLPOOL 4932c2269eb34d0e45661bcfe344405acdfafd1159122d6a6d5e20608529c93e92015c01281000ca437725028a27049e66b4849f58cef9693ae006c3efc554b7
-MISC ChangeLog 20829 SHA256 aed11c6dd53c8a04517c6a8a5fbdd70158a3d630a0578fc7d5525bfe717fec5a SHA512 7ffc99ed1e8c98c9171ed279fccbe451784aeb709d38e6d1fed9cd11efe7759ff436ab6d1c5e5bca72ecc51691575236032738428a937eb5b0ac16d28f41442d WHIRLPOOL 0c85584a1f99d3e23b6624a488ebe45d34eeb15483c1e51f75e0f19c71f41a2bb510d57050ad7c7ede09a9321821a4a4588c8a1a421331c4cbb85aaea04ff9ac
+EBUILD qt-assistant-4.8.4.ebuild 3539 SHA256 35523c5b750553e5461c4fbfc3699d114a65bd9bfd6ce38b6b3551b0c9c1ea8e SHA512 cb5bb26032ce672345196730c76318d8f77fe0db9201454fff0004bfc56f781bb863fa5dc4e747438c4a34bcca33888018df42beba48e56fc8f2d3a2d6824ce6 WHIRLPOOL f2af1a2ec2eb99bcf51b849365362e4a3799d574928fd5615a2025995cd68bb4f882df693fbe130617e6ded8338a97509590bfddc455d25dd6b0323b253192c7
+MISC ChangeLog 20964 SHA256 8485ec01471f2c25b6229a908bc92090cd325ae6040fabffb89f9b1b024c00fc SHA512 8e183fcfa2431ed73dfe7f1a05f54bf11d365220cbdc078b05bf0257cf9278dedc1cd978e09cbcbb751d78a81472cc255452ff7f3d79c87c0a55b2b57b607ef0 WHIRLPOOL 0227f3810ad075da8da0e3171fad1d7ad0a683833e3122737700eccc063c9d455a2d42cf81ecc2071f2ce3908ff63660998d6a0c04bc75f92204684e2de5e3b0
 MISC metadata.xml 1127 SHA256 7543dfdab8ada73a57f708178c739b5d73358b2e20c153aca337ef36f2e58c13 SHA512 f6e17e6b27e850197e3a889c9874a13c64735854e6f6e5e1b4a415bd03fda63e98801c59e58b93426a2f59a2e6d08505d13cceb79131b40a2398e4b68c17aa1e WHIRLPOOL 6fdf18d426167e644fa30b29818b0e20cc8ccf045639912c9000b9190b9861ced6b735a59f899dda0ed86194c3121f5e974299a84305404d403b28661f7c74d0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB682oACgkQuQc30/atMkCdYQCfYkfgBID5TQK9uCEILLGEWQRy
-hZIAnRLxo+DZ+PtfMZd+0mFRJUNR5CS1
-=lUpY
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild
new file mode 100644
index 000000000000..130189a3bf28
--- /dev/null
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild,v 1.1 2012/12/05 03:15:34 yngwin Exp $
+
+EAPI=4
+
+inherit eutils qt4-build
+
+DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
+	)"
+
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+fi
+IUSE="compat doc +glib qt3support trace webkit"
+
+DEPEND="
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
+	~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
+	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+pkg_setup() {
+	# Pixeltool isn't really assistant related, but it relies on
+	# the assistant libraries.
+	QT4_TARGET_DIRECTORIES="
+		tools/assistant
+		tools/pixeltool
+		tools/qdoc3"
+	QT4_EXTRACT_DIRECTORIES="
+		tools
+		demos
+		examples
+		src
+		include
+		doc"
+
+	use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_unpack() {
+	qt4-build_src_unpack
+
+	# compat version
+	# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	if use compat; then
+		unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
+			${PN}-compat-headers-4.7.tar.gz
+		mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
+			"${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
+	fi
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+
+	# bug 401173
+	use webkit || epatch "${FILESDIR}"/disable-webkit.patch
+
+	# bug 348034
+	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
+}
+
+src_configure() {
+	myconf+="
+		-no-xkb -no-fontconfig -no-xrandr
+		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
+		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
+		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
+		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
+		-no-fontconfig -no-multimedia -no-svg
+		$(qt_use qt3support) $(qt_use webkit)"
+	use glib || myconf+=" -no-glib"
+
+	qt4-build_src_configure
+}
+
+src_compile() {
+	# help libQtHelp find freshly built libQtCLucene (bug #289811)
+	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
+	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
+
+	qt4-build_src_compile
+
+	# ugly hack to build docs
+	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
+
+	if use doc; then
+		emake docs
+	elif [[ ${QT4_BUILD_TYPE} == release ]]; then
+		# live ebuild cannot build qch_docs, it will build them through emake docs
+		emake qch_docs
+	fi
+}
+
+src_install() {
+	qt4-build_src_install
+
+	emake INSTALL_ROOT="${D}" install_qchdocs
+	# do not compress .qch files
+	docompress -x "${QTDOCDIR}"/qch
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs
+	fi
+
+	doicon tools/assistant/tools/assistant/images/assistant.png
+	make_desktop_entry assistant Assistant assistant 'Qt;Development'
+
+	if use compat; then
+		insinto /usr/share/qt4/mkspecs/features
+		doins tools/assistant/compat/features/assistant.prf
+	fi
+}
diff --git a/x11-libs/qt-bearer/ChangeLog b/x11-libs/qt-bearer/ChangeLog
index c517b82e788c..7811b1afb668 100644
--- a/x11-libs/qt-bearer/ChangeLog
+++ b/x11-libs/qt-bearer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-bearer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/ChangeLog,v 1.17 2012/09/16 04:20:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/ChangeLog,v 1.18 2012/12/05 03:16:22 yngwin Exp $
+
+*qt-bearer-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-bearer-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   16 Sep 2012; Ben de Groot <yngwin@gentoo.org> qt-bearer-4.8.3.ebuild:
   Add overlay changes (c++0x useflag)
diff --git a/x11-libs/qt-bearer/Manifest b/x11-libs/qt-bearer/Manifest
index 92e14a9c10f7..0901dadcbde2 100644
--- a/x11-libs/qt-bearer/Manifest
+++ b/x11-libs/qt-bearer/Manifest
@@ -2,8 +2,10 @@ AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-bearer-4.8.1.ebuild 1620 SHA256 592847b292be54807b34cdcc9464f10a9ce1bfebe16a0af3c392698c455dc857 SHA512 400c1e4207b9fedfa9203c1c8215da76821febfad76d86a290391a252a0a563431d554f68cd95e5aa98ba6d3f90c123ec14be611915d02919a5882be35365531 WHIRLPOOL 99081a03c5b6b852e2011f4fd54ca2fabfda847a3d81317ce547ad39c062a66c3bdb320bb971d558de73efa8b39dd5a1c53fa4d1e56699ae1f89aa7d5bf655bb
 EBUILD qt-bearer-4.8.2.ebuild 1754 SHA256 13fb3b3825e1fddf93dc64c4bea1e2e698f0904deb5f9563449b7f28c1cdb9e8 SHA512 e202a94b716876abbddfa6519a1463aab5a66d7d59c72b8babb47b141cf264c903a71a30bd84bcbd38580e80cb656e4a6cc2c76a42aff487d5005678b7526f1f WHIRLPOOL 2ce7b6ef7935f91ee00403ae263bcba8c2b11551c03ac6c87010c3e9bd5b4178f8d54b31f718365861e3be876e1d13c227c9dea69ab9e8995fe212495c906fa0
 EBUILD qt-bearer-4.8.3.ebuild 1670 SHA256 7aab351ddbbfdfe59af6c762f69888d3f2b9d924e364e11a52069659c5e44fdd SHA512 00d8e0516400ad0f5690e00124b6a15afcd0d2acddc0086099993cd5c17fbe1a69dd4445b4887b92befeb7a933bcf66cd1e3a234361a242761020de1aac8e126 WHIRLPOOL 95201d2be5d7f26396112486189f03824c7ec56d640d219f2824a939ba7890af33a391cf6c0cd44317e6d3993c5b89aee5cc3033aa6016b8f55045f8987877a0
-MISC ChangeLog 2243 SHA256 efcded3585b1c6c33033c50853e588960efb01999a444d6ed4a97a04744c12f2 SHA512 1c0abf81a65646f78c182b8b88081ac4d9f2def39b6fb1de514d6c8b895b44291885ed31b0286067758ecb26418ff4714e3bdd9e50852b365e5f88434d7664a0 WHIRLPOOL 753da34a15cd7da12fe1bc3990382b404e95cf0e8be0352272407fb417e6a317abe80c3c19ea56fe8285b62e8c7d7a1bf6032d5abae507bae6411f481c0af72d
+EBUILD qt-bearer-4.8.4.ebuild 1670 SHA256 0e957d6909ff7911655efea198946a0bbc3b341da7c1cf92e4be33ba361f321e SHA512 c0c9d73a6af56232b6a771d556d22864a9bbc106b31f78fd7a79c54754e268dfd57781744b70de393e3488b7b34fc7782674eb61f9bc9dd578c0b24e6d55d214 WHIRLPOOL 7106f284574a85271081605ec8c4f1bed86e56388487020fe075cca8a91b6222b920fc5073ea66e97ce6ff5af8073e42bc4a126e527a637edd9104c3463012e0
+MISC ChangeLog 2373 SHA256 081127a599eaace4d5eb99084d6301df52bf2314f99cd76a8db7a8544951f3f8 SHA512 98b78697b7643025fa7b77da3ef66381908160b08553dfca269ccef95544133299b27d2a5b39f1e442e1c4d7cbf570d1190e64dbf056141d9a8c28a78ab81129 WHIRLPOOL c1a7a8a03fa3deae3e72d0025e8128404db953502ef728ff4adf4b74ce4959b30d72fbc064419930f27f5f855f0986c8d230168942ee4f7e9294a77654c5063d
 MISC metadata.xml 706 SHA256 8e5d92ecd07a02c456ae1b752241fa209a40584099c9e88c392750a8cbe059ed SHA512 b698d38c6880cc4b9d3d632bfa294f143b54d13bc1000f8ce7530ffd96d6c813a2cba9bd5fcdcda995d9c8f14a49f9f9c17c9af5161fccf6b889325faa249bd0 WHIRLPOOL ddab76d1c521c0f15ef449a71d8c6f5774c6cc4cd2e4730f92275836fd0cf2f0bf62aa08b1855f28fcdd94e7001988429cabf87ccbf0c34678bf3379303846d0
diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild
new file mode 100644
index 000000000000..bc55407fc38e
--- /dev/null
+++ b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild,v 1.1 2012/12/05 03:16:22 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The network bearer plugins for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+IUSE="connman networkmanager"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,debug=]
+	connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+pkg_setup() {
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtDBus
+		include/QtNetwork
+		src/corelib
+		src/dbus
+		src/network
+		src/plugins/bearer
+		src/plugins/qpluginbase.pri"
+
+	QT4_TARGET_DIRECTORIES="
+		src/plugins/bearer/generic
+		$(use connman && echo src/plugins/bearer/connman)
+		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(use connman || use networkmanager || echo -no-dbus)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 87d276cfe638..87fa48362d45 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.190 2012/10/14 17:12:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.191 2012/12/05 03:14:14 yngwin Exp $
+
+*qt-core-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-core-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-core-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 30e7167c95c3..bfbdf66aba3a 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX blacklist-diginotar-certs.diff 6153 SHA256 461a6c1b0618119251ab03ee668aaa93f6a8b8ba1298d8eb928f87df70c76d75 SHA512 ec8bcef856a1aeeccf3b3edaf08cb441ef46edadc8704c8898e115647abc83608f1b89cde72a0164e92638ff95b65b6e5a9c68c07f0b8b9ddc12db57d008315f WHIRLPOOL 011787e35e85239e69c5947ea9574fc8c66d52bd16bb5f5981fecb76496cc6b6c106f8ff09339170717cca6942a2088ae00292b56247aa2778063b541cc3540d
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
@@ -10,16 +7,11 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-core-4.7.4-r1.ebuild 5173 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be SHA512 3327854c067605cb9f5bbdcf73844ff80bafca854b36a94e1f1903242d7b61b3f339b38f86cac01f5944d0225dc146f9edf58eba86c03cfb4c10223ee2da981a WHIRLPOOL 635f612d97faf210028d9edac8369b4b7decf7432e9ef83753b1e4e4506f08930fe15863a31c21cb1fe4b6525d0ed7d78a961518b517eb1aebe7328054513497
 EBUILD qt-core-4.8.1-r3.ebuild 4681 SHA256 aab21e25ea90adca35a99f4d7d09473d982ae6f20490d427d0dacc666325137b SHA512 9e2404c6856f1b4c61dec834444424846e42f574d1af1f84fabc2c83f915320f27bc337169508a342972d4fdb9d67abda7bac7c13590920de9d585c691a93b90 WHIRLPOOL 82b5b0677f32c753b61699370fc018edccc18a366b2357483eefbec044b0b1bed1f756591f4c14026cba01b68c38c2383d21d58a6d3f27701159152b279dd27b
 EBUILD qt-core-4.8.2.ebuild 4776 SHA256 22d379e52886cd7135b916e5410afed847e3f993668a017cff348429f895639c SHA512 3818291d64b93746a646fb71e7e245cadf11f257278e0ada043c62ee5f7639ef478943940e997f22d778c6b465f117d7967cb77aeb6efe299057e987af97efb1 WHIRLPOOL 2794d273c47f199b380c43b663c611a512145470f5ee05744ad8d4453d236fe0a4f48f70702bbffec113e53fa185aecddafef1ad8d48cf3d8b4bde6817101b99
 EBUILD qt-core-4.8.3-r1.ebuild 5115 SHA256 3e3406b94225ae501e5c6b4e3c9f5649000ff7253711dd50fce40834a642eb79 SHA512 b664bd28b62b6c2e75d3e0f5e1449824cd689a399af0c4122b4883378b1f02a876a2453b4b2bdd57d6041ee00c52b27d8f8b60e740b98d65c41deb784f50d575 WHIRLPOOL 7dee70d30a1d969694ffe62ee22a83fe3da703a119b5284d0425b1ed248d4f46af7b14fb1cfea60fb420d6850d1c4bbbf0d80197312d207ff04a29da57f47fe8
-MISC ChangeLog 25568 SHA256 c13e4344ba1d203653bd8158d81cd1bb6f7c069d022f12c59b70b83fcdf71a93 SHA512 ffc513cacc93a961a9db046a3ad4de0dc377509575d0f3296ab9a2bfe918e2778f918671228f0bddb98fd8a8092f356e6b5cf5ffcf660899f60ce472a21a9a57 WHIRLPOOL 65b6dcd785f26164fc66658864de4d40a35333a863f9ba8ea37b0748ae860c40d961ff6215a78b60d32f97618f6bf8900f4c2eb61c0d9cfc418757fa6d3b69f1
+EBUILD qt-core-4.8.4.ebuild 5032 SHA256 d26a7eefb6d13028025e94d50cdfe7d114e451f5e47380dc11f7320b905598bc SHA512 175e8e06e47b0ea5b12c96a77d5727c4cfb9329ce93f518561c9d0a3017d01b511644a031ad3c3f183ca153418cd44cd88c589598321a07a4feadbea3263670b WHIRLPOOL a0fe7ee95f6df6598234b19682e489d430e8d819747abf230d8354942e546b1fd43c8da4790eda1aff2ddf5f3d7fa1883937590f330ef1c2dba5928d0048a700
+MISC ChangeLog 25693 SHA256 1138a569aca3009d7fff9139e0417fe4970e4925f09b35f5743c12333f8d772e SHA512 8c92f000f08a1a727255c9829c8e7e659bbbd81968fa86d627613488282a3e5116562f5ab64ed271a27d906f715e7d809e58ed8ef2b3496ea928cce4be86c521 WHIRLPOOL b9ce73d5bc09959f5c2d239585c486b4d24d20b59d5f3902b8045894ba638f030eee5a68eed51f977322323c18390d19423ad0c05d925856d2e394150b1b0b87
 MISC metadata.xml 962 SHA256 5e48f820fb8a186626c8816f7f143667495a43bdc5e2765f628c2134c0034638 SHA512 c1598a11c993175dcc9fbb6c3af19bafca74a39122c1d769b6f0cfb73a168e729d14edc46adcb2ccb638c3eecb10dad5a58f9070c178b86447a6ccdd2eba5fa0 WHIRLPOOL f10d5b7a5f20535d3d7e410d9a923afb34e2fc8151c45aab8035a326127a3cd511f2ff843f0094495a53c200b2242635e8d8f52e9dd08d7850014957b872e812
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB68ngACgkQuQc30/atMkDZ6wCdHC/fZ3xDJpnZC/E8kzHeA0IJ
-JSMAoLOgNJpz+dZ2raQb+HTD6cmbRben
-=FnTZ
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/qt-core-4.8.4.ebuild b/x11-libs/qt-core/qt-core-4.8.4.ebuild
new file mode 100644
index 000000000000..88eb6ef9d9c3
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.8.4.ebuild
@@ -0,0 +1,180 @@
+# 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.4.ebuild,v 1.1 2012/12/05 03:14:14 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+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"
+fi
+IUSE="+glib iconv icu qt3support ssl"
+
+DEPEND="
+	sys-libs/zlib
+	glib? ( dev-libs/glib:2 )
+	icu? ( >=dev-libs/icu-49 )
+	ssl? ( dev-libs/openssl )
+	!<x11-libs/cairo-1.10.2-r2
+	!x11-libs/qt:4
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
+"
+
+PATCHES=(
+	"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/tools/bootstrap
+		src/tools/moc
+		src/tools/rcc
+		src/tools/uic
+		src/corelib
+		src/xml
+		src/network
+		src/plugins/codecs
+		tools/linguist/lconvert
+		tools/linguist/lrelease
+		tools/linguist/lupdate"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtDeclarative
+		include/QtGui
+		include/QtNetwork
+		include/QtScript
+		include/QtXml
+		src/plugins/plugins.pro
+		src/plugins/qpluginbase.pri
+		src/src.pro
+		src/3rdparty/des
+		src/3rdparty/harfbuzz
+		src/3rdparty/md4
+		src/3rdparty/md5
+		src/3rdparty/sha1
+		src/3rdparty/easing
+		src/3rdparty/zlib_dependency.pri
+		src/declarative
+		src/gui
+		src/script
+		tools/shared
+		tools/linguist/shared
+		translations"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	# Don't pre-strip, bug 235026
+	for i in kr jp cn tw; do
+		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
+	done
+
+	qt4-build_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
+	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+
+	# bug 427782
+	sed -i -e "/^CPPFLAGS/s/-g//" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
+		-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
+		"${S}/configure" || die "sed configure setBootstrapVariable failed"
+}
+
+src_configure() {
+	myconf+="
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use icu)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
+
+	install_directories src/{corelib,xml,network,plugins/codecs}
+
+	emake INSTALL_ROOT="${D}" install_mkspecs
+
+	# install private headers
+	insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
+	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
+
+	# use freshly built libraries
+	local DYLD_FPATH=
+	[[ -d "${S}"/lib/QtCore.framework ]] \
+		&& DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
+	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+		LD_LIBRARY_PATH="${S}/lib" \
+		"${S}"/bin/lrelease translations/*.ts \
+		|| die "generating translations failed"
+	insinto "${QTTRANSDIR#${EPREFIX}}"
+	doins translations/*.qm
+
+	setqtenv
+	fix_library_files
+
+	# List all the multilib libdirs
+	local libdirs=
+	for libdir in $(get_all_libdirs); do
+		libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
+	done
+
+	cat <<-EOF > "${T}"/44qt4
+	LDPATH="${libdirs:1}"
+	EOF
+	doenvd "${T}"/44qt4
+
+	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
+	mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+		|| die "failed to move qconfig.pri"
+
+	# Framework hacking
+	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+		# TODO: do this better
+		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+			|| die "sed for qconfig.h failed."
+		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+	else
+		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			|| die "sed for qconfig.h failed"
+	fi
+
+	QCONFIG_DEFINE="QT_ZLIB"
+	install_qconfigs
+
+	# remove .la files
+	prune_libtool_files
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 3d9a70e79be3..36bbfd63967c 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.129 2012/10/14 17:04:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.130 2012/12/05 03:17:33 yngwin Exp $
+
+*qt-dbus-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-dbus-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-dbus-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
index ff557d89a0bb..cf14b17170ce 100644
--- a/x11-libs/qt-dbus/Manifest
+++ b/x11-libs/qt-dbus/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX qt-dbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-dbus-4.7.4.ebuild 1055 SHA256 cb323457d34282d6216f5fdff4d6d52441a6bff5cfeb1d8e6bfdeec420417b66 SHA512 77973ddd53dda83c1d604d5b6f79ab31ec043cd3c71a6d5fe03d6c2a6e853d92de72f4418e2cd54e18891b9d5e010aaa8190f2d5f693786d326d1067886ea3b2 WHIRLPOOL 8148f4e57efbef47ef5fa85e266ac4888d37377ff8105f6079b7d67ba7cd983d792875a47f46d8db0e7d8fd0617ffe3f8326d73866b2d4a32ca95c06c1f7ea3f
 EBUILD qt-dbus-4.8.1.ebuild 1122 SHA256 198e33438c46ec28794b0353015979b23f55e70a32f495f3c33f6cfe3a798209 SHA512 f37db00f29d2f02c646fcc524025691c0cc9e6c69b04f6a417f18170c0a83e8dc9df58a4f8788999fbfe07a8ff59bae5246200b45892e123696d6823f9adbef8 WHIRLPOOL b16536fe1205723832a45fbace1b902e6b5b8f339e6836bb507152c341a0dae715a98bd271a3119e8b4e85441890361af63146082eb3f5907f325222b2591c12
 EBUILD qt-dbus-4.8.2.ebuild 1181 SHA256 d8eee42077f7c33db3e962c3fb1fb525da7f0cacdceae8a207bc2cb9dc5d49f1 SHA512 62604259ebf3aec186e8679a4f69ce4e9e80fc2ba199319e9aa152d55b36516a5ed763e603fc6f559ca6a71cd39c7146b8b1f89bd968c241afbef90a1300d52e WHIRLPOOL 32de25154a73b9fcefe9439a93b8c5d476588e85f8583ffb90c3ebe8407937f055ff003531f371b117b12be7e46f843111bd601c7b7e5d640f0368ec18f05119
 EBUILD qt-dbus-4.8.3.ebuild 1137 SHA256 d8ba68d64dfa2e566fd12e2cb280954cbb593d767309d0f6c586c0e72a8c04b2 SHA512 99d49d9ad7b39c9e4dc26e9c2d8de251d3d95853f09331b8d8857ad70f802ce97d22f74c75a2f23eb356da2529f3de83e4ac30447c9122839843ecf603667583 WHIRLPOOL 4c7c5cf38bce0a3c3451ada7733b469ea46252a7ac8aaebca3902cc0fc5648ab6e1b4a04a9f37565189c1138fd0b5b0a6e0c8e5d9b3c9e0beedc8730ca710df6
-MISC ChangeLog 15443 SHA256 9b502909c045eac7cb45eebd034d03254ae3cbc57ccc68464baadba364adf652 SHA512 7eeec1fbe831c383c644958bca6d1d63590f73847b99aa1171564e4f685fa0d05526b1b7c908827d3301e3c8b19627f1ec14717fbc75b288733790d2fbbc07ae WHIRLPOOL 86b2c6b512721e8572b52b2e741918fc1d6596f78047d940c27c6583f98db49900270da584b0c5df3ee354076629d8d5a29135417e8eaa579e5013f9bde7a581
+EBUILD qt-dbus-4.8.4.ebuild 1137 SHA256 290be94f16a26d808cc05b971228516b7b7a13ece3d27b0609b6af152578e57e SHA512 9ebd82710e78b183ec0f7e842223d3fb7bcbd3c580be02a024fd8de7f878b3f73c2b7dcaf9d1ef71aa31bf96832ba060f693e93d9776c2650bec53ddd73f0e4a WHIRLPOOL fb5a42b0607e6b8e7356f97ee653b4f83b37d6d3bd7fa73d52988bd91c86fc02bd41759c06579efcf6a04032b35067d82769d41b5ef629e9f828d76489ffb19d
+MISC ChangeLog 15568 SHA256 6831e37609f68cc979c7ad1ef8e4fdf2a0a924ade2e5a142d43b95a438886afc SHA512 67564791e862a852280d9dac68aacde0e0f711b6e7d4152ee454343a33aa6f11e30b2f8dc8c2a2a6d7a6f077226070792c7a12471cdc156c48e83ce07e03d029 WHIRLPOOL 9c7ba3cfd892405e7a44054865652da379b713eb79e9b5029da70aa76b83aade54eb0a5e6037a5256247f984fb272f60b33ae1e59159c1b400eb23edaf42b110
 MISC metadata.xml 562 SHA256 b723cf2b12dab4eee959da9b8de3db6adb6a87431e2e83c1a825e891670c7938 SHA512 d2dc00c1248bb83d0f60d1423865d21aca4fd2a308956578f9382c7ba0e95a311a6b1b019fefbea56112100da647d7c361240c6aa959150ba03b440cb3fd443e WHIRLPOOL 7833ae095cc6a0ff83342cde8c116adacfb024f53b9339f8f97fd0c62f231c9be83205e3ddb22838095341d428d130a30f6a899ab52d4cf9358b56e0be99ae66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB68JkACgkQuQc30/atMkAJ4gCfT2rEWxO1Ddi7RBbTlNTwXFbV
-aNwAoJ+DmgNhUNXu299RGpKlyWUFbe/1
-=kEQ0
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild
new file mode 100644
index 000000000000..f287976b060d
--- /dev/null
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild,v 1.1 2012/12/05 03:17:33 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The DBus 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=""
+
+DEPEND="
+	>=sys-apps/dbus-1.2
+	~x11-libs/qt-core-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/dbus
+		tools/qdbus/qdbus
+		tools/qdbus/qdbusxml2cpp
+		tools/qdbus/qdbuscpp2xml"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/QtCore
+		include/QtDBus
+		include/QtXml
+		src/corelib
+		src/xml"
+
+	QCONFIG_ADD="dbus dbus-linked"
+	QCONFIG_DEFINE="QT_DBUS"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+=" -dbus-linked"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog
index 1a15a5a84874..d359cb78160e 100644
--- a/x11-libs/qt-declarative/ChangeLog
+++ b/x11-libs/qt-declarative/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-declarative
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.56 2012/10/28 19:35:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.57 2012/12/05 03:19:00 yngwin Exp $
+
+*qt-declarative-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-declarative-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
 *qt-declarative-4.8.3-r1 (28 Oct 2012)
 
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
index 20e44679c709..42634df98be1 100644
--- a/x11-libs/qt-declarative/Manifest
+++ b/x11-libs/qt-declarative/Manifest
@@ -1,31 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-declarative-4.7.4.ebuild 1763 SHA256 4038dde954ed213e76b3b685b50adae4401fccdb0f771fa3a7e505ea3c38f76e SHA512 2631ce6ff1bbb78ac6e31ab9d868fb49b860281945b241144a70788aec52bbf27eb8a8dea0c62b8f27141f52c7a8effa17904e027a337dcdda6af90f300ba5c1 WHIRLPOOL ded696ad1f1213a8e88f646fd3a169b8e248202d271c741d5048731948703ea0e4255c8f37a2914b245756f52a24df6ef1c4e3804474a837fd3b7e9c0c012606
 EBUILD qt-declarative-4.8.1.ebuild 2064 SHA256 bd918c3ada1a9d6150139ffc44f5c820bdac1b31a8ccb5974b4762c6c97c63ef SHA512 2b74a87a21b546f54e5459cb7af681d90460e808cc3d308a1505e2dcb170d32c8259bf7bc1b1c34ec0d8904d729f859ded65bfea21efd534aee30e19f222772c WHIRLPOOL a3822f5eb3e605f4085e28b9c4ae54083bdd801aeb4ed9ee6a3c6fbf2006f8c59313c08cbd4d8abcfa21606149a3ba311c2c4f9af0b47f855df447f26cb0b2e1
 EBUILD qt-declarative-4.8.2.ebuild 2179 SHA256 18404b6c531254641c5f8a090765379aad9301d2b8853a25dc1600652e99b6dc SHA512 2c1d49c8514df28d04bf833709c67ff9ff0f221877cf8c92ffac9901408227761b465fc5afbb5b52854011264d6f3b79e02e5115acff49b6f36497d90a9e26d8 WHIRLPOOL ddbd77c316eb17051039d3c05c613159ad0b88bd1039bad4715899e756476ce7b4b745589e965516b7a209491f70e24a872cda238558ed4856c0bc40f3ff2df4
 EBUILD qt-declarative-4.8.3-r1.ebuild 2057 SHA256 77f774c36460fd742d08641619034b1943b503cdec16fc7511663d7c5981d5f9 SHA512 b33028d94d70e63097c6603555bfbeb5fbfbd7539327bed7adc25f6407711f6450130bde5f3d2d8d7a60bcc6a19dd3e92638044f4c8de254c400ac4be81fb82b WHIRLPOOL 309be1fc3435ee655906b9390ec20d950a13989358d7844a6f90edd1b45e371fb4a26a02598e55063be95072615791d12e7c0a6797e6c43a9eb928a7f006deb0
-MISC ChangeLog 7119 SHA256 db4b871d895aad1656fa679380922c34ddf8511c9632386da5d9ae14d36a749f SHA512 1ff8e116e0beac5d3e8d83d4ff7d6379aea6d85553807676e2334a823f8963f0390858f66e847f9648806fa9b5614322a83434be47a0177bc1d4c81412bb0108 WHIRLPOOL d6ef719decb28cc96f71f1c528b13c82fe408a85902919ade291a2c517968870515085de19a8dd9b1416518273d6552ef1b7fb865d5191b31ef7403f7b513cda
+EBUILD qt-declarative-4.8.4.ebuild 2056 SHA256 cc55c9db0c7856f5bab8cbdfba84563084bf64ed7cc5b796e59437adaaf39480 SHA512 81acf02c19b15251cf5da3c298863ffa00904bdf93b0babe7993d3c5f4fffcf601a03024df532094ab2c4ca9cb74222e62300809e4e6ca6c20f1a55b6e4a4052 WHIRLPOOL 580034a488057e06fd32f43a78285674266a1c756afda170faae522da9b07d407abbd077389754439604e96e4027f2a91926cf4f665e91df9bdddd7a93120cb3
+MISC ChangeLog 7261 SHA256 18177746c12f960e2c7d18955437e9280c2ce7a3d90734afed1a85090f148ad5 SHA512 7a74132234ade3697859ba692a7096df8bd9e15c9513d8956422e181fc3c7205aed16d7c71c0bfa30d411d3455b6559dc94f0bb471fab84fe11c3ab1527e5284 WHIRLPOOL 4e4b4ed4fcef34c1f86e7cf50ec3d35bacb98af851cdc5d46fa94876ba3bef15d9c6bed4e4514b4b4b49e8fbb0eba120d27562d1c9fa73c8a9f082fdc26d4884
 MISC metadata.xml 881 SHA256 80127318b4d86e6f503d28de2820f95e4b52fdadeed1786ecfadc82410442053 SHA512 62049bff4508f9ee58ca413d5f13f4a6f804a9f9af3459edea058e124232044c0638efc177fbbbec3d6a840de46b210ae4f1c2155db52329d0707f25459515cc WHIRLPOOL 528f49f12561e1dc5bf257ea667cd35e43b713620c9f5c2e429cc630316df9ad9e9b6063d4a194e2932d0967cde413b189fdc95896ccd9237fd655a653e84f1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQjYj4AAoJENXLsxwXqFxyNS0QAI3JhO4WV98ezmHXb/hqjeiz
-UuMErHCDcoQ4e/Aw6tyGdElfKgBWuEq57T/gJ9c3kvHR48khKlvVZkrVnqgyELC2
-ozcX+lk6TAJ/uUdPOqI9S77zCK6tlSUkZoT/kklvENBGyH5G+cnVnSWNUHPTaYDi
-dU0XzoHNW0rNTW8rJAYqFNHOznM/C72k1hkKriZdbCaYKccoVLu60/WVm1HURCyf
-yYUeZ71mw27OJg9d/NQ4DgIWYKuaQxGuoJPle5wCu0SVYsixUt0lD0idlfY6Vf5F
-vtTpx6Vk1Pf2mnHgb2IockS7Ns2ePDWIIkjke+74gg3jqGq41RGAfs1VWbJYUaV/
-WOhwlohpHGgUHTr42RvNnL+c0w4u+yrLwmrk5F32ISyMGISgmbUvtACnEOhNYGjs
-F7b3ZwfWiWHdqyWjypaaM54/W52weQz5KWbB2NY1qAJ2t1F1Yj64nU87l1vqh8XQ
-/3PWHo1nuLXrmStDDR9gU90kbqdeIhiXjLPAQdBv+trh2rPE9U4ZFHT0MlmFpnq7
-2D3fX6tLi6802qpf0dOuJKs9OnplRBjFyIJmnL/zxlY1ziNgQDGBQM9J3/k5waMG
-oBmlY4Nd1b4JHxU3fOxl7ZdDa/j4HErGTvPO6cIjpE20e8b2ghNu+/P5n6gFyLHs
-xz+HvHomUVoAI8dqeaeQ
-=rxpI
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild
new file mode 100644
index 000000000000..b5b2f81efee8
--- /dev/null
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild,v 1.1 2012/12/05 03:19:00 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+IUSE="+accessibility qt3support webkit"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support=]
+	~x11-libs/qt-opengl-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+	qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=] )
+	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/declarative
+		src/imports
+		src/plugins/qmltooling
+		tools/designer/src/plugins/qdeclarativeview
+		tools/qml
+		tools/qmlplugindump"
+
+	if use webkit; then
+		QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
+	fi
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools
+		translations"
+
+	QCONFIG_ADD="declarative"
+	QCONFIG_DEFINE="QT_DECLARATIVE"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-declarative -no-gtkstyle
+		$(qt_use accessibility)
+		$(qt_use qt3support)
+		$(qt_use webkit)"
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# install private headers
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
+		# ran for the 2nd time, need it for the updated headers
+		fix_includes
+	else
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
+	fi
+	find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
+}
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 804348821e34..f212a38580d4 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.204 2012/11/14 10:17:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.205 2012/12/05 03:20:44 yngwin Exp $
+
+*qt-gui-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-gui-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt-gui-4.8.3-r1.ebuild:
   Install desktop file for qtconfig (bug 441712); fix subcategory for linguist
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index e82e0c43d557..7afc4912a0d4 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX 44qt4-gtkstyle 33 SHA256 6e0047d93a89c0bd404a1ff26f534570fc41de7dfaf15cf171bad927cee7d8c3 SHA512 f2ffe31d3a4b77bc2cfa5fee6716b6cfa0978d4e3c6a3fa5fa7431788575e274c431f9e482223ffabe0ac255f97496c0776031d35d6eb7cf16b47e7db5228dee WHIRLPOOL be1dd16c4db2e3abf134f35ba6ae4295fd772abbed0b1dc7f38b40e8ec8b9608ac0f24d46515cd9e17d3cc6341167afde87cf93a401846cb8c8b6314840595f4
 AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
@@ -10,26 +7,11 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-gui-4.7.4-r1.ebuild 6539 SHA256 594b225277de239c72fefe3369f8a75c811a7f39ada9bff62c1eb7fa52c8fea9 SHA512 475cef3c2705bea4c7d6fe83f05670b14edb00f2029951a612e3a2f4ffcd836efe3b3ee5864e5e749f052da012c6ab4a3c9dfd1d45b02375178d8d2e3c27b91b WHIRLPOOL b0fa06ffb86674c3eb7e5ca5916dbac1d14f988021e507c659c0018e83d2bf68a45669f16fdfc6e4f1968024edf4304f9237ac26d0616820b3eccea920a3b354
 EBUILD qt-gui-4.8.1-r1.ebuild 7974 SHA256 579fdce730a330c3b75bd0faecf2c67f7f79287a8c3e3669c79c964360c64d84 SHA512 752b34346708453c282eb6c8f678570ee55483048a10f850ea0e5ce294c1ab02c993e7e771ee159e885f99c8a1e9c148d0cf9dcfaad0a14b58fdeef8dd2cc953 WHIRLPOOL f246a9fbe1c93545298e3d360570686f86a8adbff56c1248446bfeb7c46729f59a19c64496a72f9fe705d56c1078f65940c58f23d60b48c6b1299719d08bf201
 EBUILD qt-gui-4.8.2.ebuild 8094 SHA256 22ff75f68c175d0a53ae359bf2caa621a4758a0c5bca25cca0f141ca90ff1dec SHA512 7e48218b4f5fd5a13ec8ef992f42f97d512573d22209a8e5c5a4bac13ed7324fe346293f78c61847807fbebf4bd40b9b8d40751b0444032bd987b9bb090036d3 WHIRLPOOL 6956b54355d3042a57001c20fbe91676e6a067714d3f46bbc2bad7664170d65dd9121aacf38d3a43e4e0918a991b6de84a5297414a404c00c78ad4daf1bf540f
 EBUILD qt-gui-4.8.3-r1.ebuild 8198 SHA256 b55ff426112631bc9fdc6dcef61f12b4165a58b4f3dcfcc035fddbd9a144ff9f SHA512 c0d1424614290d25a87640dfc9018ccd6cd5d6a706b3f14184f5668d9103284f529ee9566d7511daa7b84f94aa8e993092dddabb466a0ad52b8d06bbc60a77ea WHIRLPOOL 7a4f0249aad9b80c37c465724faf71c794fdb5b657e577d2b70f81d6c4d7945ab8cae6a497de4614c2f9ca09977be6311d4f1ef50ae1c3f2264fa90d5e12688e
-MISC ChangeLog 30391 SHA256 85e10132baa3324c3009014d59456bd882f712991ff639cfab6c74de450395d4 SHA512 168dd2b953b6985f1e670ace2c56ed30596fa1ad764e7065768a455af4a023d0ea086d0b34d2d1423a89f14815df2939009fe0a61521fe0d5ec6a839ec9add06 WHIRLPOOL 47552554ccf248c3eda416932e80a37518a21b3407c1c3af81241693b34576d6fde67ce569f5ee0f0d4fa4a47fe6a1f704294be407e5cf6108ff992b344163f0
+EBUILD qt-gui-4.8.4.ebuild 8197 SHA256 0e3f9e907e7c045bf82833731071e80f8ec46b344885acfe9a9707dcb53ed959 SHA512 999aed133c5d47129c26345fe890a0ab17a7907efc48a64bdd53c2e795e11a5734e0ec3abdbe0cfff466fb6715769c9359e03c9a3340e58f34615c0d1ba3e62b WHIRLPOOL d06fef389580ac13e1223de48a40a6440039b84b9d4a1a8daf83d718b6aea1785a3347d14404e0b843ec0c6cd2728ca1d8027be580632669f706c31fda1bd2ac
+MISC ChangeLog 30517 SHA256 19c4d40ddcfca93a79888a09c7e08a13a90d4b9ebcc1ce0c0a53f5731bc973c9 SHA512 04a709739b538911cc2049780ac2e8c3c6b9b4d318aa7220866e0573c62c02b9908524792a3b88ce00c9539a5cce7e458c05ec142c49282cb66597e9852d5787 WHIRLPOOL fc0bccc3424578fd72d0449bd7d47305998027c19e3aaa80e666caff4e9b34516f0d389044656a11f2a6365d4f883309f4a0b1bdb8dcb457e013d053fa1b138f
 MISC metadata.xml 1408 SHA256 3c6009d441bc2d4b414c5fbf0e804fb3afe40e510bd7801fed237feb15fefa28 SHA512 7cdc018a47e690332784ac9d99b749f12a82b882b3d43b94bebe829be371b83f816c0d91ed98cd04c866ec9dd0745e83ff416056593b77d7845545041d599548 WHIRLPOOL 2f11be380287ed99becebb3a26ad03fbc266edcbdeef6bd1a25a58c7229fb6574f00f857fe53393466aac979c7ec7153f56b2ffe1b2b9a6c3c13539e6395e8c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQo2/gAAoJENXLsxwXqFxyN4AP/iCa3nczOxZaRiYVoDkiFyDh
-6S9cJ5lS0welSCdFnkBGSNPYnlsHB8xXXXFWYPZO1FAcxceAdSHwFA2VK1W/BdEz
-G2JV0cHtMS3gdaogG7SqAzNpYr2npSDfsdfgHHVSlTwmh15m0mt/yOieMiuUR9fZ
-PzGulJXAiopSK29xQyLhIuGq2JQxeiQWoq7V04JOp7BYuy9ShbCZbQizjlfpgk6y
-shnMGzqZwyv4sV/VTUD+dIlizDpuwHEPMMD2jWKKc3+Z0+DoHA9+czhMZDD9rR6h
-7m7aT3OxUHmDbelhwhzUJbWS1aCtCW7zgOuo3KOezR7ANtnAFpWZJI3G7N3R1a1O
-Cr1JFc/6HMdBjd0hwEIw8VS2OO3Kggt2T1b8kp95f24okfAoeMTuMFzI+aofHucV
-sIShoMIHZl8ZH1AvofWN0JsJY4/EeO0XY8j10ckuld7d+3Qvfvu/trLLyPOCjP4W
-XLNExB1EMV55jk7Zt5GZot+Ej0MWHqeJZmMFzsV8/NdpG6c/lZbYBrDRaLAC0ciL
-TtQYDRRMkI0u0ewu+NJQ1PHiCOdA1an3kWxRJGXq4DP19pUQ+3HlGR1B4OodhZRK
-OHHz5F+dseUALf8mYv7SVjPXn5kr66pUlau8XwxY+WJMFLCbvQ0EnNN4dhtMMvbs
-DhugsU58uKN5wyTgxxrA
-=+m0m
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
new file mode 100644
index 000000000000..7185549f58c0
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
@@ -0,0 +1,252 @@
+# 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.4.ebuild,v 1.1 2012/12/05 03:20:44 yngwin Exp $
+
+EAPI=4
+
+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 dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
+
+REQUIRED_USE="
+	gtkstyle? ( glib )
+"
+
+RDEPEND="
+	app-admin/eselect-qtgraphicssystem
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	!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 )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	egl? ( media-libs/mesa[egl] )
+	gtkstyle? ( 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? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.3-cups.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
+		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"
+
+	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 trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
+
+	# 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' 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)
+		$(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)
+		$(qt_use dbus)
+		$(qt_use egl)
+		$(qt_use qt3support)
+		$(qt_use gtkstyle)
+		$(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
+		-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
+		einfo "patching the Makefile to fix qgtkstyle compilation"
+		sed "s:-I/usr/include/qt4 ::" -i 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 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)
+		$(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)
+			$(use egl && echo QT_EGL)
+			QT_FONTCONFIG
+			$(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_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
+
+	# 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.
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
+	else
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
+	fi
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	# 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
+
+	doicon tools/designer/src/designer/images/designer.png
+	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
+	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+}
+
+pkg_postinst() {
+	# raster is the default graphicssystems, set it on first install
+	eselect qtgraphicssystem set raster --use-old
+
+	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 \`eselect qtgraphicssystem\` for more information."
+
+	if use gtkstyle; then
+		# see bug 388551
+		elog
+		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
+}
diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index 304ecbaf1768..1e1a8f429b83 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-multimedia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.67 2012/11/22 21:01:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.68 2012/12/05 03:21:46 yngwin Exp $
+
+*qt-multimedia-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-multimedia-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   22 Nov 2012; Markus Meier <maekke@gentoo.org> qt-multimedia-4.8.2.ebuild:
   arm stable, bug #435074
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
index 60f19ee390f6..bbb2a15b5fed 100644
--- a/x11-libs/qt-multimedia/Manifest
+++ b/x11-libs/qt-multimedia/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX qt-multimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33aec6a5755658c20270204b2ba850f7a SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 WHIRLPOOL c5359f79a53b4d488c346e2d58924e21df3deabbb87e59762185afe43b05543578a1bc2d2bdafa31b1a345adf7a287851bde3a963c56ed1cc686beb14cedc321
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-multimedia-4.7.4.ebuild 1497 SHA256 d379ba4e4f30a6d13451c705a2860d71d10f8a30e570b4ec1e42b65c872aea14 SHA512 af9a10cf76222e04d30374fd504baf6361155043c901210f02a7d0451f871e1e065f10190d0fb9d33d973708b098bd0a1f47779d0f33d2483d0e73a57577a03d WHIRLPOOL 215619a82b81184702e531817c0404538bc450c179c7cebf3939469a5d232bc6f159cb1ae995f815a9640509737dc528f6fbf49d875bb53b325d93e7be46f228
 EBUILD qt-multimedia-4.8.1.ebuild 1488 SHA256 30919bce4c3b64a60a6c102d83bf7856a24a0dc58d0c0fea38b78c00e0ae89f1 SHA512 8728dfee3cf42d68dd00a0558804f47a9599401502e913291fcfcc2970bd865cb4f9c3886111e9d4b8b9cf7153ed795696c4164e343873cfbe1779c29b7e0286 WHIRLPOOL 8ce0844e037dab3e580e3bd7a99144e46715a8bcc2a97766db9a1b87d240c34867c828df4203764652d41b7ced631de5077fd36d9994b4f982c82a1d8ed77abb
 EBUILD qt-multimedia-4.8.2.ebuild 1591 SHA256 a775c1c6c685a4823fd78cb534ad79a5a2668b9b15e7ebd14731a2bf6daabcce SHA512 0d96b6d91798d1b4ec65f59d0900162c4d27bfba43908a1f6bc393475778ec5e9057fd4e91ed3d9e6bf71cd8e327afe9c6d6f40001ae2fba9dc368db6ad8ddb9 WHIRLPOOL 411b9483b7cde5f1c540c389886b5e0f92066ee68c72a85d811764b9f7c1fde3c51e2f3b804706e3449cb74b6eaa2180af7eec8b468b1b79a87d119e8c3d55c2
 EBUILD qt-multimedia-4.8.3.ebuild 1533 SHA256 842bb60e5f03d2d1c02732734d03f35a3a3cf3fc905cee942f17c51d5a4ea877 SHA512 175b04074525a2c7c7e8aebe8c4facaf97b47073a960c69d48573a9b471e7537dadc9beb02c0562a3f1904a4ea1281eb53bf4fa22dc760a47d31fbb264c6fb14 WHIRLPOOL 48ec6b77e923981e75b7c664d4067e090a74c56cbd11ec031c4ad769249367eeb7448f512b213a722b7a751ac0aa2dd75a998bdf2e1d49a3e62cefe97b059c4e
-MISC ChangeLog 8771 SHA256 36ae0d097f52d26c750fc9ee9240f15704caed4e4d2f951c7c295a60c7ee35c6 SHA512 a3bda778b46c182f2003424d740a1dcc5aa4c4eab6577f8d48b42f97d2d3e1e116bc030091a47a60f0609b22fe3c7d6a28475f9bbfb6ddde9fdb076bd9ecbc70 WHIRLPOOL a93c55d214062f59a50440ba45dc28016885dfea589663593060376158724fa820dc716f9feb57fe9306b094a59e78fa49412f8f7912396718eae45610891fd5
+EBUILD qt-multimedia-4.8.4.ebuild 1533 SHA256 a653aa07e3da6beef9a1ec5a0e228be8ad936bfb03cf1cde319b99d98a70e541 SHA512 62cd1967dbada86ba6b86c2a9616cb9a75705851563dca4bba4f47089c456e80ad6cbe934fbd887079be89a61ff7648c7c5267f4e5943d0d6d0f8ef512244bb7 WHIRLPOOL c4bba5db4cd885166ec21f92c47c0710846922fdccb2af1828f30bc4c14b6369c9bcd659981e96cfb9fc2c1f83b4352a561de96a5034a0077bb00982a1bc9aa3
+MISC ChangeLog 8909 SHA256 0a1958c3e60049537cf0148893cbb37cd9e42c07ed1dc55ae1c878a653ce820a SHA512 a52f83316d4830b53cd11c4b04883a8a543b765d0b34c3bd8007ce5c66a15e8a9f298a68b0982847db351fe21547ad45235cd06fe55c706a8662295c5b69d1d6 WHIRLPOOL 0c7b0d4ec409314fb82439b9d1a4700f1ee6dd7dccfc2f0cefb43edc6e2cd7368d83632325a9d5ca5b0143ccc507c1818fe0c6da41275c20605514ba17223706
 MISC metadata.xml 562 SHA256 b723cf2b12dab4eee959da9b8de3db6adb6a87431e2e83c1a825e891670c7938 SHA512 d2dc00c1248bb83d0f60d1423865d21aca4fd2a308956578f9382c7ba0e95a311a6b1b019fefbea56112100da647d7c361240c6aa959150ba03b440cb3fd443e WHIRLPOOL 7833ae095cc6a0ff83342cde8c116adacfb024f53b9339f8f97fd0c62f231c9be83205e3ddb22838095341d428d130a30f6a899ab52d4cf9358b56e0be99ae66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCuk6sACgkQkKaRLQcq0GI61ACcDXy27v+YMhArLvDLEUv7V7AE
-y5YAoJhg/ijEYiRK8t6srHdXxkVUOqOC
-=gtdQ
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild
new file mode 100644
index 000000000000..582a453b6796
--- /dev/null
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild,v 1.1 2012/12/05 03:21:46 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+IUSE="alsa"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/multimedia"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtGui
+		include/QtMultimedia
+		src/src.pro
+		src/corelib
+		src/gui"
+
+	QCONFIG_ADD="multimedia"
+	QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-multimedia -audio-backend
+		$(qt_use alsa)
+		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index 3b9c12957b7b..ccbb8dc6f46a 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-opengl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.128 2012/10/14 17:19:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.129 2012/12/05 03:23:05 yngwin Exp $
+
+*qt-opengl-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-opengl-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-opengl-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
index 6cc02557a346..47e7ecc1a7d2 100644
--- a/x11-libs/qt-opengl/Manifest
+++ b/x11-libs/qt-opengl/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-opengl-4.7.4.ebuild 1198 SHA256 d4ef3fb94dccfcc369f010754cd7e04120b7003eec327859bac119194f11e773 SHA512 8cf62f565b5fc57537c5c51a0d932074f0cbee26dc900d8612d9fe367308802185df89fac29ed72d2d1c84e54d6ef95debd5c21b72679350bf3f6b90344b15db WHIRLPOOL 5542f7bbf58747f215bbfd8e80e63009904ba0fe969a4e398ac71a0e230d07a832e5fcaee1be673e80267995b4022eadd9c9de252964fd52cf3d000908d1d9fe
 EBUILD qt-opengl-4.8.1.ebuild 1406 SHA256 012cd4d8527b328811f10742d9f4f4006e3ddd06750608ad901155c3e588e415 SHA512 003ab16d3bd1ac9215bd0e163524655d52eb3089fd3c3ee6dc1e7d9f84dae64b2b7e2571042c45610c1826d9b715ac7eafadc611e1c37e94b506ec7efeb49621 WHIRLPOOL 5546bc15bf42fb9df6775af5e9229402b4a96d354016c1d1e85da950e9c933700c87b040e3138c43b10e27560f0e3c0d50f87fa3936d3f397f9f2266678a9114
 EBUILD qt-opengl-4.8.2.ebuild 1523 SHA256 d33964869d4b7fd9a2d0dc701f0a124d99c1214bddf4c8d29910467d4d07537c SHA512 93ff81edbd449949c6cb2a7d3a7f07f3d90b5be12657427a7bdb58e23efb5b36f2493b1a127d02496f6e5df6af4f1045e831438a56112eb71c78691ab8b9602a WHIRLPOOL c3f244453be688ccbac4c10f9c7826178b667bd56e5ec552f0717fb5920d711d7ce93e451114dd9856090d26c85f75cecfaf35fb88f9cc99899024d0950a9f59
 EBUILD qt-opengl-4.8.3.ebuild 1452 SHA256 ba5858217ea11da0d2b468123bbbe182b949e6e563a0551af58cc9dc2aeaf6c5 SHA512 a1332f9090b959b80b48ab5076a861c1404052391acec5552b99113fed9566c69707f555f1c32e730b57ef9552b0ddda541678a6198ea63b418811c24e0bdd2e WHIRLPOOL 29ba494aaa89ce262681aa0da0fd44a2827153d5cb234e10caf6feb93d240d03defa71e49aa4641b927e818961b7f5cff4ba85f17b74c984210b2b5cb2f3fa9a
-MISC ChangeLog 15969 SHA256 70fc9af179d8ab504c2f8a0f5f4f04b194889739d40f95d62e3e24f8072b8924 SHA512 c6668550e174eebfae04ad3905e1a0900e0169cf49ea9ecdd6f70901258681f32bb26d2a681ecf6b360b82a919b64539318be2463a8f54fb4bd88fdc6533ab99 WHIRLPOOL a09e96c2eb70098dab5f35d4ef80ade7f878d0a033e40ad9ea1f22a45a11bf6681aa8cd7bfebf6129c9c4b850b7a349a26a407ec421d5d16fa6cc24e5daebdc7
+EBUILD qt-opengl-4.8.4.ebuild 1454 SHA256 34ae0b01a6f4034b134fac5cc18771dec7b14ca54a4f47927dcd84a4a2caf7ff SHA512 04bea534d933aa4e274003ee15af37a7aade70212a4948bffcd66d8d520d811dab5c2b45341b14058299cc09ae271370ce5ebaa49f6837d094bb2e6f5f29d1e1 WHIRLPOOL 3154e628ed3680c70ea202a3b80c35bc9ef88b149fefb377c19574049d7bbcf463f79d937583299a95cc407a1f56bedce3adc1a533cb9174f596312e6b5353ac
+MISC ChangeLog 16098 SHA256 3f16ea596c7f7ec5b44f6500656831d54fac988e4bee33b5bdfc5167d1cec32d SHA512 6887131f51a3367a144a184e98162b13d1a8d9911fb62a277835c49e81943cb7492592dc721d54d93935759e113d69b06b95b632a87009e9a11aadf7e7100a56 WHIRLPOOL a0658599654ed0b69ed703faa9cb98f25668bafb64acdef48e9641e3f5301c763d4f886a1be046261945755c30056dfbe84790e8eba5463df242f4a7eb83a0ed
 MISC metadata.xml 736 SHA256 b68835642f5cf4fd222d5b9e29240b32184a8c1f04c4aed05d6a394bfa3887d1 SHA512 45b3e12ceda217a3b1994225b0916a8b912cb472eba078f1f22dfcef50a54b85261101b046c03dc7cd3657bf37c5735385ddcde39cf1edb3b980f55e72c90542 WHIRLPOOL 8af6b1062637fea0e5976069f5d8ad2eddd85583d338a0557d71fe5c307dea3a49ca2175c1146409db2add833857d2e7515ef4e790c3179298fff6ed0a9f76e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB69AwACgkQuQc30/atMkDolACgnbr/EhdlF6qf8uOj8qLwpxtW
-N70AoIIT7nL0+qhvBwA9g7dG9gveJEDs
-=kFva
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild
new file mode 100644
index 000000000000..19f7dedc8200
--- /dev/null
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild,v 1.1 2012/12/05 03:23:05 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The OpenGL 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="egl qt3support"
+
+DEPEND="
+	virtual/opengl
+	~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/opengl
+		src/plugins/graphicssystems/opengl"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtGui
+		include/QtOpenGL
+		src/corelib
+		src/gui
+		src/opengl
+		src/plugins
+		src/3rdparty"
+
+	QCONFIG_ADD="opengl"
+	QCONFIG_DEFINE="QT_OPENGL"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-opengl
+		$(qt_use qt3support)
+		$(qt_use egl)"
+
+	qt4-build_src_configure
+
+	# Not building tools/designer/src/plugins/tools/view3d as it's
+	# commented out of the build in the source
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
+}
diff --git a/x11-libs/qt-openvg/ChangeLog b/x11-libs/qt-openvg/ChangeLog
index 9cbbc7f9019c..61edd820b8b3 100644
--- a/x11-libs/qt-openvg/ChangeLog
+++ b/x11-libs/qt-openvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-openvg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/ChangeLog,v 1.15 2012/09/16 04:33:57 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/ChangeLog,v 1.16 2012/12/05 03:24:06 yngwin Exp $
+
+*qt-openvg-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-openvg-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   16 Sep 2012; Ben de Groot <yngwin@gentoo.org> qt-openvg-4.8.3.ebuild:
   Add overlay changes (c++0x useflag)
diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
index 8163de09fb86..1843ee86bcbd 100644
--- a/x11-libs/qt-openvg/Manifest
+++ b/x11-libs/qt-openvg/Manifest
@@ -2,8 +2,10 @@ AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-openvg-4.8.1.ebuild 1278 SHA256 c4c0ece82cde17079720018e2194e364ba554bcced8406e55086afd8b3768fae SHA512 1d2f5555fd97bcd4ed678f8dee4c4cf41b2529c3977f2b28861376be0f056fcebd95927ffb7f02373dcf44e3a5ae5fbb101104a5e8b1867cceb2a339ac47dc59 WHIRLPOOL 85c7716c5ad010d8720caf76950c694cbd6115204b221771cba1f83e52edeabc0eef0d74a47874b04563f4b9d8c30990f441ca16f3099bd35601dc0825904039
 EBUILD qt-openvg-4.8.2.ebuild 1394 SHA256 e81efd438bf7e07ff4cc04112b87af969cb8dfe8ec30dcbe58b8f92b5d8d90b0 SHA512 e677ed83de6e3de89c4c36fedb876082a60dff5f73d3d4314400b97c41c24eae5cec5b839dc5e51ce9da0e28e9170b327110895335b29a5677887151034721f4 WHIRLPOOL 295dd8593ec131eb6aa56ec05fb720a1f819e39478421d73f965b980e82ca8f594c70960abf699157ef0518025beeb16e0814b8a04c129c0f869676ba454f3b4
 EBUILD qt-openvg-4.8.3.ebuild 1323 SHA256 dcc94cc36031c82cb7201373a6c816b7b3589a9cac5777a7da9c8895ba065189 SHA512 26b7213f93547973db6e2293db278e654289fc97b6148f660ab28ae80a573c5e4db361fe9b77990ba5a5660378ac27d8b35046da621619e3a2f2da714f7b3830 WHIRLPOOL 28e85856336c354b1ee591b60a7e0e380b586653d5b5bdecfb90667347d2c84c9836bc92a06b6c448d1d80b67cde8711d23d8e0bde1ea5d8b4cc06a70da2d6ed
-MISC ChangeLog 2195 SHA256 3afbe0ad598b34ef7c07bde55a30bdb9d7306740f39d53aa6b4ebd88c090452e SHA512 f426e9988f7fa12c8d9b55de7340b97a104ea8a339137d77f026b8be9098c8fae3efbe4ea37c4cd950deab51951a578fbc338d906a4d931cc5866f869b32b10b WHIRLPOOL 89e8b5e2f42ff1b90534c7d3e86d17d656bb9af3a90cf83f05cbfa5c34bcf4797bafaf3e51468caa0637f96d9c80449d675b9d09662c11354fc4979d13192053
+EBUILD qt-openvg-4.8.4.ebuild 1323 SHA256 4deee178301e519b6c89a4a4d149454752e95bd45548e5ee81c78683ef24baf3 SHA512 25c5924ff4b4376215ddf6c96af7d0a3c306f95d420e50cf91295afb010b69fb04475e603af221cd44fb7fb884f123a410d016620d11b3253ea0e0823bf18d46 WHIRLPOOL be4251008e0865c6d18507e101f2c4660174cdf3bd2a896695b0fd9eee1016b6e3180fb3109f2c6269fa55038128f18c42d809ad84af2fd887fa53e711a8957b
+MISC ChangeLog 2325 SHA256 80b494c7df592597ed39f170737cbe4971fcad8ce4941faa9c86061db30fc86b SHA512 11bf33151cf4253f6a65f8f9b948e7974e70eaf5e7dc727020eee7f674a3d3ea5cae301cdf15f366aadfd288bce046fe76e255d2402694e1f929ed64fbbac157 WHIRLPOOL 7cc6df3c3c25e38d56f8452b1571f6dde820f6c4cf7bb0999a49812a8427bdbfe61f5fc934767132260ee4fdcaa27d2e85de36c54dc15986941f49d55a59b669
 MISC metadata.xml 572 SHA256 e846922bfc3cf62f90b17602766f59a04abe218e1c139cf61408e56052a83d28 SHA512 f903529cfb430b5e8dcc134d5dc3a90c9f668f41b9e63d83229b2400a1be3e548212b981c0d6f67c2129236e9de10a0a7f011a4c144da571dd6725606fe1a03f WHIRLPOOL 728e8e91e0cdaa9d16bf332b382a1eef9cee1226cb78be8d79b225c21f6a516272f882f50146a205b44bd4820f6ca933b64c3486014476f722a4d5e6290627e3
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild
new file mode 100644
index 000000000000..f2dd4c8d1147
--- /dev/null
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild,v 1.1 2012/12/05 03:24:06 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The OpenVG module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="qt3support"
+
+DEPEND="
+	media-libs/mesa[egl,openvg]
+	~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qt3support=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/openvg
+		src/plugins/graphicssystems/openvg"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtGui
+		include/QtOpenVG
+		src/corelib
+		src/gui
+		src/openvg
+		src/plugins
+		src/3rdparty"
+
+	QCONFIG_ADD="openvg"
+	QCONFIG_DEFINE="QT_OPENVG"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	gltype="desktop"
+
+	myconf+="
+		-openvg -egl
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
+}
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index 5ac6103d2d0e..0287d19801bb 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.127 2012/09/16 04:35:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.128 2012/12/05 03:25:14 yngwin Exp $
+
+*qt-phonon-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-phonon-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   16 Sep 2012; Ben de Groot <yngwin@gentoo.org> qt-phonon-4.8.3.ebuild:
   Add overlay changes (c++0x useflag)
diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest
index c1f9c104bd56..46bdee0c9234 100644
--- a/x11-libs/qt-phonon/Manifest
+++ b/x11-libs/qt-phonon/Manifest
@@ -3,9 +3,11 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-phonon-4.7.4.ebuild 1272 SHA256 e2037767db6537e49dd9580b8d36c7e8b01434b70bf66dbc1538fdece7716c99 SHA512 f11e8bdc6a9e5e85124438ed02f751e0190e4065fc240841def24f3ddb5e313b6279639e2e41868a3608ce2a31e9c946be9422c4f1fad180d3927c67c492cb36 WHIRLPOOL 40e0b1aab2c6d26a9df8225fad9fe072e21cf863051b84c0459019c900e76fa4ed4485566bdd03c3c2768c884a950d48ecbe826eb35203af4c68c2a1d0ef0d61
 EBUILD qt-phonon-4.8.1.ebuild 1324 SHA256 37eff0debfbb1332513dfcae118e1f1a2758d8df8407359455b984d2e40882ab SHA512 9a5d8eedaacb0dd83ddeea59f2aff88121075d8a559a06fd9855a1a57f865b44011bced102465fa483810c0a5eaf24d369a2fc9ec19851b667db6bce15afdcbb WHIRLPOOL 3e40350eb4d58156bd7954f8a5a2f637acd45d3cc71fca2f578ddfbe6c0522095e7ce9c265e753d1568fde89462810a679ac65f1c5965df9ac5f242c649b3a9c
 EBUILD qt-phonon-4.8.2.ebuild 1438 SHA256 82e21814d9f73c7d09be5197729218334127fb1b5947942c05ae824c3fcb27a8 SHA512 e7c47b1218c8faae2fb99e2c70dcc6cdc3a277fdba01fd408698dbb9dd3e93e606c9b198400d6b958f47bb79197f41321cc1c6dbcf1fb961e8dcf9774faa6131 WHIRLPOOL 1a6d5dcab12103316512c226b4349e5b3e253883adc8e0314a9d53e72438b15c6001784de838d68d0a3a8121af57c49c4ccbaeab2e2a4b5e9491ae2f9bf66391
 EBUILD qt-phonon-4.8.3.ebuild 1370 SHA256 1cf9f2feed4370674d859f93775045b39173e8e4d11a97e2a6a15cd56698f840 SHA512 9be04f4927680789811c3fa87d114fec5817321dad4a08665fdf98b41bed21d9aa8e896e9c31dfbe63ab49c59d078482617a60aa9077ec0d6fc4efa461f8fde7 WHIRLPOOL 9c2a04fa06e270be3fbddeb50e88225dc0c5abccd0e134df737b81a6789fb610af1c884a000eb3fae7ce29a1a0c9813442c51670678eb824b2f6a5c00530789e
-MISC ChangeLog 15477 SHA256 26e5e446ef98262cf31fbff362509f1fe34de9eabfbeb8cde8964afab6c79a3a SHA512 7b5a28043dfc0acc0189d7239bbd0f403d787ed4ea9fbb81bbd5c4b96b11ac35db6930a7e6980c99784e0cea9f24c16a83e06d864a7b08fd028026e10db6996e WHIRLPOOL 40f359a1e33f69c2ef574bab150ae0098ce94eb81d2a78caec42d86133626b9a41248c355657263e87aaed6413a2e60cf5d062209d6518c1333dbdf4f2e8eed4
+EBUILD qt-phonon-4.8.4.ebuild 1370 SHA256 53f5eac0eaa65fcc73fbad203691fe628243711902d52a60b5efa92529ad6a01 SHA512 53bbaf7d587cac27fc05c4afbfeaaf5d4fa95f896723a60dc774b20430cc88ab1170fbb26289d12a7d81dcd63867ffa0c6050ca7db6dde5eea2a2d251155c96e WHIRLPOOL ab39e2e1f5a614bdd06c7ce8d09642e3a0d24c2e27ab9ef7a96020458c8eb8552dfd17cd3072083beb91df1aa1f5e313ac6cf60da160baa85cff1d6c1b3cf862
+MISC ChangeLog 15607 SHA256 624eb28aaa78c4920809ddc975bb00ac7421ae83c1aecaa4cacac848d5f01c49 SHA512 71ccbdb950993807a66bd75833ecc6d6d998ee064103c439647bb354221357b91c938c892535da8c6b3cdf55d746ad2ac321dca14e2a5eb75995cadaefe8630b WHIRLPOOL be5fd74fa145a016c98fd278dee17f1858f2591366c98852187925d8a59e6db79ebcfbece9a023f0c8fd230d501dd18c3e6c01cf670b57d85267c8eb1af9249e
 MISC metadata.xml 712 SHA256 2226f534d864980b57f0c6b17eebacec71f82cd1e82e1acc0f578c32e539fe5d SHA512 060ef6389cc129e6005af06f93b0dd91ec9f3cdcf79621b07effef512b76cc7f22b0360243eef2c2fd02a82001b408b4f8a28cdb8501ac2d8f1c906b08db3bca WHIRLPOOL 854d93401fb58a7462e965b93e364fcc03d92f5e3e6cc5e0b1f13666a51251ca5b8f236508470dd436dae828c5fbafef36e9f302b490b516f3daf8766627d318
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild
new file mode 100644
index 000000000000..ddb622d89d66
--- /dev/null
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild,v 1.1 2012/12/05 03:25:14 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Phonon module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="dbus qt3support"
+
+DEPEND="
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
+	!kde-base/phonon-kde
+	!kde-base/phonon-xine
+	!media-libs/phonon
+	!media-sound/phonon
+	!aqua? ( media-libs/gstreamer:0.10
+		 media-plugins/gst-plugins-meta:0.10 )
+	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/phonon
+		src/plugins/phonon
+		tools/designer/src/plugins/phononwidgets"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include
+		src
+		tools"
+
+	QCONFIG_ADD="phonon"
+	QCONFIG_DEFINE="QT_PHONON
+			$(use !aqua && echo QT_GSTREAMER)"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-phonon -phonon-backend -no-opengl -no-svg
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index 2da7be0e6e77..a6810335222f 100644
--- a/x11-libs/qt-qt3support/ChangeLog
+++ b/x11-libs/qt-qt3support/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-qt3support
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.131 2012/10/14 16:58:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.132 2012/12/05 03:26:29 yngwin Exp $
+
+*qt-qt3support-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-qt3support-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-qt3support-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
index 9b09895b7364..e1996715b967 100644
--- a/x11-libs/qt-qt3support/Manifest
+++ b/x11-libs/qt-qt3support/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-qt3support-4.7.4.ebuild 1327 SHA256 9460e1acaca3cd1538c94a3a9b96c9fdd995e2960cd1a14148e59c94baa98236 SHA512 bd1d2b2dbdba15f0181db266d0eeb7989c2ed9653fa6e63f7e23c4b785cab411eb29f72bad99d624a06e39a4a044dcaa4d01c042fb5cc92ed91517cd9349d7fa WHIRLPOOL 6df634c0fccc035fe8dd6803c9f9a749359f0bcc924f257fdad8fab8f061ffd20b54dd9dd7273872b3bc246764fda7aa8161c284d9572688c856e04526b3ef0a
 EBUILD qt-qt3support-4.8.1.ebuild 1054 SHA256 1939fda4d7478004ad32a09fdb17dd768e5fd98129a37800c156398464650d5f SHA512 16b85c45e69be09fc58fadb8484150eeb881dcd03e1d3bfa04442aac10975a49287c64f7cbfb783e543cd4e258b5fdacfd04d2baa8fd308aab1c056ace67c423 WHIRLPOOL c4268aaf96f45a4308cbc8d4387050b3600aeb1671fe9be8165ef46cb0eecefba8716ccf78f8b687c932a9a733a4c1b3dc609380baa98baf4558905a227c2a48
 EBUILD qt-qt3support-4.8.2.ebuild 1169 SHA256 9837787d3afd719afab2e68fb0320974a102d6c8f3738d7e980acf576b9c9778 SHA512 8b4470d69a25b996442730a1c95402aca335531fc523e01f0f628de33dce347c463188443fb391b0ffaa24c9dd8a71e4e9949c3db4228ea3b7a93028258e22c0 WHIRLPOOL 1a65d83f307fe7d9713c19ac49301a5015bc1f25d2e3045126e1a441dc63f099ec3d856878809f76ff385b8b7bcf2c68b8370d894726e42dd24b4b9e8ca8722b
 EBUILD qt-qt3support-4.8.3.ebuild 1088 SHA256 f66515198ddde3b88ecbab223c1ae6c307dec852687ed8f73eab2754419250f0 SHA512 49b7167dc75f2426d9463ab87895fb7605d5cd3f6bd82e07168f2c902cf9db300dbf0c033926734dbba5748660b7481f640dcede5550816221d0f22bb7f46513 WHIRLPOOL 98af7858fd695b3d7eb0d1ebb1d0212366eb1d7796bd104d910650d58c9120f1ee126a0e7b7d09314d213adf0d5613b4247478287f81b84a58992f36b264c404
-MISC ChangeLog 16660 SHA256 51e2cd71e7b9123f9bbe111e5120d800f075eb0b41ae1426c1e1c49076de759c SHA512 b3a9b86c17a72e7a0c7b277d38bde923696807c834f2bbb0bb7199a1823a2d8dbe944cd0f3a14f2705e788ecfc5958109da667d20cd228c44f1f5e3861e90d21 WHIRLPOOL ece680d95a1402f6a268c004e8ef44bab97bc684f189f885ff3167961c8de0556732e9e893f6b6a11cfff35875578c756062c0f732015fb709585aefa76f3b7e
+EBUILD qt-qt3support-4.8.4.ebuild 1088 SHA256 0fa899528d0055ed9d92512abbcb8fa09c963cb3a11efcaa3f840adec8689780 SHA512 553395f9304b74d0024a659ac8894c274b539882b338396d1d2b026e1018036cb06589263b3daaf63150c0e3007fb577acce4fc0c3785065f0c32d18d8785bee WHIRLPOOL b3dadb75dc9a53aef9837afc31ca1690e3ccc495f49057885e95313a05d59145da27838108f51369c244cb27e32b3c60fbcd10890b767682c3cae72fb7c0001c
+MISC ChangeLog 16797 SHA256 1f1c4d0118a61daad6001291bf4133ae65ba2516592e71d0a5739ce47441f2ec SHA512 4214eb52150829f646993ea537bdd038d2a4c995c499e31e6a0b2ccc6948cdccc7b764b1c284cb646c2d91764d3e240ddbd89d966b5b1a4b992ab91c2df088d8 WHIRLPOOL cb6a76606c777f9fff5cf7b5e6ec8c9fda01aef2f8d0667d1943ed4fa66ed795ac73d9fb6fb5f43d42e716213bc67bfaad5110168f4a7dbae4fc193ed1385edc
 MISC metadata.xml 637 SHA256 d2053ed868dd6a4abc38540497dbb25b962ad7fe2695861f462b0209132b64b4 SHA512 48e253fa18be157cdea3c2339c54a8c22821c93211304c8cf54831e84eb2b8536e6772c77768042988f9860153b43fa5aa43a2207a81e80c469e47e80a56595f WHIRLPOOL 272785136df8137d95b66bd19f5ade50322df2229b500468fc206811b47500230be3be9a0772ed6abadc413acbeef6199259a2cf6af449e835f0309476ad59fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB67y0ACgkQuQc30/atMkDXygCfSuvdkM+UXYpoDNA89zPeeE+c
-YB8An0a0w+//2TPVBs0Hno5KrL5/ykXL
-=Z2LT
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild
new file mode 100644
index 000000000000..559e352f351c
--- /dev/null
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild,v 1.1 2012/12/05 03:26:29 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Qt3 support 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 ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+accessibility"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support]
+	~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/qt3support
+		src/tools/uic3
+		tools/designer/src/plugins/widgets
+		tools/porting"
+
+	QT4_EXTRACT_DIRECTORIES="
+		src
+		include
+		tools"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-qt3support
+		$(qt_use accessibility)"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index c09604217c0c..c75ed5b1ba96 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.134 2012/10/14 17:07:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.135 2012/12/05 03:27:45 yngwin Exp $
+
+*qt-script-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-script-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-script-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index 78c4b21b3677..ab60d8d35fbc 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-javascriptcore-x32.patch 1011 SHA256 7a20c0e70285f9506b2d1316ff7d034943e5a6885ed50c5364f276bc8e648d36 SHA512 d24778a440daf1bb9d3fd97c2fc0d55de3e80485054b26128a9050e8b940ccfe6fb694bc6ec94e1673e35c7ee50d1425945093268f7a642e71fefa354524868a WHIRLPOOL f4d475b353619a0c0c8cddfa506ea8f9d166230512540b84bdf4acbcbb046e155ae1bb2dd4d0e0a26f4c0c07011b430bafe8750230d7804e8a46e63135c674c5
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX qt-script-4.8.1+gcc-4.7.patch 2255 SHA256 57106ea4fc4df1a4ae7d06738faeae659fcbcc6d6d602a856a24f3ddcca7f0c2 SHA512 505b03f3e04e51f5bc55761b7f31932358c57d1a7eb7f9bc6210813fa220b24821f19e09ef2df2ee72d3f3184c7d430a1d4212757b6788d4875dc9463ca0488e WHIRLPOOL c94d65d3647d2461f4feee3c705100ec935521c6f162ce5352f2a8f7de0d6dce85876d14e3c5bcfb243c2408e9dd8f945d0f2002124dfdec1dbfa0f12f92a557
@@ -8,16 +5,11 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-script-4.7.4.ebuild 1525 SHA256 115543c2908dd34fdd78d2246b7e69690021c0188c883b5612786940fbf8672f SHA512 943a9c92e2ba3ff6e186af054296d10a98f6bd47f866b0664565a995624bb4b44cae58b400ab2cd31f3f875c2a40e42d141be9058e16deafe035faecac989d2d WHIRLPOOL 097a533b1d074b5a951e43ebcee6f9dfae9a9a669e53618633f9f5cad815f2ee8dde578fbe88e01c85b67ac9a6107ccdc8099530c72b668bece072b4a4e1b0f3
 EBUILD qt-script-4.8.1.ebuild 1601 SHA256 2463087a32e9c56a4387907d68a1dbb995861967b1d22b670f837bf015c1ed69 SHA512 463bc66669958875b664571645616a6a006b5b25e2501e61babbf31781d40fc7047b5f45e30b6d590b06705521c53ecdccde7a298f68a649a4778c600ff6f0ed WHIRLPOOL 03bc7e89bb382a0c2aae98ed735f410c9287c03bc010671ea1329c8904b3440134a7d9077ae127ae5453cb3929d60a277528cb78f0d1c098f87dc4330f2d2621
 EBUILD qt-script-4.8.2.ebuild 1714 SHA256 95efa34a29869eb6bccb7e31613fe600abd418461e2dc659cc2015eb14b40519 SHA512 0fd984d3f1db3514cc3407dee893091f8b2a63ec129dff981774f43eb0a10aac3cd589ee69589b4534bf0a8f9c18aa5b570bc1c9680ad6dac9cbadd73eb0a3a1 WHIRLPOOL 6b7bd83c84b54504d0d6cd58f0f08c06ded5a7e450010d975cfe6d7171f104cc5f85173205471da7dc281d671e2f9272c7fa160e5dd374312c605edc5560662a
 EBUILD qt-script-4.8.3.ebuild 1670 SHA256 533039b894d766b68645ce43c1458a3a56b87a77f62f304c3f25f92647ebe034 SHA512 ce1b70e011d65dc7214a406b51b558d7ef013ffdb8353c46e4aabe85f8eea9ed84f81708a442ffe444d7aaf1208db7ed97148a08a33ca982b024e5389c435387 WHIRLPOOL 7489f46d323147ccaa18ad58c7af733f3d2cc5ed7e93795f36b2cb71131304d27215b3af684f3eeb6374867e074626abb8136292ff67f4ec21f03652132598fd
-MISC ChangeLog 16592 SHA256 1ebe30fce9fe8d78819acff1abe4fea318ea43047ebac14e553ed30f6e1af755 SHA512 a8f1763b0605e0ca2c86be05f8a7d343515eb8af39c914378fb172021ce0e11f0177a9ea01ccca94238a58a7fb86184e8d87841836011bdae296ad304f05234f WHIRLPOOL 112ab4164a7af832581823ef76bbe2003af71b145e29ce961bf91a33c4dd0e24cdf0aad04aa41c32ed7e67eb660e6643ef3be5fe8ac28c9bee813789cc10e33a
+EBUILD qt-script-4.8.4.ebuild 1611 SHA256 d788e6277af083502f5d8f372155b1d85caad08a5e7ef9dbb45bad8890edbc6a SHA512 2c9693078e505e70b9681aa19ee0f46ed152f4823bffd7c06cf304f2e56c9f81c9a29da27b086dd9454a3036ffa31496ff827bf6e34f6bfb985c1f0dd5df92a7 WHIRLPOOL 788e168baa2bf8900b567399f5a1cb1ad293b1fdad1aef3de3647b490f1cd2974096ab47a92855e135383a3083eb6eec2ed493b5ec7038404ef3dd34d21bd9e8
+MISC ChangeLog 16721 SHA256 78e04de581ca0f5110678602046b679e20cfa984108d54275c43197828fec233 SHA512 00a7fe90e7397069c0a3fc4cba287ff75d812babae14b7c12b8d2a95b36c74e4afc6c24b9bd6a27f6bcf8a0ed7f373fb27ffba54450f1f23d99b1ec52031bdda WHIRLPOOL 003d3f37f07cb0add9fa2137e2b9e8d0cfb4153015a8971882183b9645cedae284e1eb1873110370a27a09d3858ecc632f022f9ddb1b1c55580982ecdff7955e
 MISC metadata.xml 671 SHA256 d2ab44d3d87cd5c33d716634746a780afb4b647d3c6277282d744f2086e0651b SHA512 3b7d40b520a1d7aacf89ee559abe463ff4f44cc41c5ada3c7c9d2c497147ec52a40fee1645339fea6150df46a651f8d636f83450ce5700f20c84d110df8585f3 WHIRLPOOL 32ea7e0b446afed92eff185db405fb426ae3852090a905d5374dcd4ec319faa7c5c86a0febd63e576a614d84c7de37e92526d127c195eac73c9c5c73c5e0b59e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB68UIACgkQuQc30/atMkByLACgieHLGxYMUF7/8CCmGiYR3kzw
-DRMAoIRm6wUGR1jty79K/yztPqSH4onM
-=BHaT
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-script/qt-script-4.8.4.ebuild b/x11-libs/qt-script/qt-script-4.8.4.ebuild
new file mode 100644
index 000000000000..81c0f3b12aa8
--- /dev/null
+++ b/x11-libs/qt-script/qt-script-4.8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.4.ebuild,v 1.1 2012/12/05 03:27:45 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The ECMAScript 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="iconv +jit"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/script"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtScript
+		src/3rdparty/javascriptcore
+		src/corelib"
+
+	QCONFIG_ADD="script"
+	QCONFIG_DEFINE="QT_SCRIPT"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use iconv)
+		$(qt_use jit javascript-jit)
+		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
+		-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
+		-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
+		-no-gtkstyle"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# install private headers
+	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
+	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
+}
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 9de2cb9fe779..8f316c2a5868 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.151 2012/10/14 16:55:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.152 2012/12/05 03:29:08 yngwin Exp $
+
+*qt-sql-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-sql-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-sql-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 38457dbb2f86..f8b2864b9334 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-sql-4.7.4.ebuild 2487 SHA256 0a6dd611b93c04e566838bbee74173610b7be288144d27bff82fa71c7b97ee31 SHA512 e79ecb7750790355569bddb2cae44f3a2340f1a15851acb725f7c1f4e024f1a1375c73942d3c7961c970a0f14b0119124a404e4475c46fc20615f36c6bd3affe WHIRLPOOL 09703c4aa11c3c3513943ce524d2e47a8e720b78be0d507214802db2fee1204ffac32fb213d2eaadd437d93a45bed29338987c4152ee73546ddf87210a0b9322
 EBUILD qt-sql-4.8.1.ebuild 2292 SHA256 179d039050434b91e90ef2acec93fb8ef425d9e0ad39423fa2ea693528539a28 SHA512 6c272269f3d5176d5bba89efbca20f0cb5646b01c453863f4c523f895ed7c7ac3f231a99dee8f941bf3077f0a4a19da9f2f06ae110d59780ba6b09fb11566321 WHIRLPOOL cd673ed8800b2448eecf981976dc1f862a7b23c6c476c0e34672a83dbea8e2e08d8a72bde336ba6c570ccd8171ff42a296fd2f41bcecb80c4b53dc3ece260298
 EBUILD qt-sql-4.8.2.ebuild 2564 SHA256 f60dbd301b42455f80a7f0c96528c0186bbd48e4bd83fd91708052223c52a512 SHA512 22802f2ab3c4598b0f3cad2bf10f9692623828335aaedbf8bf4d9f9c822cc2d5546dc89827eacda639aa0cbcdb1bb2b41ef336f44dafb0b02ed201eb8e657756 WHIRLPOOL 572df8ff6cc81510de5f166dbd0a0cf947a422484726f5afd34f27afcd2da69844430ab3d93e066ea94293bfef8e7e08c70f4dd279935e1d9bc243ce86235532
 EBUILD qt-sql-4.8.3.ebuild 2507 SHA256 b01917f46448e568c23428db3ea55cb5d35c0e075ba60e0a359f5e29e8ee777c SHA512 97e0a1e8e74ff5fa1bbd929b34999338776a9ece47a9a7a7ec2760dba2e65a3048dcb4e807a114ed24c558b78e47e7d3b117151ce61e28543c1b613d67b27437 WHIRLPOOL 8ac14454001e2c44c3cb147366a9db3c1850c9c8b225a98bf01b9dac344a32d2ddb45e903e449184cf0dffd234174048642d0f8c9c01b729b4976d25c7b4cb65
-MISC ChangeLog 18408 SHA256 8f05cb74ce7b4d3ae28affd02ea6e4727ad9e4f69e76410c2933f0e329dcca55 SHA512 14974a263ab371cb6323900954196fd2f09c3f2833c4452a677276cf05620451ce78640e1b3d209d473b817b520845f8078ca54eec66fe4ffac699951106b5f6 WHIRLPOOL 2d73c20e03df9572fc0d78b8b97a876a78d4fb0850bf939a98dc99a37864f54a835945b0d86b1661917fea818a3b280ae22ddb960bac022ad7a133f2a81cb72a
+EBUILD qt-sql-4.8.4.ebuild 2507 SHA256 114426d64f2d415bf6a46692f1a5e149e13da14ae683d0bb1e3c9b5d1949e069 SHA512 faffe69894b43fec1d58463d15567978f18e032f4a979ffb9a71ab808031148e3d6b59073641926fdb7dc1cab5cafed2ae64af6ed5a13d5acc4ee7340c21c201 WHIRLPOOL c699d6f29f52cea5fb9623d13345aeec1ec261272995b02c28345a7c8e761e460ea0e9babda82df7fee58fb05a582f5f1e9b0fdff5b01bbbfee9c1550a0acfbd
+MISC ChangeLog 18531 SHA256 c57b7ef58bbe4a2fff481f6e8b70149341bced38c5c3bd96e047c4a0967b6318 SHA512 80895fe631f7e3d92fa3d8cf8f7376deb37d992a2a88b8168d3d700d58c54cf0dea06fa43dcca4fba44a269c59ff4ee56e5228e1d85971cd93abad145b6cf253 WHIRLPOOL b966f4472bbb2819ae425f9b7905fa2cb53fad43ce2be8e6053231db32de9e4f2e7d8e9bf6e4a09e48424e6009ea08bdb4fe48a82a6dacc3d47ffdd023e46245
 MISC metadata.xml 635 SHA256 b85d8d021d4215acfa8242acf9dd9497b534b2f7703e2b9e90f40d91567112a1 SHA512 3532f1c4f7c497f9453ace503cc3733d7131ac72d7e4f69ddf9b655600f3c7c03148f65d97f001e65c1c4003fc2f57fbc2956c36e47a7068c3e45de6d957e76c WHIRLPOOL 92aba3de28f27cd0677d95e30a6501a1e69495e51cc1e310071e1a8c50abdfcadfe1058c07e926eeb29809f67674730e9e3a609f915e11fe653fade2597b3742
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB67q4ACgkQuQc30/atMkCgSQCgpbsOijFGaUDqpgZcptGpsW7F
-OgsAnjgUL7fqWZeoo5hmvlE6ur0krRyv
-=zodq
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-sql/qt-sql-4.8.4.ebuild b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild
new file mode 100644
index 000000000000..be586df6300f
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.4.ebuild,v 1.1 2012/12/05 03:29:08 yngwin Exp $
+
+EAPI=4
+
+inherit multilib qt4-build
+
+DESCRIPTION="The SQL 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="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/sql
+		src/plugins/sqldrivers"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtSql
+		src/src.pro
+		src/corelib
+		src/plugins
+		src/tools/tools.pro"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use firebird sql-ibase  plugin)
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+		$(qt_use oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+		$(qt_use odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(qt_use postgres sql-psql   plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+		$(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+		-no-sql-db2
+		-no-sql-sqlite2
+		-no-sql-symsql
+		$(qt_use qt3support)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		-no-glib"
+
+	qt4-build_src_configure
+}
author	Ben de Groot <yngwin@gentoo.org>	2012-12-05 03:29:12 +0000
committer	Ben de Groot <yngwin@gentoo.org>	2012-12-05 03:29:12 +0000
commit	0258073525bebf0fadcded9e354d75c76c367c4a (patch)
tree	fbf1bd0adee70fe7f43e26381a2302cf81a6e64e
parent	temp bump mask for Qt 4.8.4 (diff)
download	historical-0258073525bebf0fadcded9e354d75c76c367c4a.tar.gz historical-0258073525bebf0fadcded9e354d75c76c367c4a.tar.bz2 historical-0258073525bebf0fadcded9e354d75c76c367c4a.zip