use system sqlite, bug #344609

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 124 insertions, 15 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 5797e27a1c08..c3d4947fe176 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.108 2010/11/06 09:38:53 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.109 2010/11/09 10:06:26 wired Exp $
+
+*qt-webkit-4.7.0-r1 (09 Nov 2010)
+*qt-webkit-4.6.3-r2 (09 Nov 2010)
+
+  09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-webkit-4.6.3-r2.ebuild,
+  +qt-webkit-4.7.0-r1.ebuild:
+  use system sqlite, bug #344609
 
   06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-webkit-4.7.0.ebuild:
   removed alpha keyword from qt-4.7, bug #338289
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index ee887b36043b..8860cfced9df 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -22,24 +22,26 @@ EBUILD qt-webkit-4.5.3.ebuild 1114 RMD160 d082a0da6997d77e85577847ba07b7c8bd16f0
 EBUILD qt-webkit-4.6.2-r1.ebuild 1834 RMD160 a744c3e6994b14b627c1758cb970c27b3a7a2900 SHA1 d17b32907810cb311506b9cb1743f24e7f0f0642 SHA256 09e5b5efce9bbcb8f794499edf2b42dd43b85a3c785eb55192d9ceccdb3e92cd
 EBUILD qt-webkit-4.6.2.ebuild 1307 RMD160 b0557c3f485f08556e52cd515b838067a279a745 SHA1 866032e7172e5492058b6f7f280f59d9ca94fdf0 SHA256 ecf07706165ba3a995c8e219db47aaa21dfa35661c0205c8c6150bade1bbf203
 EBUILD qt-webkit-4.6.3-r1.ebuild 1453 RMD160 b5961b0b7bd9bda5023d064c8b0f485aa47f9d71 SHA1 ce71a537fb37f6c4cc69e13526919cb4bf6e63da SHA256 4d0587093297dafef015bb7c95b39b6cde2b40d923d69084daad5f1bc784b025
+EBUILD qt-webkit-4.6.3-r2.ebuild 1496 RMD160 12f0ea42627642f92562d949ebc56ffb8c8d8665 SHA1 921d390853b9585288c29e474952832acbc37e2a SHA256 5cb0710ed03bc451a92237b5484d7175c36adee1bddb45785bfe59cf134dcfa6
 EBUILD qt-webkit-4.6.3.ebuild 1398 RMD160 c31f8a8e75d3c31f30bb8270065f2d73e7cb0bc6 SHA1 d791d331712cd5ad36c8f163c03c93ad59fdbfe5 SHA256 a8b14425eefce7b94a9c35da280cd60070e73c0fb28cd82acce039c54345cc08
+EBUILD qt-webkit-4.7.0-r1.ebuild 1407 RMD160 d12655c4c745b7b8b422a206ecdb93e714ef002b SHA1 095e6c319fce6c60994cba6a363b71ffc459a9fc SHA256 d8c5a45dabef1b42a4250bfdf7b6cb6ad709f363a8e3e9a1e88c6fcb511a7874
 EBUILD qt-webkit-4.7.0.ebuild 1370 RMD160 1ebcc24b54da20d279794d1ef2884d2b228a2d13 SHA1 5406368f5b6fc623ea36734ed02d80346fa55a1d SHA256 c1a5433b9bbda0e500ba2e77b30c816d81b0fac8a5ae9d111b78e7b3e5c0aede
-MISC ChangeLog 15534 RMD160 59cae0f61a760a1a6e7bd1a70321d2ef7bba1d5c SHA1 1328683b7bbe58b300c99af48247b2d80aa07d8f SHA256 e348f5b754a3acaab35c93c6731fb50271363c851ac59193201aeefb500da41e
+MISC ChangeLog 15744 RMD160 073dc9472ef688b7bcd1066a2f9c035574fdfab5 SHA1 bdc0f1355c32a442c49cbac7cb03cc92e2a1f5a6 SHA256 6040463db9d1a1035962d6a6a57e13ca13de0be5b085e2899622265a02c293f5
 MISC metadata.xml 403 RMD160 2afea624f8c9b3dba9cd2aa884ce53cbe0df67de SHA1 e34dce4d6fae80aa1e5fecdcd5e039efa36992fb SHA256 e514fc0725be75bedd69c2115c22d6562a1a889594d736c0f708103e80d6ff57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM1SI5AAoJEDZF8K7rm0r6VX8QAKd0Z8Ml9IvMQ8MiLwnkmjTP
-h8c1TI4wpe+5My7cbJSF/phcazPt4VQPdjAv6FfvaWlrzzyeWXOQZa9rNxaoYXNW
-5EWiffDlEt1Oow55xkozlGPRBMQTUsuCifl+JqekR5rWhXdPXNd8DhTIkXy4o8P7
-VdizBQ/0pMQs0gsIdN5accHA92iACnG9ku4XcwKQGW7IvXMfXy7wl6R1Wxlt4Ad/
-UIGvdzpb1B0g1hoDOzVYuVqYkVt17QWcFuuV+warOKpsvgbIM3dCxwB/VV0fBEU2
-bCLnv12yvMSGU8noDZIBoXsIhXcfzrR7/ZXDY3+kRVwlFIdr1dIJnhf1lEzuYRbl
-QRRnvPzwR6wZzZ/IMmTEuMlxxsEqdqRowVdzhHpIwHjwZRLO5mr2zsXK593Jaovb
-xNVNNINJv6J5bubEkthbljA6hMyR7XPyefXZ2QvSsudOwFaxDx6ImchlgpdYfDBW
-qz/lxhJXagdLGnV5UtSqWAtmwTuLlOSJYMvMfH8930EeBAA9uZUGppZke04v2x4D
-qSl3koou5w2cPkQk5XkooR8MVtzTdTfEpBzsXPIs3DWHFqKX8BhLFo/Um0qOqa0K
-LE6tv4DJadTZupzh5WgR9Z/tismHAlFjFGKCUDscQyR4+Ern0DBgqvDI+zFLjy9F
-Ip8lKE0tv6yEUS540QmG
-=V2YM
+iQIcBAEBCAAGBQJM2R04AAoJEDZF8K7rm0r6DrQQAJV+GXR2BSxq8BybaFK0xsr/
+RpvSZt/P8cQa62S1S1SbFFbrhuXxRn1+A1hhTos2nqZ3X5cyCtnRJTefRq61KvOB
+nDddeBBIXrnXoK7fzWHPgCMAO0HZfhMIflQwUrsqSPTWVkT+yjZG/5tGQ7aXRrfj
+chYo+drIowggh3LF9SDIV7kCZe5hYZVapA7mjo+IOw8Zxc2dad7rBfdtbS799Dpm
+IuHYmtDBWVoVvQm1wnteMgBRR49pFakbNW3cvOvhcfemN7A8Cd6UCMwQAQ/gqg2t
+I/ubXB+iWc7zbTwGFHgfV5IjNEETUsbGPW3brx3R6VjPvyx6kgkw8L2MumIxwxV/
+1GjmXXjcnBSuoa14sU7suB0vhR8XU1M1W3tzIqJa8DNBcn41gSi+W+yR3o7eHX6B
+h/0AgWZMCcAh/CMxt7vvOIN0lLu5elwmIetTxmrBMy7yCHf/uQaphjeOWWxsZ83Z
+KieW0VD3M9UvP66AZd6rvAFJjeEBeOH3+B/ywwsh0qmD+p8lKZqNLZHEt+pTw0lD
+KcCtWcmdYWJz/G3hoV2Kc92j0XkTlN5IKWZJvT3ev3V0fab8N/4WDCJ4sj/T8m40
+jzeOH/kTYSLvFV45Q224XVAIbhKPBi5WMH1rxGT9a3XuYkGDFlwC3tpD/va9vKDa
+165FbOM7gRraAJOqpZso
+=OOhI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.3-r2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.3-r2.ebuild
new file mode 100644
index 000000000000..3000a69883fc
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.3-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 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.6.3-r2.ebuild,v 1.1 2010/11/09 10:06:26 wired Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="dbus kde"
+
+DEPEND="
+	dev-db/sqlite:3
+	~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
+	~x11-libs/qt-gui-${PV}[aqua=,dbus?,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=]
+		media-sound/phonon[aqua=] ) )
+	kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
+	"${FILESDIR}"/${P}-flash-plugin-segfault.patch
+)
+
+pkg_setup() {
+	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"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	myconf="${myconf} -webkit -system-sqlite $(qt_use dbus qdbus)"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-webkit/qt-webkit-4.7.0-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..bba78b8dfc00
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.7.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 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.7.0-r1.ebuild,v 1.1 2010/11/09 10:06:26 wired Exp $
+
+EAPI="3"
+inherit qt4-build
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="dbus kde"
+
+DEPEND="
+	dev-db/sqlite:3
+	~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
+	~x11-libs/qt-gui-${PV}[aqua=,dbus?,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=]
+		media-sound/phonon[aqua=] ) )
+	kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/3rdparty/webkit/JavaScriptCore
+		src/3rdparty/webkit/WebCore
+		tools/designer/src/plugins/qwebview"
+	QT4_EXTRACT_DIRECTORIES="
+		include/
+		src/
+		tools/"
+
+	QCONFIG_ADD="webkit"
+	QCONFIG_DEFINE="QT_WEBKIT"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	myconf="${myconf} -webkit -system-sqlite $(qt_use dbus qdbus)"
+	qt4-build_src_configure
+}