bumped x11-libs/qt-webkit to latest ~ (4.5.2)

6 files changed, 70 insertions, 9 deletions

diff --git a/metadata/cache/x11-libs/qt-webkit-4.4.2 b/metadata/cache/x11-libs/qt-webkit-4.4.2
index 121eba16b..9fc98ec6a 100644
--- a/metadata/cache/x11-libs/qt-webkit-4.4.2
+++ b/metadata/cache/x11-libs/qt-webkit-4.4.2
@@ -1,14 +1,14 @@
 ~x11-libs/qt-gui-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 sys-apps/abi-wrapper
-~x11-libs/qt-gui-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 sys-apps/abi-wrapper
+~x11-libs/qt-gui-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 !<x11-libs/qt-assistant-4.4.2 !>x11-libs/qt-assistant-4.4.2-r9999 !<x11-libs/qt-core-4.4.2 !>x11-libs/qt-core-4.4.2-r9999 !<x11-libs/qt-dbus-4.4.2 !>x11-libs/qt-dbus-4.4.2-r9999 !<x11-libs/qt-demo-4.4.2 !>x11-libs/qt-demo-4.4.2-r9999 !<x11-libs/qt-gui-4.4.2 !>x11-libs/qt-gui-4.4.2-r9999 !<x11-libs/qt-opengl-4.4.2 !>x11-libs/qt-opengl-4.4.2-r9999 !<x11-libs/qt-phonon-4.4.2 !>x11-libs/qt-phonon-4.4.2-r9999 !<x11-libs/qt-qt3support-4.4.2 !>x11-libs/qt-qt3support-4.4.2-r9999 !<x11-libs/qt-script-4.4.2 !>x11-libs/qt-script-4.4.2-r9999 !<x11-libs/qt-sql-4.4.2 !>x11-libs/qt-sql-4.4.2-r9999 !<x11-libs/qt-svg-4.4.2 !>x11-libs/qt-svg-4.4.2-r9999 !<x11-libs/qt-test-4.4.2 !>x11-libs/qt-test-4.4.2-r9999 !<x11-libs/qt-webkit-4.4.2 !>x11-libs/qt-webkit-4.4.2-r9999 !<x11-libs/qt-xmlpatterns-4.4.2 !>x11-libs/qt-xmlpatterns-4.4.2-r9999 sys-apps/abi-wrapper
 4
-http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.4.2.tar.bz2 mirror://gentoo/qt-x11-opensource-src-4.4.2-headers.tar.bz2
+http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.4.2.tar.bz2 mirror://gentoo/qt-x11-opensource-src-4.4.2-headers.tar.bz2
 
 http://www.trolltech.com/
 || ( GPL-3 GPL-2 )
 The Webkit module for the Qt toolkit.
 alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86
 base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
-custom-cxxflags debug pch lib32
+debug pch lib32
 
 
 
diff --git a/metadata/cache/x11-libs/qt-webkit-4.4.2-r1 b/metadata/cache/x11-libs/qt-webkit-4.4.2-r1
index 121eba16b..9fc98ec6a 100644
--- a/metadata/cache/x11-libs/qt-webkit-4.4.2-r1
+++ b/metadata/cache/x11-libs/qt-webkit-4.4.2-r1
@@ -1,14 +1,14 @@
 ~x11-libs/qt-gui-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 sys-apps/abi-wrapper
-~x11-libs/qt-gui-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 sys-apps/abi-wrapper
+~x11-libs/qt-gui-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 !<x11-libs/qt-assistant-4.4.2 !>x11-libs/qt-assistant-4.4.2-r9999 !<x11-libs/qt-core-4.4.2 !>x11-libs/qt-core-4.4.2-r9999 !<x11-libs/qt-dbus-4.4.2 !>x11-libs/qt-dbus-4.4.2-r9999 !<x11-libs/qt-demo-4.4.2 !>x11-libs/qt-demo-4.4.2-r9999 !<x11-libs/qt-gui-4.4.2 !>x11-libs/qt-gui-4.4.2-r9999 !<x11-libs/qt-opengl-4.4.2 !>x11-libs/qt-opengl-4.4.2-r9999 !<x11-libs/qt-phonon-4.4.2 !>x11-libs/qt-phonon-4.4.2-r9999 !<x11-libs/qt-qt3support-4.4.2 !>x11-libs/qt-qt3support-4.4.2-r9999 !<x11-libs/qt-script-4.4.2 !>x11-libs/qt-script-4.4.2-r9999 !<x11-libs/qt-sql-4.4.2 !>x11-libs/qt-sql-4.4.2-r9999 !<x11-libs/qt-svg-4.4.2 !>x11-libs/qt-svg-4.4.2-r9999 !<x11-libs/qt-test-4.4.2 !>x11-libs/qt-test-4.4.2-r9999 !<x11-libs/qt-webkit-4.4.2 !>x11-libs/qt-webkit-4.4.2-r9999 !<x11-libs/qt-xmlpatterns-4.4.2 !>x11-libs/qt-xmlpatterns-4.4.2-r9999 sys-apps/abi-wrapper
 4
-http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.4.2.tar.bz2 mirror://gentoo/qt-x11-opensource-src-4.4.2-headers.tar.bz2
+http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.4.2.tar.bz2 mirror://gentoo/qt-x11-opensource-src-4.4.2-headers.tar.bz2
 
 http://www.trolltech.com/
 || ( GPL-3 GPL-2 )
 The Webkit module for the Qt toolkit.
 alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86
 base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
-custom-cxxflags debug pch lib32
+debug pch lib32
 
 
 
diff --git a/metadata/cache/x11-libs/qt-webkit-4.5.1 b/metadata/cache/x11-libs/qt-webkit-4.5.1
index cd41896f5..abd00a828 100644
--- a/metadata/cache/x11-libs/qt-webkit-4.5.1
+++ b/metadata/cache/x11-libs/qt-webkit-4.5.1
@@ -1,14 +1,14 @@
 ~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
-~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
+~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) !<x11-libs/qt-assistant-4.5.1 !>x11-libs/qt-assistant-4.5.1-r9999 !<x11-libs/qt-core-4.5.1 !>x11-libs/qt-core-4.5.1-r9999 !<x11-libs/qt-dbus-4.5.1 !>x11-libs/qt-dbus-4.5.1-r9999 !<x11-libs/qt-demo-4.5.1 !>x11-libs/qt-demo-4.5.1-r9999 !<x11-libs/qt-gui-4.5.1 !>x11-libs/qt-gui-4.5.1-r9999 !<x11-libs/qt-opengl-4.5.1 !>x11-libs/qt-opengl-4.5.1-r9999 !<x11-libs/qt-phonon-4.5.1 !>x11-libs/qt-phonon-4.5.1-r9999 !<x11-libs/qt-qt3support-4.5.1 !>x11-libs/qt-qt3support-4.5.1-r9999 !<x11-libs/qt-script-4.5.1 !>x11-libs/qt-script-4.5.1-r9999 !<x11-libs/qt-sql-4.5.1 !>x11-libs/qt-sql-4.5.1-r9999 !<x11-libs/qt-svg-4.5.1 !>x11-libs/qt-svg-4.5.1-r9999 !<x11-libs/qt-test-4.5.1 !>x11-libs/qt-test-4.5.1-r9999 !<x11-libs/qt-webkit-4.5.1 !>x11-libs/qt-webkit-4.5.1-r9999 !<x11-libs/qt-xmlpatterns-4.5.1 !>x11-libs/qt-xmlpatterns-4.5.1-r9999 sys-apps/abi-wrapper
 4
-http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2
+http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2
 
 http://www.qtsoftware.com/
 || ( LGPL-2.1 GPL-3 )
 The Webkit module for the Qt toolkit
 ~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 -sparc x86 ~x86-fbsd
 base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
-kde custom-cxxflags debug pch lib32
+kde debug pch lib32
 
 
 
diff --git a/metadata/cache/x11-libs/qt-webkit-4.5.2 b/metadata/cache/x11-libs/qt-webkit-4.5.2
new file mode 100644
index 000000000..329f3c8cd
--- /dev/null
+++ b/metadata/cache/x11-libs/qt-webkit-4.5.2
@@ -0,0 +1,22 @@
+~x11-libs/qt-core-4.5.2[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.2[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.2:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
+~x11-libs/qt-core-4.5.2[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.2[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.2:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) !<x11-libs/qt-assistant-4.5.2 !>x11-libs/qt-assistant-4.5.2-r9999 !<x11-libs/qt-core-4.5.2 !>x11-libs/qt-core-4.5.2-r9999 !<x11-libs/qt-dbus-4.5.2 !>x11-libs/qt-dbus-4.5.2-r9999 !<x11-libs/qt-demo-4.5.2 !>x11-libs/qt-demo-4.5.2-r9999 !<x11-libs/qt-gui-4.5.2 !>x11-libs/qt-gui-4.5.2-r9999 !<x11-libs/qt-opengl-4.5.2 !>x11-libs/qt-opengl-4.5.2-r9999 !<x11-libs/qt-phonon-4.5.2 !>x11-libs/qt-phonon-4.5.2-r9999 !<x11-libs/qt-qt3support-4.5.2 !>x11-libs/qt-qt3support-4.5.2-r9999 !<x11-libs/qt-script-4.5.2 !>x11-libs/qt-script-4.5.2-r9999 !<x11-libs/qt-sql-4.5.2 !>x11-libs/qt-sql-4.5.2-r9999 !<x11-libs/qt-svg-4.5.2 !>x11-libs/qt-svg-4.5.2-r9999 !<x11-libs/qt-test-4.5.2 !>x11-libs/qt-test-4.5.2-r9999 !<x11-libs/qt-webkit-4.5.2 !>x11-libs/qt-webkit-4.5.2-r9999 !<x11-libs/qt-xmlpatterns-4.5.2 !>x11-libs/qt-xmlpatterns-4.5.2-r9999 sys-apps/abi-wrapper
+4
+http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.2.tar.bz2
+
+http://www.qtsoftware.com/
+|| ( LGPL-2.1 GPL-3 )
+The Webkit module for the Qt toolkit
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
+base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
+kde debug pch lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 38413ff00..7e093bd7e 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -2,6 +2,8 @@ AUX 0249-webkit-stale-frame-pointer.diff 4812 RMD160 aea505ff0783ba34a68dff4e996
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75
+DIST qt-x11-opensource-src-4.5.2.tar.bz2 116015284 RMD160 1af31d7fe66665e718f0c728b41becea9996fba7 SHA1 bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b SHA256 d26d94c9cb90dfe16a13b39ac7157f66ec9f5fbbf9d7faa57f7466157721f836
 EBUILD qt-webkit-4.4.2-r1.ebuild 1322 RMD160 356395a647b4bbd7fd495de3c50775642cb2785a SHA1 aee491666f3e8d487862f0b52c5b60d6457142d9 SHA256 fa473e7b57bb17ce1daa30523decb5b243eef930b14c8ed8f7d1d76c1fcdbf8b
 EBUILD qt-webkit-4.4.2.ebuild 1154 RMD160 3ade3fee640b29fba62a61ba58e904f77a1c46f8 SHA1 77867d83ebbbcefa1474e5183286a2f0db331566 SHA256 47d2890ca92be3afa505b44b494bfb9207995bba829d58fd1f58ae2836680170
 EBUILD qt-webkit-4.5.1.ebuild 1170 RMD160 fd095e62703d3458888e32645b63e6fa52888b21 SHA1 4798abc92a141de3bf18e5d042adaffcba703bac SHA256 c132748575b691a9c07a482160e2fc0a03ca661ea39bd6efcbd44e8bc234e26f
+EBUILD qt-webkit-4.5.2.ebuild 1173 RMD160 ecd1c796f462640728dd89d59207d4906ec984d6 SHA1 3aa466e83ba630cafdcf7ff3ba1641458a11fcda SHA256 c94e89cb9577c25d7b29b98044c9fb257a3fd16765183f30948bb7fec9e5ec60
diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.2.ebuild
new file mode 100644
index 000000000..a28b86b8d
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.2.ebuild,v 1.1 2009/06/27 19:23:40 yngwin Exp $
+
+EAPI="2"
+inherit qt4-build multilib-native
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl,lib32?]
+	~x11-libs/qt-gui-${PV}[debug=,lib32?]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=,lib32?] media-sound/phonon[lib32?] ) )
+	kde? ( media-sound/phonon[lib32?] )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/"
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+multilib-native_src_prepare_internal() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	qt4-build_src_prepare
+}
+
+multilib-native_src_configure_internal() {
+	# This fixes relocation overflows on alpha
+	use alpha && append-ldflags "-Wl,--no-relax"
+	myconf="${myconf} -webkit"
+	qt4-build_src_configure
+}