[dev-qt] sync with portage

15 files changed, 12 insertions, 13 deletions

diff --git a/x11-libs/qt-core/Manifest b/dev-qt/qtcore/Manifest
index 064295f..92ae0f0 100644
--- a/x11-libs/qt-core/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -7,4 +7,4 @@ AUX qt-ccache.patch 2126 SHA256 f300bf8c218060111b7b9d3abaf50802eeb0cba11b7a284e
 AUX qt-cxxflags.patch 799 SHA256 c2daf63c38bf018b66e054b44b2d87e459d18e48d66b13d130fa58d9fc8a4f21 SHA512 4080116da656d83f44c69c4f89b7e74855341db9b556d551fdc55941ba384b766ec0d1da75d3b6d6bfc4f77c1c16416dcd8bb46fa39a012c8a24c448fb511ae3 WHIRLPOOL ae0a015bc6168645fcdb26e64b8b9a92d99da24d787d0fde511b310398f2fd2e46913dd06e106860610e9a3fac22e3278e77cea56fb794acbf02a3f6805e048d
 AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qt-core-4.8.4-r132.ebuild 5342 SHA256 f2e1d57370efff572dc9b909a00650f0b093c8f536ea519db89bff4c908ffc6f SHA512 5b997d814626c72afdd6e0c52a1d3744b6a5bd6da08c63ab7bdbbc588f3bccf2b636cde6b86a093f7a8c926425f416078ac977045a7fe843323764da925fc796 WHIRLPOOL e00f288d82f10a143d38b4db47cfc44b8788aa412c8ff0d5db1f5d01d964f4a6b4e7c3718fb934eee6b954f125fcb7bad0ece4519dcc087e8de26e55ed21594f
+EBUILD qtcore-4.8.4-r131.ebuild 5313 SHA256 b0b26db54b9c2a7ffc8fc03207c19918130e2f77a3b128f179a0271c9e294ef7 SHA512 114c5e5b16fc431396f4a92a2f7c0b55f799f95a7798ce57e4483e2bf1e5953a92184c404ca67ce27549cb85104c1381680d8a77133ba3512fb1143511551ead WHIRLPOOL 6656a9aa5e7a52d4393f16a0021896db034fb4f879a40e8d2e35a14d1a591de0b93b85c7cba6ede48dd7ffb51dc0269d32423f2bd64b012456d590af48efedeb
diff --git a/x11-libs/qt-core/files/CVE-2013-0254.patch b/dev-qt/qtcore/files/CVE-2013-0254.patch
index 48cc05f..48cc05f 100644
--- a/x11-libs/qt-core/files/CVE-2013-0254.patch
+++ b/dev-qt/qtcore/files/CVE-2013-0254.patch
diff --git a/x11-libs/qt-core/files/blacklist-mis-issued-Turktrust-certs.patch b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch
index c2245cc..c2245cc 100644
--- a/x11-libs/qt-core/files/blacklist-mis-issued-Turktrust-certs.patch
+++ b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch
diff --git a/x11-libs/qt-core/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
index d59ac49..d59ac49 100644
--- a/x11-libs/qt-core/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
+++ b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
diff --git a/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
index fa82334..fa82334 100644
--- a/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch
+++ b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
diff --git a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch
index 8d92ca9..8d92ca9 100644
--- a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch
+++ b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch
diff --git a/x11-libs/qt-core/files/qt-ccache.patch b/dev-qt/qtcore/files/qt-ccache.patch
index 5afee16..5afee16 100644
--- a/x11-libs/qt-core/files/qt-ccache.patch
+++ b/dev-qt/qtcore/files/qt-ccache.patch
diff --git a/x11-libs/qt-core/files/qt-cxxflags.patch b/dev-qt/qtcore/files/qt-cxxflags.patch
index 2fa0ce6..2fa0ce6 100644
--- a/x11-libs/qt-core/files/qt-cxxflags.patch
+++ b/dev-qt/qtcore/files/qt-cxxflags.patch
diff --git a/x11-libs/qt-core/files/set-pkg-config-locations-directly-to-install-dir.patch b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch
index 46b9c28..46b9c28 100644
--- a/x11-libs/qt-core/files/set-pkg-config-locations-directly-to-install-dir.patch
+++ b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch
diff --git a/x11-libs/qt-core/qt-core-4.8.4-r132.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r131.ebuild
index c3eece0..39c8174 100644
--- a/x11-libs/qt-core/qt-core-4.8.4-r132.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.4-r131.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r4.ebuild,v 1.1 2013/02/15 10:20:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.2 2013/03/03 03:31:54 pesa Exp $
 
 EAPI=5
 
@@ -21,11 +21,10 @@ DEPEND="
 	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] )
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
 "
 
 PATCHES=(
@@ -34,8 +33,8 @@ PATCHES=(
 	"${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch"
 	"${FILESDIR}/CVE-2013-0254.patch"
 	"${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch"
-    "${FILESDIR}/qt-ccache.patch"
-    "${FILESDIR}/qt-cxxflags.patch"
+	"${FILESDIR}/qt-ccache.patch"
+	"${FILESDIR}/qt-cxxflags.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-gui/Manifest b/dev-qt/qtgui/Manifest
index 5ef7724..206d2b2 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,5 @@
 AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9
 AUX qt-cxxflags.patch 799 SHA256 c2daf63c38bf018b66e054b44b2d87e459d18e48d66b13d130fa58d9fc8a4f21 SHA512 4080116da656d83f44c69c4f89b7e74855341db9b556d551fdc55941ba384b766ec0d1da75d3b6d6bfc4f77c1c16416dcd8bb46fa39a012c8a24c448fb511ae3 WHIRLPOOL ae0a015bc6168645fcdb26e64b8b9a92d99da24d787d0fde511b310398f2fd2e46913dd06e106860610e9a3fac22e3278e77cea56fb794acbf02a3f6805e048d
-AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
+AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qt-gui-4.8.4-r132.ebuild 7257 SHA256 588ac5b560dd1f21b40221d6593ff76b423bc095066c322d350138f52bc3f22a SHA512 c74b0ffcb66938255918f3fc714213de1b95b41f897bc0f0291ac16807820bcd561afda6fb2b613ead6a67481e9ece3e3a96b0570bbf75eebb38dd67ddb2ee14 WHIRLPOOL c61a9b2a8679cd4ff9b89f114668c84aa37edc30c37faa04e9421c23580dad9d08d3e2d74e6731f667f27399e8c1299a8590ee43e398ed1023a64f1be058e941
+EBUILD qtgui-4.8.4-r131.ebuild 7241 SHA256 0708e4735b10905fe4b9beee7913568fedc2a35c7181ed7d2af704928e9cb27b SHA512 d6812687110188e2cb58174e03443dcec4952258bee106cb54bf9c951a833753844876e9240c8f550926dd3ecd8371d96b976acc069361cca2d332e8acc4ea50 WHIRLPOOL 2a8595c3bbab88c9cecb59cd8832f9a15d7f9a5d98fd2c85180d1411d56dbf4eb24696f11b564a3b111f61e9a04f71b6e3d187d329a18ca1e9618a5532d5b3ac
diff --git a/x11-libs/qt-gui/files/CVE-2013-0254.patch b/dev-qt/qtgui/files/CVE-2013-0254.patch
index fa05da3..fa05da3 100644
--- a/x11-libs/qt-gui/files/CVE-2013-0254.patch
+++ b/dev-qt/qtgui/files/CVE-2013-0254.patch
diff --git a/x11-libs/qt-gui/files/qt-cxxflags.patch b/dev-qt/qtgui/files/qt-cxxflags.patch
index 2fa0ce6..2fa0ce6 100644
--- a/x11-libs/qt-gui/files/qt-cxxflags.patch
+++ b/dev-qt/qtgui/files/qt-cxxflags.patch
diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
index e0305e1..e0305e1 100644
--- a/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch
+++ b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4-r132.ebuild b/dev-qt/qtgui/qtgui-4.8.4-r131.ebuild
index 126101d..370bb92 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.4-r132.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.4-r131.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.11 2013/02/12 23:59:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild,v 1.1 2013/03/02 15:27:36 yngwin Exp $
 
 EAPI=4
 
@@ -27,8 +27,8 @@ RDEPEND="
 	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=]
+	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
+	~dev-qt/qtscript-${PV}[aqua=,debug=]
 	!aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
@@ -42,7 +42,7 @@ RDEPEND="
 		xv? ( x11-libs/libXv )
 	)
 	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
 	egl? ( media-libs/mesa[egl] )
 	gtkstyle? (
 		x11-libs/cairo[-qt4]
@@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
 		xv? ( x11-proto/videoproto )
 	)
 "
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-cups.patch"