[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Markos Chandras]

commit:     2614e8ef420c2b177f429de41f0a4c7e5a2f0657
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 09:30:54 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 09:30:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2614e8ef

x11-libs/qt-webkit:Sync with portage ebuild

---
 x11-libs/qt-webkit/metadata.xml              |   10 ++++++--
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |   31 +++++++++++++++-----------
 x11-libs/qt-webkit/qt-webkit-4.9999.ebuild   |   31 +++++++++++++++-----------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 83269ba..411cdaa 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -3,8 +3,12 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name='exceptions'>Build with support for exceptions</flag>
-		<flag name='stable-branch'>Use the stable git branch - it is slightly behind
-			master but guaranteed by Nokia to compile</flag>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by Nokia)</flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde</flag>
+		<flag name="jit">Enable JavaScriptCore just-in-time compiler for faster JavaScript execution</flag>
+		<flag name="c++0x">Build Qt using the C++11 standard</flag>
+		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 338ec4c..4f48c26 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -3,7 +3,10 @@
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.4.ebuild,v 1.1 2011/09/08 09:22:47 wired Exp $
 
 EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+    QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The Webkit module for the Qt toolkit"
 SLOT="4"
@@ -12,17 +15,18 @@ if [[ ${PV} != 4*9999 ]]; then
 else
 	KEYWORDS=""
 fi
-IUSE="dbus +jit kde"
+IUSE="+gstreamer +jit"
 
 DEPEND="
 	dev-db/sqlite:3
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
 	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=]
 	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,dbus=,debug=]
-		media-libs/phonon[aqua=] ) )
-	kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] ) )"
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)"
 RDEPEND="${DEPEND}"
 
 if [[ ${PV} != 4*9999 ]]; then
@@ -45,22 +49,23 @@ pkg_setup() {
 	QCONFIG_ADD="webkit"
 	QCONFIG_DEFINE="QT_WEBKIT"
 
-	qt4-build-edge_pkg_setup
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 src_prepare() {
 	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
 	use c++0x && append-flags -fpermissive
-	sed -i -e "/Werror/d" "${S}/src/3rdparty/webkit/Source/WebKit.pri" || die
-	qt4-build-edge_src_prepare
+	sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \
+			src/3rdparty/webkit/Source/WebKit.pri || die
+	qt4-build${QT_ECLASS}_src_prepare
 }
 
 src_configure() {
 	# won't build with gcc 4.6 without this for now
 	myconf="${myconf}
-			-webkit -system-sqlite -no-gtkstyle
-			-D GST_DISABLE_DEPRECATED
+			-webkit -system-sqlite
 			$(qt_use jit javascript-jit)
-			$(qt_use dbus qdbus)"
-	qt4-build-edge_src_configure
+			-DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0)
+			-D GST_DISABLE_DEPRECATED"
+	qt4-build${QT_ECLASS}_src_configure
 }

diff --git a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
index 338ec4c..4f48c26 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
@@ -3,7 +3,10 @@
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.4.ebuild,v 1.1 2011/09/08 09:22:47 wired Exp $
 
 EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+    QT_ECLASS="-edge"
+fi
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The Webkit module for the Qt toolkit"
 SLOT="4"
@@ -12,17 +15,18 @@ if [[ ${PV} != 4*9999 ]]; then
 else
 	KEYWORDS=""
 fi
-IUSE="dbus +jit kde"
+IUSE="+gstreamer +jit"
 
 DEPEND="
 	dev-db/sqlite:3
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
 	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=]
 	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,dbus=,debug=]
-		media-libs/phonon[aqua=] ) )
-	kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] ) )"
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)"
 RDEPEND="${DEPEND}"
 
 if [[ ${PV} != 4*9999 ]]; then
@@ -45,22 +49,23 @@ pkg_setup() {
 	QCONFIG_ADD="webkit"
 	QCONFIG_DEFINE="QT_WEBKIT"
 
-	qt4-build-edge_pkg_setup
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 src_prepare() {
 	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
 	use c++0x && append-flags -fpermissive
-	sed -i -e "/Werror/d" "${S}/src/3rdparty/webkit/Source/WebKit.pri" || die
-	qt4-build-edge_src_prepare
+	sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \
+			src/3rdparty/webkit/Source/WebKit.pri || die
+	qt4-build${QT_ECLASS}_src_prepare
 }
 
 src_configure() {
 	# won't build with gcc 4.6 without this for now
 	myconf="${myconf}
-			-webkit -system-sqlite -no-gtkstyle
-			-D GST_DISABLE_DEPRECATED
+			-webkit -system-sqlite
 			$(qt_use jit javascript-jit)
-			$(qt_use dbus qdbus)"
-	qt4-build-edge_src_configure
+			-DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0)
+			-D GST_DISABLE_DEPRECATED"
+	qt4-build${QT_ECLASS}_src_configure
 }

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Markos Chandras]

commit:     897200f3143ab92eec98057067cf9eaa48523de4
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 09:41:45 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 09:41:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=897200f3

x11-libs/qt-webkit: Drop obsolete dbus use dependency

---
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |    2 +-
 x11-libs/qt-webkit/qt-webkit-4.9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 4f48c26..755ab1b 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -20,7 +20,7 @@ IUSE="+gstreamer +jit"
 DEPEND="
 	dev-db/sqlite:3
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
 	gstreamer? (
 		dev-libs/glib:2

diff --git a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
index 4f48c26..755ab1b 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
@@ -20,7 +20,7 @@ IUSE="+gstreamer +jit"
 DEPEND="
 	dev-db/sqlite:3
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
 	gstreamer? (
 		dev-libs/glib:2

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Michael Palimaka]

commit:     4e282764f611df84c498e9d7fcf25d4324f39a54
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Fri Apr 13 15:56:03 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Fri Apr 13 15:56:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4e282764

[x11-libs/qt-webkit] Fix patch name.

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index d0c597e..c5a1fe2 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
-	"${FILESDIR}/${P}+glib-2.31.patch"
+	"${FILESDIR}/${PN}-4.8.1+glib-2.31.patch"
 )
 
 pkg_setup() {

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Davide Pesavento]

commit:     26803611a164a60fd233e45c24a9ab2c3cd5de0b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 21 14:43:56 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 21 14:43:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=26803611

[x11-libs/qt-webkit] Block libxml2[icu] when USE=-icu, instead of forcing icu to be enabled.

Bug 411091 comment #9

(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index e1c3746..70be3aa 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -13,10 +13,9 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="+gstreamer +icu +jit"
-
-REQUIRED_USE="gstreamer? ( icu )" #407315
+IUSE="+gstreamer icu +jit"
 
+# For the libxml2[icu] blocker see bugs 407315 and 411091
 DEPEND="
 	dev-db/sqlite:3
 	x11-libs/libX11
@@ -28,6 +27,7 @@ DEPEND="
 		dev-libs/glib:2
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
+		!icu? ( !!dev-libs/libxml2[icu] )
 	)
 	icu? ( dev-libs/icu )
 "

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Davide Pesavento]

commit:     cd377027e279a732656f73b420b4515ab7b3acfb
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Jun  9 20:56:03 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 20:56:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cd377027

[x11-libs/qt-webkit:4] Sync with portage.

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 15d2954..50b4a10 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -15,7 +15,7 @@ else
 fi
 IUSE="+gstreamer icu +jit"
 
-# For the libxml2[icu] blocker see bugs 407315 and 411091
+# libxml2[!icu?] is needed for bugs 407315 and 411091
 DEPEND="
 	dev-db/sqlite:3
 	x11-libs/libX11
@@ -25,9 +25,9 @@ DEPEND="
 	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
 	gstreamer? (
 		dev-libs/glib:2
+		dev-libs/libxml2:2[!icu?]
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
-		!icu? ( !!dev-libs/libxml2[icu] )
 	)
 	icu? ( dev-libs/icu )
 "

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Davide Pesavento]

commit:     c9be4c6769ad58119eaaafae5dc7e461acad4518
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Dec 16 18:22:57 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 18:22:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c9be4c67

[qt-webkit:5] Initial ebuild for Qt5's QtWebKit module.

It probably won't work for you (yet).

Package-Manager: portage-2.2.0_alpha148

---
 x11-libs/qt-webkit/metadata.xml              |    1 +
 x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 62d0753..e7b0394 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<flag name="c++11">Build Qt using the C++11 standard</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>

diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
new file mode 100644
index 0000000..fa69851
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[debug=,icu]
+	~x11-libs/qt-gui-${PV}[debug=]
+	~x11-libs/qt-network-${PV}[debug=]
+	~x11-libs/qt-widgets-${PV}[debug=]
+"
+RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Davide Pesavento]

commit:     0516491aa96202a47acfbdb9843fc4a690a49a2b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Dec 24 08:29:35 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 08:29:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0516491a

[x11-libs/qt-webkit:5] Add some useflags and tons of missing deps.

Package-Manager: portage-2.2.0_alpha149

---
 x11-libs/qt-webkit/metadata.xml              |    7 +++
 x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild    |   52 +++++++++++++++++++++++---
 x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild |   52 +++++++++++++++++++++++---
 3 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index e7b0394..f9a3d24 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -7,6 +7,13 @@
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing</flag>
+		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>x11-libs/qt-multimedia</pkg></flag>
+		<flag name="qml">Build QML/QtQuick bindings</flag>
+		<flag name="webp">Add support for WebP image format</flag>
+		<flag name="widgets">Build various things that depend on <pkg>x11-libs/qt-widgets</pkg>,
+			e.g. the WebKitWidgets library</flag>
+		<flag name="xslt">Enable XSLT support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>

diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild
index fa69851..2b75432 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=5
 
-inherit qt5-build
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-any-r1 qt5-build
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 
@@ -14,12 +16,50 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE=""
+# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# FIXME: tons of automagic deps
+
+IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
 
-DEPEND="
+RDEPEND="
+	dev-db/sqlite
+	media-libs/fontconfig
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
 	~x11-libs/qt-core-${PV}[debug=,icu]
-	~x11-libs/qt-gui-${PV}[debug=]
+	~x11-libs/qt-gui-${PV}[accessibility=,debug=]
 	~x11-libs/qt-network-${PV}[debug=]
-	~x11-libs/qt-widgets-${PV}[debug=]
+	~x11-libs/qt-sql-${PV}[debug=]
+	gstreamer? (
+		dev-libs/glib:2
+		>=media-libs/gstreamer-0.10.30:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10
+	)
+	libxml2? ( dev-libs/libxml2 )
+	multimedia? ( ~x11-libs/qt-multimedia-${PV}[debug=] )
+	opengl? ( ~x11-libs/qt-opengl-${PV}[debug=] )
+	qml? ( ~x11-libs/qt-declarative-${PV}[debug=] )
+	udev? ( virtual/udev )
+	webp? ( media-libs/libwebp )
+	widgets? ( ~x11-libs/qt-widgets-${PV}[accessibility=,debug=] )
+	xslt? (
+		libxml2? ( dev-libs/libxslt )
+		!libxml2? ( ~x11-libs/qt-xmlpatterns-${PV}[debug=] )
+	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	qt5-build_pkg_setup
+}

diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
index fa69851..2b75432 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=5
 
-inherit qt5-build
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-any-r1 qt5-build
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 
@@ -14,12 +16,50 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE=""
+# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# FIXME: tons of automagic deps
+
+IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
 
-DEPEND="
+RDEPEND="
+	dev-db/sqlite
+	media-libs/fontconfig
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
 	~x11-libs/qt-core-${PV}[debug=,icu]
-	~x11-libs/qt-gui-${PV}[debug=]
+	~x11-libs/qt-gui-${PV}[accessibility=,debug=]
 	~x11-libs/qt-network-${PV}[debug=]
-	~x11-libs/qt-widgets-${PV}[debug=]
+	~x11-libs/qt-sql-${PV}[debug=]
+	gstreamer? (
+		dev-libs/glib:2
+		>=media-libs/gstreamer-0.10.30:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10
+	)
+	libxml2? ( dev-libs/libxml2 )
+	multimedia? ( ~x11-libs/qt-multimedia-${PV}[debug=] )
+	opengl? ( ~x11-libs/qt-opengl-${PV}[debug=] )
+	qml? ( ~x11-libs/qt-declarative-${PV}[debug=] )
+	udev? ( virtual/udev )
+	webp? ( media-libs/libwebp )
+	widgets? ( ~x11-libs/qt-widgets-${PV}[accessibility=,debug=] )
+	xslt? (
+		libxml2? ( dev-libs/libxslt )
+		!libxml2? ( ~x11-libs/qt-xmlpatterns-${PV}[debug=] )
+	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	qt5-build_pkg_setup
+}

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Davide Pesavento]

commit:     7d1cbeb23f4e876b1055bb487b564107432c60b0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jan  2 08:24:19 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 08:24:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7d1cbeb2

[x11-libs/qt-webkit:5] Add ebuild for 'dev' branch.

Package-Manager: portage-2.2.0_alpha149

---
 x11-libs/qt-webkit/qt-webkit-5.9999.ebuild |   65 ++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
new file mode 100644
index 0000000..0482361
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# FIXME: tons of automagic deps
+
+IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+
+RDEPEND="
+	dev-db/sqlite
+	media-libs/fontconfig
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	~x11-libs/qt-core-${PV}[debug=,icu]
+	~x11-libs/qt-gui-${PV}[accessibility=,debug=]
+	~x11-libs/qt-network-${PV}[debug=]
+	~x11-libs/qt-sql-${PV}[debug=]
+	gstreamer? (
+		dev-libs/glib:2
+		>=media-libs/gstreamer-0.10.30:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10
+	)
+	libxml2? ( dev-libs/libxml2 )
+	multimedia? ( ~x11-libs/qt-multimedia-${PV}[debug=] )
+	opengl? ( ~x11-libs/qt-opengl-${PV}[debug=] )
+	qml? ( ~x11-libs/qt-declarative-${PV}[debug=] )
+	udev? ( virtual/udev )
+	webp? ( media-libs/libwebp )
+	widgets? ( ~x11-libs/qt-widgets-${PV}[accessibility=,debug=] )
+	xslt? (
+		libxml2? ( dev-libs/libxslt )
+		!libxml2? ( ~x11-libs/qt-xmlpatterns-${PV}[debug=] )
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	qt5-build_pkg_setup
+}

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Michael Palimaka]

commit:     a189c7a261134052fa289da3f1123d6eeb0d13df
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  3 15:57:45 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 15:57:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a189c7a2

[x11-libs/qt-webkit] Use subslots for automatic icu rebuild.

Package-Manager: portage-2.1.11.38

---
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index f7857f5..ff0a6fe 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit qt4-build flag-o-matic
 
@@ -29,7 +29,7 @@ DEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 "
 RDEPEND="${DEPEND}"
 

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-webkit/

[Michael Palimaka]

commit:     674be3d6eec5c05159e39e62556c0c7b00810f24
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 29 18:00:22 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 18:00:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=674be3d6

[x11-libs/qt-webkit] Add media-libs/libpng subslot dependency.

Package-Manager: portage-2.1.11.50

---
 x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild    |    2 +-
 x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild |    2 +-
 x11-libs/qt-webkit/qt-webkit-5.9999.ebuild   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild
index 0482361..c53f2df 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.0.ebuild
@@ -24,7 +24,7 @@ IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets x
 RDEPEND="
 	dev-db/sqlite
 	media-libs/fontconfig
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/opengl

diff --git a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
index 0482361..c53f2df 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.0.9999.ebuild
@@ -24,7 +24,7 @@ IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets x
 RDEPEND="
 	dev-db/sqlite
 	media-libs/fontconfig
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/opengl

diff --git a/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
index 0482361..c53f2df 100644
--- a/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-5.9999.ebuild
@@ -24,7 +24,7 @@ IUSE="+accessibility gstreamer libxml2 multimedia opengl qml udev webp widgets x
 RDEPEND="
 	dev-db/sqlite
 	media-libs/fontconfig
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/opengl