[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2021-05-24 Thread Andreas Sturmlechner 
commit: 6b07c637679d2fda1a970c222bce541b12ddd280
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 24 08:55:51 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 24 08:57:03 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6b07c637

dev-qt/qtwebkit: Remove unmaintained package

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/metadata.xml   |  26 -
 dev-qt/qtwebkit/qtwebkit-5.212..ebuild | 146 -
 2 files changed, 172 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
deleted file mode 100644
index 05f4bb98..
--- a/dev-qt/qtwebkit/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   q...@gentoo.org
-   Gentoo Qt Project
-   
-   
-   Enable physical position determination 
via dev-qt/qtpositioning
-   Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 1.0
-   Enable hyphenation support via 
dev-libs/hyphen
-   Enable HTML5 audio/video support via 
dev-qt/qtmultimedia
-   Enable device orientation detection 
via dev-qt/qtsensors
-   Enable printing via 
dev-qt/qtprintsupport
-   Build QML/QtQuick bindings
-   
-   
-   https://bugreports.qt.io/
-   https://doc.qt.io/
-   
-   
-   
-   Must only be used by packages that are known to use 
private parts of the Qt API.
-   
-   
-

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
deleted file mode 100644
index de532e08..
--- a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = * ]]; then
-   EGIT_BRANCH="qtwebkit-5.212"
-   EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git;
-   inherit git-r3
-else
-   MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over 
previous snapshot
-   
SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-   S="${WORKDIR}/${MY_P}"
-fi
-PYTHON_COMPAT=( python3_{6,7,8} )
-USE_RUBY="ruby25 ruby26 ruby27"
-inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single 
toolchain-funcs
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-HOMEPAGE="https://www.qt.io/;
-
-LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin 
opengl orientation +printsupport qml webp X"
-
-REQUIRED_USE="
-   nsplugin? ( X )
-   qml? ( opengl )
-   ?? ( gstreamer multimedia )
-"
-
-# Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.12.3:5"
-BDEPEND="
-   ${PYTHON_DEPS}
-   ${RUBY_DEPS}
-   dev-lang/perl
-   dev-util/gperf
-   >=sys-devel/bison-2.4.3
-   sys-devel/flex
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-db/sqlite:3
-   dev-libs/icu:=
-   dev-libs/libxml2
-   dev-libs/libxslt
-   >=dev-qt/qtcore-${QT_MIN_VER}
-   >=dev-qt/qtgui-${QT_MIN_VER}
-   >=dev-qt/qtnetwork-${QT_MIN_VER}
-   >=dev-qt/qtwidgets-${QT_MIN_VER}=
-   media-libs/libpng:0=
-   media-libs/woff2
-   virtual/jpeg:0
-   geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-   gstreamer? (
-   dev-libs/glib:2
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-bad:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   hyphen? ( dev-libs/hyphen )
-   multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-   opengl? (
-   >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=]
-   >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=]
-   )
-   orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
-   printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
-   qml? (
-   >=dev-qt/qtdeclarative-${QT_MIN_VER}
-   >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
-   )
-   webp? ( media-libs/libwebp:= )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXrender
-   )
-"
-RDEPEND="${DEPEND}"
-
-CHECKREQS_DISK_BUILD="16G" # bug 417307
-
-_check_reqs() {
-   if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq 
"-g*0"; then
-   einfo "Checking for sufficient disk space to build ${PN} with 
debugging flags"
-   check-reqs_$1
-   fi
-}
-
-pkg_pretend() {
-   _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-   _check_reqs pkg_setup
-   python-any-r1_pkg_setup
-}
-
-src_configure() {
-   #

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtquicktimeline/

2020-09-10 Thread Andreas Sturmlechner 
commit: 4cea62064b1cc01a4fc589daeae31f4ebb60fc1b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep  9 19:31:04 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 10 17:49:05 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4cea6206

dev-qt: Sync KEYWORDS with Gentoo ebuild repo

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtquicktimeline/qtquicktimeline-5.15..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.212..ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15..ebuild 
b/dev-qt/qtquicktimeline/qtquicktimeline-5.15..ebuild
index cc510e9f..bf8d344f 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15..ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DEPEND="

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
index 6ad3b1f4..de532e08 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then
 else
MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over 
previous snapshot

SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
S="${WORKDIR}/${MY_P}"
 fi
 PYTHON_COMPAT=( python3_{6,7,8} )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-04-03 Thread Andreas Sturmlechner 
commit: 2b51c8360e875feff63ab5b961fc55e5ac8541e4
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sat Nov 23 09:48:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  2 18:09:22 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2b51c836

dev-qt/qtwebkit: rename USE=gles2 to USE=gles2-only

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/metadata.xml   | 1 -
 dev-qt/qtwebkit/qtwebkit-5.212..ebuild | 6 +++---
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 34279405..05f4bb98 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,7 +7,6 @@


Enable physical position determination 
via dev-qt/qtpositioning
-   Use GLES 2.0 or later instead of full 
OpenGL
Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 1.0
Enable hyphenation support via 
dev-libs/hyphen
Enable HTML5 audio/video support via 
dev-qt/qtmultimedia

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
index 406b871d..6ad3b1f4 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qt.io/;
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl 
orientation +printsupport qml webp X"
+IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin 
opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
nsplugin? ( X )
@@ -63,8 +63,8 @@ DEPEND="
hyphen? ( dev-libs/hyphen )
multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
-   >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-   >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+   >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=]
+   >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=]
)
orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 718b65f0..486762e5 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.qt.io/;
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5."
-IUSE="crypt geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin 
opengl orientation +printsupport qml webp X"
+IUSE="crypt geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin 
opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
nsplugin? ( X )
@@ -65,8 +65,8 @@ DEPEND="
hyphen? ( dev-libs/hyphen )
multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
-   >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-   >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+   >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=]
+   >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=]
)
orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-03-11 Thread Andreas Sturmlechner 
commit: 69df5ab4c93c892fa5dea9758dc3db7fc39c2a7c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 11 17:04:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 11 17:04:34 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=69df5ab4

dev-qt/qtwebkit: alpha4 switched to python3 for build

Bug: https://bugs.gentoo.org/698990
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/qtwebkit-5.212..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
index 334ad5b4..406b871d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
@@ -8,12 +8,12 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git;
inherit git-r3
 else
-   MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over 
previous snapshot
+   MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over 
previous snapshot

SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}/${MY_P}"
 fi
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 USE_RUBY="ruby25 ruby26 ruby27"
 inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single 
toolchain-funcs

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-01-14 Thread Andreas Sturmlechner 
commit: c3e33b90476849d7f3d6f0a78282600627c1da52
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 14 22:54:54 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 14 22:54:54 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c3e33b90

dev-qt/qtwebkit: Add ruby27 to 5.212 stable branch

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/qtwebkit-5.212..ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
index 4ceacc90..334ad5b4 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
@@ -14,7 +14,7 @@ else
S="${WORKDIR}/${MY_P}"
 fi
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single 
toolchain-funcs
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -124,7 +124,9 @@ src_configure() {
-DENABLE_X11_TARGET=$(usex X)
)
 
-   if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
+   if has_version "virtual/rubygems[ruby_targets_ruby27]"; then
+   mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) )
+   elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
else
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-01-04 Thread Andreas Sturmlechner 
commit: eafb6ecc79ab7095189a3b0f0fda09860b1bff36
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  4 11:45:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  4 12:04:55 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=eafb6ecc

dev-qt/qtwebkit: ENABLE_WEBKIT2 -> ENABLE_WEBKIT

Upstream commit b7b428a5329c8e52685c1118b9662c0bbe4ba73f

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/qtwebkit-5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 6123926f..4b0e7392 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -116,7 +116,7 @@ src_configure() {
-DENABLE_OPENGL=$(usex opengl)
-DENABLE_PRINT_SUPPORT=$(usex printsupport)
-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
-   -DENABLE_WEBKIT2=$(usex qml)
+   -DENABLE_WEBKIT=$(usex qml)
$(cmake_use_find_package webp WebP)
-DENABLE_X11_TARGET=$(usex X)
)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-01-04 Thread Andreas Sturmlechner 
commit: 217c3267dc2547fdde844725f817eafda75dd8a6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  4 12:04:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  4 12:04:55 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=217c3267

dev-qt/qtwebkit: Unconditionally depend on media-libs/woff2

Upstream commit ee081058011c5a616b98671e932aedd7a50cb7fb

Bug: https://bugs.gentoo.org/704748
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/qtwebkit-5.212..ebuild | 3 ++-
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
index 66bd087c..4ceacc90 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,6 +51,7 @@ DEPEND="
>=dev-qt/qtnetwork-${QT_MIN_VER}
>=dev-qt/qtwidgets-${QT_MIN_VER}=
media-libs/libpng:0=
+   media-libs/woff2
virtual/jpeg:0
geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 5b644879..718b65f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -49,6 +49,7 @@ DEPEND="
>=dev-qt/qtnetwork-${QT_MIN_VER}
>=dev-qt/qtwidgets-${QT_MIN_VER}=
media-libs/libpng:0=
+   media-libs/woff2
virtual/jpeg:0
crypt? (
dev-libs/libgcrypt:=

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-01-04 Thread Andreas Sturmlechner 
commit: 847f1585a70a5b5e2cfbe70dbe0b21bf806907b3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  4 11:54:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  4 12:04:55 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=847f1585

dev-qt/qtwebkit: Add USE crypt

Upstream commit 3b36f59d3160d81e3ca2f0d498f77b7d55b02652

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/qtwebkit-5..ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 4b0e7392..5b644879 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.qt.io/;
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5."
-IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl 
orientation +printsupport qml webp X"
+IUSE="crypt geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin 
opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
nsplugin? ( X )
@@ -50,6 +50,10 @@ DEPEND="
>=dev-qt/qtwidgets-${QT_MIN_VER}=
media-libs/libpng:0=
virtual/jpeg:0
+   crypt? (
+   dev-libs/libgcrypt:=
+   dev-libs/libtasn1:=
+   )
geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (
dev-libs/glib:2
@@ -107,6 +111,7 @@ src_configure() {
-DPORT=Qt
-DENABLE_API_TESTS=OFF
-DENABLE_TOOLS=OFF
+   -DENABLE_WEB_CRYPTO=$(usex crypt)
-DENABLE_GEOLOCATION=$(usex geolocation)
-DUSE_GSTREAMER=$(usex gstreamer)
-DUSE_LIBHYPHEN=$(usex hyphen)

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2020-01-04 Thread Andreas Sturmlechner 
commit: 02a94ae03dfe1575709b4de66c26c0502b0e6b4b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  4 10:37:31 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  4 12:04:51 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=02a94ae0

dev-qt/qtwebkit: Add python3* and ruby27 support

Bug: https://bugs.gentoo.org/698990
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/qtwebkit-5..ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 5cfb0ac6..6123926f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,8 @@ else

SRC_URI="https://github.com/annulen/webkit/releases/download/${P}/${P}.tar.xz;
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby25 ruby26"
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby25 ruby26 ruby27"
 inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single 
toolchain-funcs
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -121,7 +121,9 @@ src_configure() {
-DENABLE_X11_TARGET=$(usex X)
)
 
-   if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
+   if has_version "virtual/rubygems[ruby_targets_ruby27]"; then
+   mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) )
+   elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
else
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2019-10-23 Thread Andreas Sturmlechner 
commit: f3f5d091ba0372fd683b43a06e62c48983b3df60
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 22 20:10:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 23 06:35:15 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f3f5d091

dev-qt/qtwebkit: Re-add live ebuilds (stable branch and -dev)

Development was picked up again, albeit on different locations.

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/Manifest   |  1 -
 ...e20190629.ebuild => qtwebkit-5.212..ebuild} | 23 --
 ...0_pre20190629.ebuild => qtwebkit-5..ebuild} | 23 +++---
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
deleted file mode 100644
index eaf27bbb..
--- a/dev-qt/qtwebkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 
1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d
 SHA512 
38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
similarity index 88%
copy from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
copy to dev-qt/qtwebkit/qtwebkit-5.212..ebuild
index ce0302f9..b6972c0a 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212..ebuild
@@ -3,18 +3,25 @@
 
 EAPI=7
 
+if [[ ${PV} = * ]]; then
+   EGIT_BRANCH="qtwebkit-5.212"
+   EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git;
+   inherit git-r3
+else
+   MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over 
previous snapshot
+   
SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   S="${WORKDIR}/${MY_P}"
+fi
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24 ruby25 ruby26"
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous 
snapshot
+USE_RUBY="ruby25 ruby26"
 inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils 
ruby-single toolchain-funcs
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 HOMEPAGE="https://www.qt.io/;
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl 
orientation +printsupport qml webp X"
 
 REQUIRED_USE="
@@ -24,7 +31,7 @@ REQUIRED_USE="
 "
 
 # Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
+QT_MIN_VER="5.12.3:5"
 BDEPEND="
${PYTHON_DEPS}
${RUBY_DEPS}
@@ -73,8 +80,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
 _check_reqs() {
@@ -120,10 +125,8 @@ src_configure() {
 
if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
-   elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then
-   mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
else
-   mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+   mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
fi
 
cmake-utils_src_configure

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
similarity index 88%
rename from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
rename to dev-qt/qtwebkit/qtwebkit-5..ebuild
index ce0302f9..307335c3 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -3,18 +3,23 @@
 
 EAPI=7
 
+if [[ ${PV} = * ]]; then
+   EGIT_BRANCH="qtwebkit-dev"
+   EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git;
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24 ruby25 ruby26"
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous 
snapshot
+USE_RUBY="ruby25 ruby26"
 inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils 
ruby-single toolchain-funcs
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 HOMEPAGE="https://www.qt.io/;
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
 
 LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+SLOT="5/"
 IUSE="geolocation

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2019-07-06 Thread Andreas Sturmlechner 
commit: b85921e28a39466ec5cd12c167b58f1c115b9390
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  6 07:59:01 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul  6 10:26:44 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b85921e2

dev-qt/qtwebkit: Add 5.212.0_pre20190629 aka alpha3 for testing, EAPI-7

Bug: https://bugs.gentoo.org/689224
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/Manifest   |   1 +
 dev-qt/qtwebkit/metadata.xml   |  27 
 .../qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild   | 140 +
 3 files changed, 168 insertions(+)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
new file mode 100644
index ..eaf27bbb
--- /dev/null
+++ b/dev-qt/qtwebkit/Manifest
@@ -0,0 +1 @@
+DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 
1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d
 SHA512 
38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
new file mode 100644
index ..34279405
--- /dev/null
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -0,0 +1,27 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   q...@gentoo.org
+   Gentoo Qt Project
+   
+   
+   Enable physical position determination 
via dev-qt/qtpositioning
+   Use GLES 2.0 or later instead of full 
OpenGL
+   Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 1.0
+   Enable hyphenation support via 
dev-libs/hyphen
+   Enable HTML5 audio/video support via 
dev-qt/qtmultimedia
+   Enable device orientation detection 
via dev-qt/qtsensors
+   Enable printing via 
dev-qt/qtprintsupport
+   Build QML/QtQuick bindings
+   
+   
+   https://bugreports.qt.io/
+   https://doc.qt.io/
+   
+   
+   
+   Must only be used by packages that are known to use 
private parts of the Qt API.
+   
+   
+

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
new file mode 100644
index ..ce0302f9
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby24 ruby25 ruby26"
+MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous 
snapshot
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils 
ruby-single toolchain-funcs
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+HOMEPAGE="https://www.qt.io/;
+SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
+
+LICENSE="BSD LGPL-2+"
+SLOT="5/5.212"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl 
orientation +printsupport qml webp X"
+
+REQUIRED_USE="
+   nsplugin? ( X )
+   qml? ( opengl )
+   ?? ( gstreamer multimedia )
+"
+
+# Dependencies found at Source/cmake/OptionsQt.cmake
+QT_MIN_VER="5.9.1:5"
+BDEPEND="
+   ${PYTHON_DEPS}
+   ${RUBY_DEPS}
+   dev-lang/perl
+   dev-util/gperf
+   >=sys-devel/bison-2.4.3
+   sys-devel/flex
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-db/sqlite:3
+   dev-libs/icu:=
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=dev-qt/qtcore-${QT_MIN_VER}
+   >=dev-qt/qtgui-${QT_MIN_VER}
+   >=dev-qt/qtnetwork-${QT_MIN_VER}
+   >=dev-qt/qtwidgets-${QT_MIN_VER}=
+   media-libs/libpng:0=
+   virtual/jpeg:0
+   geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+   gstreamer? (
+   dev-libs/glib:2
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-bad:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   hyphen? ( dev-libs/hyphen )
+   multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
+   opengl? (
+   >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+   >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+   )
+   orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+   printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+   qml? (
+   >=dev-qt/qtdeclarative-${QT_MIN_VER}
+   >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
+   )
+   webp? ( media-libs/libwebp:= )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXcomposite
+

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2018-12-06 Thread Andreas Sturmlechner 
commit: cda396ca2d422a89785b7abe1ac924339ff59d55
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 16:00:36 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec  6 19:44:08 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cda396ca

dev-qt/qtwebkit: Drop live ebuilds

Upstream repositories appear dead.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtwebkit-5.4.2-system-leveldb.patch  |  25 -
 .../files/qtwebkit-5.5.1-disable-jit.patch |  15 ---
 .../files/qtwebkit-5.8.0-disable-gstreamer.patch   |  15 ---
 dev-qt/qtwebkit/metadata.xml   |  28 -
 dev-qt/qtwebkit/qtwebkit-5.12..ebuild  | 120 -
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild   | 120 -
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 120 -
 7 files changed, 443 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
deleted file mode 100644
index 265d5075..
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct header location so system dev-libs/leveldb can be detected.
-
 a/Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
-@@ -19,7 +19,7 @@
- 
- #include 
- #include 
--#include 
-+#include 
- 
- int main(int, char**)
- {
-
 a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-@@ -38,7 +38,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include 
- #include 
- #include 

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
deleted file mode 100644
index 40e58f0d..
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow disabling JIT for hardened.
-
-Author: Magnus Granberg 
-Gentoo-bug: 562396
-
 a/Tools/qmake/mkspecs/features/features.pri
-+++ b/Tools/qmake/mkspecs/features/features.pri
-@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
- ENABLE_INPUT_TYPE_WEEK=0 \
- ENABLE_INSPECTOR=1 \
- ENABLE_INSPECTOR_SERVER=1 \
-+ENABLE_JIT=0 \
- ENABLE_JAVASCRIPT_DEBUGGER=1 \
- ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
- ENABLE_LEGACY_NOTIFICATIONS=1 \

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
deleted file mode 100644
index 867e8dcb..
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
- 
- # HTML5 Media Support for builds with GStreamer
- unix:!mac:qtConfig(pkg-config) {
--packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 
gstreamer-plugins-base-1.0") {
--WEBKIT_CONFIG += video use_gstreamer
--} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' 
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
--WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
--}
--use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
- }
- 
- !enable?(video):qtHaveModule(multimediawidgets) {

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
deleted file mode 100644
index a0aa5e42..
--- a/dev-qt/qtwebkit/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   q...@gentoo.org
-   Gentoo Qt Project
-   
-   
-   Enable physical position determination 
via dev-qt/qtpositioning
-   Use GLES 2.0 or later instead of full 
OpenGL
-   Enable HTML5 audio/video support via 
media-libs/gstreamer
-   Enable HTML5 audio/video support via 
dev-qt/qtmultimedia
-   Enable device orientation detection 
via dev-qt/qtsensors
-   Enable printing via 
dev-qt/qtprintsupport
-   Build QML/QtQuick bindings
-   Enable integration with 
dev-qt/qtwebchannel
-   Add support for WebP image format
-   
-   
-   https://bugreports.qt.io/
-   https://doc.qt.io/
-   
-   
-   
-   Must only be used by packages that are known to use 
private parts of the Qt API.
-   
-   
-

diff --git a/dev-qt/qtwebkit/qtwebkit-5.12..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.12..ebuild
deleted file mode 100644
index 8af05a19..
--- a/dev-qt/qtwebkit/qtwebkit-5.12..ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2018-06-18 Thread Jimi Huotari 
commit: d228a70b4a2ac4e672019a1e34b753d8e646481e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Jun 18 13:26:51 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Mon Jun 18 13:26:51 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d228a70b

dev-qt/qtwebkit: add slot operator to 'dev-libs/leveldb'

Follows the in-tree commit:

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43fc7b9

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 8af05a19..0123ea81 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="?? ( gstreamer multimedia )"
 RDEPEND="
dev-db/sqlite:3
dev-libs/icu:=
-   >=dev-libs/leveldb-1.18-r1
+   >=dev-libs/leveldb-1.18-r1:=
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-qt/qtcore-${QT_MIN_VER}[icu]

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-10-07 Thread Michael Palimaka 
commit: 80d93ea3abae74ea2a216d74735ce1546b50bc27
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct  7 06:09:00 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct  7 06:09:17 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=80d93ea3

dev-qt/qtwebkit: add missing slot

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 2 +-
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 326c982b..af4f3594 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1"
+QT_MIN_VER="5.9.1:5"
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 326c982b..af4f3594 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1"
+QT_MIN_VER="5.9.1:5"
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 326c982b..af4f3594 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1"
+QT_MIN_VER="5.9.1:5"
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-10-06 Thread Michael Palimaka 
commit: 9e9d0befa0cac4e881683e567e03cd1ed85c2b54
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct  7 03:25:34 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct  7 03:38:04 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9e9d0bef

dev-qt/qtwebkit: add manual qttest handling

The eclass forces a pinned dev-qt/qttest dependency which no longer makes sense
for dev-qt/qtwebkit as it is no longer released with the rest of Qt.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 3 ++-
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 3 ++-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 213c19f9..326c982b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml test webchannel webp"
 REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
sys-devel/bison
sys-devel/flex
virtual/rubygems
+   test? ( >=dev-qt/qttest-${QT_MIN_VER} )
 "
 
 PATCHES=(

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 213c19f9..326c982b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml test webchannel webp"
 REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
sys-devel/bison
sys-devel/flex
virtual/rubygems
+   test? ( >=dev-qt/qttest-${QT_MIN_VER} )
 "
 
 PATCHES=(

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 213c19f9..326c982b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml test webchannel webp"
 REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
sys-devel/bison
sys-devel/flex
virtual/rubygems
+   test? ( >=dev-qt/qttest-${QT_MIN_VER} )
 "
 
 PATCHES=(

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-10-06 Thread Michael Palimaka 
commit: 71a304ff572407c07cf4c0708ff0e9b9d901487e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct  7 03:23:40 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct  7 03:38:03 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=71a304ff

dev-qt/qtwebkit: unpin dev-qt dependencies

dev-qt/qtwebkit is no longer being released together with the rest of Qt, so
pinned dependencies no longer make sense.

This is a followup to b0c5d8c3dd86479acbd325dac93a104c200a767c.

Bug: https://bugs.gentoo.org/624404
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 27 ++-
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 27 ++-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 27 ++-
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index dc432beb..213c19f9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1"
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -22,11 +23,11 @@ RDEPEND="
>=dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
-   ~dev-qt/qtcore-${PV}[icu]
-   ~dev-qt/qtgui-${PV}
-   ~dev-qt/qtnetwork-${PV}
-   ~dev-qt/qtsql-${PV}
-   ~dev-qt/qtwidgets-${PV}
+   >=dev-qt/qtcore-${QT_MIN_VER}[icu]
+   >=dev-qt/qtgui-${QT_MIN_VER}
+   >=dev-qt/qtnetwork-${QT_MIN_VER}
+   >=dev-qt/qtsql-${QT_MIN_VER}
+   >=dev-qt/qtwidgets-${QT_MIN_VER}
media-libs/fontconfig:1.0
media-libs/libpng:0=
>=sys-libs/zlib-1.2.5
@@ -35,21 +36,21 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
-   geolocation? ( ~dev-qt/qtpositioning-${PV} )
+   geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
-   multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+   multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
-   ~dev-qt/qtgui-${PV}[gles2=]
-   ~dev-qt/qtopengl-${PV}
+   >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+   >=dev-qt/qtopengl-${QT_MIN_VER}
)
-   orientation? ( ~dev-qt/qtsensors-${PV} )
-   printsupport? ( ~dev-qt/qtprintsupport-${PV} )
-   qml? ( ~dev-qt/qtdeclarative-${PV} )
-   webchannel? ( ~dev-qt/qtwebchannel-${PV} )
+   orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+   printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+   qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
+   webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${RDEPEND}

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index dc432beb..213c19f9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
+QT_MIN_VER="5.9.1"
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -22,11 +23,11 @@ RDEPEND="
>=dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
-   ~dev-qt/qtcore-${PV}[icu]
-   ~dev-qt/qtgui-${PV}
-   ~dev-qt/qtnetwork-${PV}
-   ~dev-qt/qtsql-${PV}
-   ~dev-qt/qtwidgets-${PV}
+   >=dev-qt/qtcore-${QT_MIN_VER}[icu]
+   >=dev-qt/qtgui-${QT_MIN_VER}
+   >=dev-qt/qtnetwork-${QT_MIN_VER}
+   >=dev-qt/qtsql-${QT_MIN_VER}
+   >=dev-qt/qtwidgets-${QT_MIN_VER}
media-libs/fontconfig:1.0
media-libs/libpng:0=
>=sys-libs/zlib-1.2.5
@@ -35,21 +36,21 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
-   geolocation? ( ~dev-qt/qtpositioning-${PV} )
+   geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
-   multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+   multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
-   ~dev-qt/qtgui-${PV}[gles2=]
-   ~dev-qt/qtopengl-${PV}
+   >=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+   >=dev-qt/qtopengl-${QT_MIN_VER}
)
-   orientation? ( ~dev-qt/qtsensors-${PV} )
-   printsupport? ( ~dev-qt/qtprintsupport-${PV} )
-   qml? ( ~dev-qt/qtdeclarative-${PV} )
-   webchannel? ( ~dev-qt/qtwebchannel-${PV} )
+   orientation? (

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/

2017-08-26 Thread Michael Palimaka 
commit: 9cb6807005128f41f97023074b3fd07899484c7b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug 27 05:23:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 27 05:37:09 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9cb68070

dev-qt/qtwebkit: remove unused patch

 .../files/qtwebkit-5.8.0-use-gstreamer010.patch| 18 --
 1 file changed, 18 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
deleted file mode 100644
index b286059f..
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -99,14 +99,8 @@ defineTest(detectFeatures) {
- qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl
- 
- # HTML5 Media Support for builds with GStreamer
--unix:!mac:qtConfig(pkg-config) {
--packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 
gstreamer-plugins-base-1.0") {
--WEBKIT_CONFIG += video use_gstreamer
--} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' 
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
--WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
--}
-+WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
--}
- 
- !enable?(video):false {
- WEBKIT_CONFIG += video use_qt_multimedia

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-07-23 Thread Michael Palimaka 
commit: 037ae44fd72f7d6576ada67e3afe8bbff2ca914b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 23 11:57:44 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 11:57:51 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=037ae44f

dev-qt/qtwebkit: introduce gles2 USE flag

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebkit/metadata.xml | 1 +
 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 7 +--
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 7 +--
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 7 +--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 021a9178..87f1ed33 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,6 +7,7 @@


Enable physical position determination 
via dev-qt/qtpositioning
+   Use GLES 2.0 or later instead of full 
OpenGL
Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 1.0
Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 0.10
Enable HTML5 audio/video support via 
dev-qt/qtmultimedia

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 9eb9645f..dc432beb 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -13,7 +13,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
@@ -42,7 +42,10 @@ RDEPEND="
media-libs/gst-plugins-base:1.0
)
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-   opengl? ( ~dev-qt/qtopengl-${PV} )
+   opengl? (
+   ~dev-qt/qtgui-${PV}[gles2=]
+   ~dev-qt/qtopengl-${PV}
+   )
orientation? ( ~dev-qt/qtsensors-${PV} )
printsupport? ( ~dev-qt/qtprintsupport-${PV} )
qml? ( ~dev-qt/qtdeclarative-${PV} )

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 9eb9645f..dc432beb 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -13,7 +13,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
@@ -42,7 +42,10 @@ RDEPEND="
media-libs/gst-plugins-base:1.0
)
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-   opengl? ( ~dev-qt/qtopengl-${PV} )
+   opengl? (
+   ~dev-qt/qtgui-${PV}[gles2=]
+   ~dev-qt/qtopengl-${PV}
+   )
orientation? ( ~dev-qt/qtsensors-${PV} )
printsupport? ( ~dev-qt/qtprintsupport-${PV} )
qml? ( ~dev-qt/qtdeclarative-${PV} )

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 9eb9645f..dc432beb 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -13,7 +13,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
@@ -42,7 +42,10 @@ RDEPEND="
media-libs/gst-plugins-base:1.0
)
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-   opengl? ( ~dev-qt/qtopengl-${PV} )
+   opengl? (
+   ~dev-qt/qtgui-${PV}[gles2=]
+   ~dev-qt/qtopengl-${PV}
+   )
orientation? ( ~dev-qt/qtsensors-${PV} )
printsupport? ( ~dev-qt/qtprintsupport-${PV} )
qml? ( ~dev-qt/qtdeclarative-${PV} )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-07-23 Thread Michael Palimaka 
commit: abe534739e1bc506322e31076e7a05ab9efb984d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 23 10:54:33 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 11:35:38 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=abe53473

dev-qt/qtwebkit: force using system libpng and libjpeg

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 5 +
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 5 +
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 5 +
 3 files changed, 15 insertions(+)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 6fb0b38b..9eb9645f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -66,6 +66,11 @@ src_prepare() {
# ensure bundled library cannot be used
rm -r Source/ThirdParty/leveldb || die
 
+   # force using system library
+   sed -i -e 's/qtConfig(system-jpeg)/true/' \
+   -e 's/qtConfig(system-png)/true/' \
+   Tools/qmake/mkspecs/features/features.prf || die
+
# bug 466216
sed -i -e '/CONFIG +=/s/rpath//' \

Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 6fb0b38b..9eb9645f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -66,6 +66,11 @@ src_prepare() {
# ensure bundled library cannot be used
rm -r Source/ThirdParty/leveldb || die
 
+   # force using system library
+   sed -i -e 's/qtConfig(system-jpeg)/true/' \
+   -e 's/qtConfig(system-png)/true/' \
+   Tools/qmake/mkspecs/features/features.prf || die
+
# bug 466216
sed -i -e '/CONFIG +=/s/rpath//' \

Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 6fb0b38b..9eb9645f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -66,6 +66,11 @@ src_prepare() {
# ensure bundled library cannot be used
rm -r Source/ThirdParty/leveldb || die
 
+   # force using system library
+   sed -i -e 's/qtConfig(system-jpeg)/true/' \
+   -e 's/qtConfig(system-png)/true/' \
+   Tools/qmake/mkspecs/features/features.prf || die
+
# bug 466216
sed -i -e '/CONFIG +=/s/rpath//' \

Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-07-23 Thread Michael Palimaka 
commit: 153748846f61f80a790c18505fed49a17c26ff30
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 23 10:29:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 10:29:55 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=15374884

dev-qt/qtwebkit: fix opengl USE flag for 5.9

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 4 ++--
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 4 ++--
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 7e11e4b2..6fb0b38b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -72,6 +72,8 @@ src_prepare() {

Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
|| die
 
+   qt_use_disable_config opengl opengl 
Tools/qmake/mkspecs/features/features.prf
+
qt_use_disable_mod geolocation positioning 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
@@ -88,8 +90,6 @@ src_prepare() {
# bug 562396
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
 
-   use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += 
use_3d_graphics/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 7e11e4b2..6fb0b38b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -72,6 +72,8 @@ src_prepare() {

Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
|| die
 
+   qt_use_disable_config opengl opengl 
Tools/qmake/mkspecs/features/features.prf
+
qt_use_disable_mod geolocation positioning 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
@@ -88,8 +90,6 @@ src_prepare() {
# bug 562396
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
 
-   use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += 
use_3d_graphics/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 7e11e4b2..6fb0b38b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -72,6 +72,8 @@ src_prepare() {

Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
|| die
 
+   qt_use_disable_config opengl opengl 
Tools/qmake/mkspecs/features/features.prf
+
qt_use_disable_mod geolocation positioning 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
@@ -88,8 +90,6 @@ src_prepare() {
# bug 562396
use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
 
-   use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += 
use_3d_graphics/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-07-23 Thread Michael Palimaka 
commit: b47b669dbbf90f33161cbfddceffd078beaf0635
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 23 08:35:56 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 08:36:06 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b47b669d

dev-qt/qtwebkit: remove support for dead and vulnerable gstreamer:0.10

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild| 13 +++--
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 13 +++--
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 13 +++--
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
-   gstreamer010? (
-   dev-libs/glib:2
-   media-libs/gstreamer:0.10
-   media-libs/gst-plugins-base:0.10
-   )
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
opengl? ( ~dev-qt/qtopengl-${PV} )
orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
Source/WebKit2/Target.pri \
Source/WebKit2/WebKit2.pri
 
-   if use gstreamer010; then
-   PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-   elif ! use gstreamer; then
+   if ! use gstreamer; then
PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
-   gstreamer010? (
-   dev-libs/glib:2
-   media-libs/gstreamer:0.10
-   media-libs/gst-plugins-base:0.10
-   )
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
opengl? ( ~dev-qt/qtopengl-${PV} )
orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
Source/WebKit2/Target.pri \
Source/WebKit2/WebKit2.pri
 
-   if use gstreamer010; then
-   PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-   elif ! use gstreamer; then
+   if ! use gstreamer; then
PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 7d26b519..7e11e4b2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -13,8 +13,8 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
+IUSE="geolocation gstreamer +jit multimedia opengl orientation printsupport 
qml webchannel webp"
+REQUIRED_USE="?? ( gstreamer multimedia )"
 
 RDEPEND="
dev-db/sqlite:3
@@ -41,11 +41,6 @@ RDEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
-   gstreamer010? (
-   dev-libs/glib:2
-   media-libs/gstreamer:0.10
-   media-libs/gst-plugins-base:0.10
-   )
multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
opengl? ( ~dev-qt/qtopengl-${PV} )
orientation? ( ~dev-qt/qtsensors-${PV} )
@@ -86,9 +81,7 @@ src_prepare() {
Source/WebKit2/Target.pri \
Source/WebKit2/WebKit2.pri
 
-   if use gstreamer010; then
-   PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
-   elif ! use gstreamer; then
+   if ! use gstreamer; then
PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-06-18 Thread Michael Palimaka 
commit: 5820fbc293c9ab58424bd4284d4823b881454581
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 07:54:35 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 07:54:39 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5820fbc2

dev-qt/qtwebkit: improve is-anything-built check

Gentoo-bug: 572056
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qtwebkit/qtwebkit-5.6..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.7..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild| 2 +-
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
index 358c4854..4ed2d7c2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
@@ -110,7 +110,7 @@ src_install() {
qt5-build_src_install
 
# bug 572056
-   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7..ebuild
index 358c4854..4ed2d7c2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7..ebuild
@@ -110,7 +110,7 @@ src_install() {
qt5-build_src_install
 
# bug 572056
-   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
index 9eef1183..aff0d8f6 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
@@ -111,7 +111,7 @@ src_install() {
qt5-build_src_install
 
# bug 572056
-   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index a5d5b702..a2f4a265 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -110,7 +110,7 @@ src_install() {
qt5-build_src_install
 
# bug 572056
-   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index a5d5b702..a2f4a265 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -110,7 +110,7 @@ src_install() {
qt5-build_src_install
 
# bug 572056
-   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
fi

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2017-06-11 Thread Michael Palimaka 
commit: 604de1a5b113ef3b6c168f093b02d73e176ca57e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 11 13:08:02 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 11 13:08:55 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=604de1a5

dev-qt/qtwebkit: die if nothing is actually build

Gentoo-bug: 572056
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qtwebkit/qtwebkit-5.6..ebuild | 10 ++
 dev-qt/qtwebkit/qtwebkit-5.7..ebuild | 10 ++
 dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild| 10 ++
 dev-qt/qtwebkit/qtwebkit-5.9..ebuild | 10 ++
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 10 ++
 5 files changed, 50 insertions(+)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
index 6251e838..358c4854 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
@@ -105,3 +105,13 @@ src_prepare() {
 
qt5-build_src_prepare
 }
+
+src_install() {
+   qt5-build_src_install
+
+   # bug 572056
+   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
+   die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
+   fi
+}

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7..ebuild
index 6251e838..358c4854 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7..ebuild
@@ -105,3 +105,13 @@ src_prepare() {
 
qt5-build_src_prepare
 }
+
+src_install() {
+   qt5-build_src_install
+
+   # bug 572056
+   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
+   die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
+   fi
+}

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
index e13056d7..9eef1183 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
@@ -106,3 +106,13 @@ src_prepare() {
 
qt5-build_src_prepare
 }
+
+src_install() {
+   qt5-build_src_install
+
+   # bug 572056
+   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
+   die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
+   fi
+}

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
index 5de0d898..a5d5b702 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9..ebuild
@@ -105,3 +105,13 @@ src_prepare() {
 
qt5-build_src_prepare
 }
+
+src_install() {
+   qt5-build_src_install
+
+   # bug 572056
+   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
+   die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
+   fi
+}

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 5de0d898..a5d5b702 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -105,3 +105,13 @@ src_prepare() {
 
qt5-build_src_prepare
 }
+
+src_install() {
+   qt5-build_src_install
+
+   # bug 572056
+   if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+   eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
+   die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
+   fi
+}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2017-01-28 Thread Michael Palimaka 
commit: 130397a485c632e705b789bbc72f1c31e9ffcf17
Author: Zamarin Arthur  gmail  com>
AuthorDate: Sat Jan 28 12:25:32 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan 28 14:15:18 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=130397a4

dev-qt/qtwebkit: fix 5.8 gstreamer patches

 .../files/qtwebkit-5.8.0-disable-gstreamer.patch   | 15 +++
 .../files/qtwebkit-5.8.0-use-gstreamer010.patch| 18 ++
 dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild  |  4 ++--
 dev-qt/qtwebkit/qtwebkit-5.8..ebuild   |  4 ++--
 dev-qt/qtwebkit/qtwebkit-5..ebuild |  4 ++--
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
new file mode 100644
index 000..867e8dc
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- a/Tools/qmake/mkspecs/features/features.prf
 b/Tools/qmake/mkspecs/features/features.prf
+@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
+ 
+ # HTML5 Media Support for builds with GStreamer
+ unix:!mac:qtConfig(pkg-config) {
+-packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 
gstreamer-plugins-base-1.0") {
+-WEBKIT_CONFIG += video use_gstreamer
+-} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' 
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+-WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-}
+-use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+ }
+ 
+ !enable?(video):qtHaveModule(multimediawidgets) {

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
new file mode 100644
index 000..b286059
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch
@@ -0,0 +1,18 @@
+--- a/Tools/qmake/mkspecs/features/features.prf
 b/Tools/qmake/mkspecs/features/features.prf
+@@ -99,14 +99,8 @@ defineTest(detectFeatures) {
+ qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl
+ 
+ # HTML5 Media Support for builds with GStreamer
+-unix:!mac:qtConfig(pkg-config) {
+-packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 
gstreamer-plugins-base-1.0") {
+-WEBKIT_CONFIG += video use_gstreamer
+-} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' 
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+-WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-}
++WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+ use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+-}
+ 
+ !enable?(video):false {
+ WEBKIT_CONFIG += video use_qt_multimedia

diff --git a/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
index f3b7436..21f6368 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild
@@ -89,9 +89,9 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
-   PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
+   PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
elif ! use gstreamer; then
-   PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
+   PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
 
# bug 562396

diff --git a/dev-qt/qtwebkit/qtwebkit-5.8..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.8..ebuild
index 6f84eba..b110c3f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.8..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.8..ebuild
@@ -88,9 +88,9 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
-   PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
+   PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
elif ! use gstreamer; then
-   PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
+   PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
fi
 
# bug 562396

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 6f84eba..b110c3f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -88,9 +88,9 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
-   PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
+   PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch")
elif ! use gstreamer; then
-   PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
+   PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-04-23 Thread Michael Palimaka 
commit: ad50db94f4322ef5bd26aad3bde70c029638d6d2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Apr 23 17:01:08 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Apr 23 17:20:24 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ad50db94

dev-qt/qtwebkit: sync metadata with main tree

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index cc7babe..534bff9 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,8 +7,8 @@


Enable physical position determination 
via dev-qt/qtpositioning
-   Enable HTML5 audio/video support via 
media-libs/gstreamer:1.0
-   Enable HTML5 audio/video support via 
media-libs/gstreamer:0.10
+   Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 1.0
+   Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 0.10
Enable HTML5 audio/video support via 
dev-qt/qtmultimedia
Enable device orientation detection 
via dev-qt/qtsensors
Enable printing via 
dev-qt/qtprintsupport

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-04-09 Thread Davide Pesavento 
commit: fb28a66aaf9dd756bdefdba7b8be4f6a3d75a7c5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Apr  9 15:46:04 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Apr  9 15:46:51 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb28a66a

dev-qt/qtwebkit: re-manifest and remove syncqt call

Upstream replaced the 5.6.0 tarball with one that fixes
the screwup of bug 577574. So update the Manifest and
drop the workaround from the ebuild.

Gentoo-Bug: 579352
Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/Manifest  | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild | 5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 03306a2..e64eb23 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1,2 @@
-DIST qtwebkit-opensource-src-5.6.0.tar.xz 35301228 SHA256 
d5c4daac8eef1b24290cda59db432ccc390761af17661f64f3028482647521a1 SHA512 
eb4c073f9270cc3d48947df931536d5df91229aacc83a74b096252d4a9368bf23a56118ef63ad05d7d8360bb67708578ba8aa100fb041cf87216ba3c203e9844
 WHIRLPOOL 
8266d2a5af7337b449a904873f5fdce69d02755cd786e848f2550afee71ecff36957f96ae352670a7572e25d655b68e8a125663ef8f858f1f5dfaa0e06d65f5f
+DIST qtwebkit-opensource-src-5.6.0.tar.xz 35302972 SHA256 
9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe SHA512 
d9a2d10960cbdf8cf144f1cdaebf52ff95a6ad70b94b19c9ffcd0dd653d98c1e1fab6516e7dc481a4d199af5fb98d36ac41a309e10b96ada0e18f581946bb1af
 WHIRLPOOL 
851174164ed88d3edbffe78b95d3808809f035379a9b2210baad36bbf0f14376f33356c9c84f720c450776aca98bf7bcdf27c3624ccdb96bd3bdc34ec7804dcb
 DIST qtwebkit-opensource-src-5.7.0-alpha.tar.xz 35300100 SHA256 
088834e1e54d6f39eb4e5eed22fc4a2ce617f64d2a811c3ccfb523216311bfa2 SHA512 
5ccdf3eff3b3079a8ad55cb0c707820368a43679a1f6537fe16400e86d41a8f5e85fe96df14f91255d15280cbb673ef72cdcbac349ec3c08928a02c481f8552d
 WHIRLPOOL 
b0890bf10661180d4c9253c2a02f7d020dc003fcf0ea9875a895fd1d5f0e42c5b010d61898b0baee3aef4a82759a2abbb6d8430d0a7076757c1c7d57efbe373c

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 89f2921..58876f1 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qmake-utils qt5-build
+inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 
SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz;
@@ -105,8 +105,5 @@ src_prepare() {
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
-   # bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile || 
die
-
qt5-build_src_prepare
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-04-06 Thread Davide Pesavento 
commit: 51763b96d4f4ae721fda6236f33b45c7d887048a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Apr  6 14:55:06 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Apr  6 14:55:06 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=51763b96

dev-qt/qtwebkit: add missing die

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 2d6418e..89f2921 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
# bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile || 
die
 
qt5-build_src_prepare
 }

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
index 503da54..f8b4bc2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
@@ -105,7 +105,7 @@ src_prepare() {
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
# bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile || 
die
 
qt5-build_src_prepare
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-04-06 Thread Davide Pesavento 
commit: 29bae4f9e1ba1f3a75738062b3a88a8a92976dd7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Apr  6 14:53:25 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Apr  6 14:54:00 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=29bae4f9

dev-qt/qtwebkit: fix version argument in syncqt call

Gentoo-Bug: 577574

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index a3a0f0f..2d6418e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
# bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile
 
qt5-build_src_prepare
 }

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
index 8a1ac2e..503da54 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
@@ -105,7 +105,7 @@ src_prepare() {
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
# bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile
 
qt5-build_src_prepare
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-04-02 Thread Michael Palimaka 
commit: a1641d87c1b799db2a66fbb62e9efe877080b820
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Apr  2 13:53:41 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Apr  2 13:53:56 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1641d87

dev-qt/qtwebkit: add missing die

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index a3a0f0f..46ff91c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
# bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile || die
 
qt5-build_src_prepare
 }

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
index 8a1ac2e..778e237 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
@@ -105,7 +105,7 @@ src_prepare() {
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
# bug 577574
-   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile || die
 
qt5-build_src_prepare
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-04-01 Thread Michael Palimaka 
commit: e9c83fdc1a992d599593e963f44ef44dccfa4090
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Apr  1 15:25:23 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Apr  1 15:25:51 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e9c83fdc

dev-qt/qtwebkit: manually run syncqt.pl to solve build failure

This is normally done by upstream before creating the release tarball, but they
forgot.

Gentoo-bug: 577574

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild   | 5 -
 dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 58876f1..a3a0f0f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit python-any-r1 qmake-utils qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 
SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz;
@@ -105,5 +105,8 @@ src_prepare() {
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
+   # bug 577574
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
+
qt5-build_src_prepare
 }

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
index 6f84eba..8a1ac2e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.0_alpha.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit python-any-r1 qmake-utils qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 
@@ -104,5 +104,8 @@ src_prepare() {
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 
+   # bug 577574
+   "$(qt5_get_bindir)"/syncqt.pl -version ${PV} Source/sync.profile
+
qt5-build_src_prepare
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-03-19 Thread Michael Palimaka 
commit: 41526dbb5cf760e3d1c006c09c062520cdce2aba
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Mar 17 09:43:24 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar 17 09:43:24 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=41526dbb

dev-qt/qtwebkit: use final release

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/Manifest  | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 180fd5b..03306a2 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1,2 @@
-DIST qtwebkit-opensource-src-5.6.0.tar.xz 35300164 SHA256 
3376b4e2f8a0bde3f6db8e0b3dc0d8104350126f4090e2fc8832a0a99cbc9fed SHA512 
e43598fe2c4e2631f78a659da898a3d366743f5db387d48dd520c604817a11f0187f792a0b79ac095f9e35c7368af2fd666cfce0d13c529a55878d3a0a7757d6
 WHIRLPOOL 
49c59a1eab12627dfc262f40cf5d323100adf956e014275364af6d25328de841afa1862806d1ebc63a45f329a19aafdcee29b028b975f791699a0dc1d12cc638
+DIST qtwebkit-opensource-src-5.6.0.tar.xz 35301228 SHA256 
d5c4daac8eef1b24290cda59db432ccc390761af17661f64f3028482647521a1 SHA512 
eb4c073f9270cc3d48947df931536d5df91229aacc83a74b096252d4a9368bf23a56118ef63ad05d7d8360bb67708578ba8aa100fb041cf87216ba3c203e9844
 WHIRLPOOL 
8266d2a5af7337b449a904873f5fdce69d02755cd786e848f2550afee71ecff36957f96ae352670a7572e25d655b68e8a125663ef8f858f1f5dfaa0e06d65f5f
 DIST qtwebkit-opensource-src-5.7.0-alpha.tar.xz 35300100 SHA256 
088834e1e54d6f39eb4e5eed22fc4a2ce617f64d2a811c3ccfb523216311bfa2 SHA512 
5ccdf3eff3b3079a8ad55cb0c707820368a43679a1f6537fe16400e86d41a8f5e85fe96df14f91255d15280cbb673ef72cdcbac349ec3c08928a02c481f8552d
 WHIRLPOOL 
b0890bf10661180d4c9253c2a02f7d020dc003fcf0ea9875a895fd1d5f0e42c5b010d61898b0baee3aef4a82759a2abbb6d8430d0a7076757c1c7d57efbe373c

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 48624be..58876f1 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV}-rc/submodules/${PN}-opensource-src-${PV}.tar.xz;
+SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz;
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2016-01-20 Thread Davide Pesavento 
commit: 8a562ff3ed3c110a2a2d2e3f0092bd3969a0856b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jan 20 15:40:43 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jan 20 15:40:43 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a562ff3

dev-qt/qtwebkit: sync

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch | 15 +++
 dev-qt/qtwebkit/qtwebkit-5.6..ebuild   | 15 ++-
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 15 ++-
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
new file mode 100644
index 000..40e58f0
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
@@ -0,0 +1,15 @@
+Allow disabling JIT for hardened.
+
+Author: Magnus Granberg 
+Gentoo-bug: 562396
+
+--- a/Tools/qmake/mkspecs/features/features.pri
 b/Tools/qmake/mkspecs/features/features.pri
+@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
+ ENABLE_INPUT_TYPE_WEEK=0 \
+ ENABLE_INSPECTOR=1 \
+ ENABLE_INSPECTOR_SERVER=1 \
++ENABLE_JIT=0 \
+ ENABLE_JAVASCRIPT_DEBUGGER=1 \
+ ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+ ENABLE_LEGACY_NOTIFICATIONS=1 \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
index a52f272..593d86b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation 
printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -83,7 +83,9 @@ src_prepare() {
qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+   qt_use_disable_mod webchannel webchannel \
+   Source/WebKit2/Target.pri \
+   Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
@@ -91,9 +93,12 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
 
-   use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
+   # bug 562396
+   use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+
+   use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += 
use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
+   use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 
# bug 458222

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index a52f272..593d86b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib
 
-IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation 
printsupport qml webchannel webp"
+IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation 
printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -83,7 +83,9 @@ src_prepare() {
qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+   qt_use_disable_mod webchannel webchannel \
+   Source/WebKit2/Target.pri \
+   Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
@@ -91,9 +93,12 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
 
-   use opengl   || sed -i -e '/contains(QT_CONFIG,

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-01-20 Thread Davide Pesavento 
commit: a2e03882eb314289ccf6acf1bc3483261e93086f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jan 20 17:34:47 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jan 20 17:34:47 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a2e03882

dev-qt/qtwebkit: do not call epatch manually

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/qtwebkit-5.6..ebuild | 6 +++---
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
index 593d86b..6f84eba 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
@@ -88,13 +88,13 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
-   epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+   PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
elif ! use gstreamer; then
-   epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+   PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
fi
 
# bug 562396
-   use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+   use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
 
use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += 
use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 593d86b..6f84eba 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -88,13 +88,13 @@ src_prepare() {
Source/WebKit2/WebKit2.pri
 
if use gstreamer010; then
-   epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+   PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch")
elif ! use gstreamer; then
-   epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+   PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch")
fi
 
# bug 562396
-   use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+   use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
 
use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += 
use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2016-01-19 Thread Davide Pesavento 
commit: 323cb76abcc4b18f371cf8a4cbf06c1929348e80
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan 19 19:19:13 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan 19 19:19:13 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=323cb76a

dev-qt/qtwebkit: remove 5.5 ebuild with unsolvable deps

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 103 ---
 1 file changed, 103 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
deleted file mode 100644
index a52f272..000
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation 
printsupport qml webchannel webp"
-REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
-
-RDEPEND="
-   dev-db/sqlite:3
-   dev-libs/icu:=
-   >=dev-libs/leveldb-1.18-r1
-   dev-libs/libxml2:2
-   dev-libs/libxslt
-   ~dev-qt/qtcore-${PV}[icu]
-   ~dev-qt/qtgui-${PV}
-   ~dev-qt/qtnetwork-${PV}
-   ~dev-qt/qtsql-${PV}
-   ~dev-qt/qtwidgets-${PV}
-   media-libs/fontconfig:1.0
-   media-libs/libpng:0=
-   >=sys-libs/zlib-1.2.5
-   virtual/jpeg:0
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXrender
-   geolocation? ( ~dev-qt/qtpositioning-${PV} )
-   gstreamer? (
-   dev-libs/glib:2
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   gstreamer010? (
-   dev-libs/glib:2
-   media-libs/gstreamer:0.10
-   media-libs/gst-plugins-base:0.10
-   )
-   multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
-   opengl? ( ~dev-qt/qtopengl-${PV} )
-   orientation? ( ~dev-qt/qtsensors-${PV} )
-   printsupport? ( ~dev-qt/qtprintsupport-${PV} )
-   qml? ( ~dev-qt/qtdeclarative-${PV} )
-   webchannel? ( ~dev-qt/qtwebchannel-${PV} )
-   webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   dev-lang/ruby
-   dev-util/gperf
-   sys-devel/bison
-   sys-devel/flex
-   virtual/rubygems
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-)
-
-src_prepare() {
-   # ensure bundled library cannot be used
-   rm -r Source/ThirdParty/leveldb || die
-
-   # bug 466216
-   sed -i -e '/CONFIG +=/s/rpath//' \
-   
Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-   
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
-   || die
-
-   qt_use_disable_mod geolocation positioning 
Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-   qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
-
-   if use gstreamer010; then
-   epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
-   elif ! use gstreamer; then
-   epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
-   fi
-
-   use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
-   use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
-
-   # bug 458222
-   sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-   qt5-build_src_prepare
-}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/

2016-01-19 Thread Michael Palimaka 
commit: 012dc5616edd8707d337757314b38657ad3bb149
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 20 05:58:15 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 20 05:58:15 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=012dc561

dev-qt/qtwebkit: fix patch format for EAPI 6

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch | 4 ++--
 dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch  | 4 ++--
 dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
index 05e41a1..2309570 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -1,5 +1,5 @@
 Tools/qmake/mkspecs/features/features.prf  2014-03-19 18:35:47.795676444 
+
-+++ Tools/qmake/mkspecs/features/features.prf  2014-03-19 18:36:38.602433220 
+
+--- a/Tools/qmake/mkspecs/features/features.prf
 b/Tools/qmake/mkspecs/features/features.prf
 @@ -99,12 +99,6 @@
  
  # HTML5 Media Support for builds with GStreamer

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
index 1c02e45..8c9220b 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
@@ -1,5 +1,5 @@
 Tools/qmake/mkspecs/features/features.prf  2014-09-27 11:09:50.010617142 
+0100
-+++ Tools/qmake/mkspecs/features/features.prf  2014-09-27 11:17:10.741678989 
+0100
+--- a/Tools/qmake/mkspecs/features/features.prf
 b/Tools/qmake/mkspecs/features/features.prf
 @@ -96,14 +96,8 @@
  use?(3d_graphics): WEBKIT_CONFIG += webgl
  

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
index 0a476c6..0a68ba7 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -1,7 +1,7 @@
 Correct header location so system dev-libs/leveldb can be detected.
 
 Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+--- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
 b/Tools/qmake/config.tests/leveldb/leveldb.cpp
 @@ -19,7 +19,7 @@
  
  #include

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/

2016-01-19 Thread Michael Palimaka 
commit: a526afdcc1918130a6ab3be0be43630c339ba735
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 20 05:59:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 20 05:59:53 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a526afdc

dev-qt/qtwebkit: further EAPI 6 patch format fix

Package-Manager: portage-2.2.27

 dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
index 0a68ba7..265d507 100644
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -12,8 +12,8 @@ Correct header location so system dev-libs/leveldb can be 
detected.
  int main(int, char**)
  {
 
 Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+--- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
 b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
 @@ -38,7 +38,7 @@
  #include 
  #include

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-10-17 Thread Michael Palimaka 
commit: 52cc4a50ab5d32ba75d489a16cba62557cc12dce
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 17 16:52:15 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 17 17:02:42 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=52cc4a50

dev-qt/qtwebkit: use qt_use_disable_mod

Package-Manager: portage-2.2.20.1

 dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild| 7 +++
 dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild| 7 +++
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 7 +++
 dev-qt/qtwebkit/qtwebkit-5.6..ebuild | 7 +++
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 7 +++
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
-   use multimedia   || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
+
+   qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' 
\
-   Tools/qmake/mkspecs/features/features.prf || die
+   qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
-   use multimedia   || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
+
+   qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' 
\
-   Tools/qmake/mkspecs/features/features.prf || die
+   qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
-   use multimedia   || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
+
+   qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' 
\
-   Tools/qmake/mkspecs/features/features.prf || die
+   qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
index 44acff5..e912401 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
@@ -80,12 +80,11 @@ src_prepare() {
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
-   use multimedia   || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
+
+

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-10-17 Thread Michael Palimaka 
commit: 7ab43499d1aa9240e22af9934cdc9426127d188a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 17 16:42:03 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 17 17:02:41 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7ab43499

dev-qt/qtwebkit: remove udev USE flag

libudev is loaded at runtime, not linked in, failing gracefully if it's not 
present

Package-Manager: portage-2.2.20.1

 dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild| 5 +
 dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild| 5 +
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 5 +
 dev-qt/qtwebkit/qtwebkit-5.6..ebuild | 5 +
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 5 +
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 8794dd2..44acff5 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -50,7 +50,6 @@ RDEPEND="
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
-   udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${RDEPEND}
@@ -89,8 +88,6 @@ src_prepare() {
Tools/qmake/mkspecs/features/features.prf || die
use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
-   use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
index 8794dd2..44acff5 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -50,7 +50,6 @@ RDEPEND="
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
-   udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${RDEPEND}
@@ -89,8 +88,6 @@ src_prepare() {
Tools/qmake/mkspecs/features/features.prf || die
use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
-   use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 8794dd2..44acff5 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -50,7 +50,6 @@ RDEPEND="
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
-   udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${RDEPEND}
@@ -89,8 +88,6 @@ src_prepare() {
Tools/qmake/mkspecs/features/features.prf || die
use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
-   use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
index 8794dd2..44acff5 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6..ebuild
@@ -14,7 +14,7 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-10-17 Thread Michael Palimaka 
commit: 8da627627bbf229d286f89f8b3400bdafa16623e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 17 17:02:23 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 17 17:02:42 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8da62762

dev-qt/qtwebkit: solve various automagic dependencies

Gentoo-bug: 560150

Package-Manager: portage-2.2.20.1

 dev-qt/qtwebkit/metadata.xml |  3 +++
 dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild| 18 --
 dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild| 18 --
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 18 --
 dev-qt/qtwebkit/qtwebkit-5.6..ebuild | 18 --
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 18 --
 6 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0ca02a9..0aa2516 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,11 +5,14 @@

Add support for exceptions - like 
catching them
inside the event loop (recommended by upstream)
+   Enable physical position determination 
via dev-qt/qtpositioning
Enable HTML5 audio/video support via 
media-libs/gstreamer:1.0
Enable HTML5 audio/video support via 
media-libs/gstreamer:0.10
Enable HTML5 audio/video support via 
dev-qt/qtmultimedia
+   Enable device orientation detection 
via dev-qt/qtsensors
Enable printing via 
dev-qt/qtprintsupport
Build QML/QtQuick bindings
+   Enable integration with 
dev-qt/qtwebchannel
Add support for WebP image format



diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
 
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml webp"
+IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation 
printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -36,6 +36,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
+   geolocation? ( >=dev-qt/qtpositioning-${PV}:5 )
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -48,8 +49,10 @@ RDEPEND="
)
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+   orientation? ( >=dev-qt/qtsensors-${PV}:5 )
printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+   webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${RDEPEND}
@@ -75,18 +78,21 @@ src_prepare() {

Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
|| die
 
+   qt_use_disable_mod geolocation positioning 
Tools/qmake/mkspecs/features/features.prf
+   qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
+   qt_use_disable_mod orientation sensors 
Tools/qmake/mkspecs/features/features.prf
+   qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
+   qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+   qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri
+
if use gstreamer010; then
epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
elif ! use gstreamer; then
epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
fi
 
-   qt_use_disable_mod multimedia multimediawidgets 
Tools/qmake/mkspecs/features/features.prf
use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   qt_use_disable_mod printsupport printsupport 
Tools/qmake/mkspecs/features/features.prf
-   use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
-   Source/QtWebKit.pro || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
index e912401..b28a267 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild
@@ -12,9 +12,9 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2015-07-14 Thread Davide Pesavento 
commit: 03e38390e94742acee1543f33763add65d8abb49
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Wed Jul 15 01:30:45 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Wed Jul 15 01:30:45 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=03e38390

[dev-qt/qtwebkit] Sync patch name.

Package-Manager: portage-2.2.20

 ...qtwebkit-5.4.1-leveldb.patch = qtwebkit-5.4.2-system-leveldb.patch} | 0
 dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild| 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
similarity index 100%
rename from dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch
rename to dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 954a3aa..c16616b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -63,7 +63,7 @@ DEPEND=${RDEPEND}
 
 
 PATCHES=(
-   ${FILESDIR}/${PN}-5.4.1-leveldb.patch
+   ${FILESDIR}/${PN}-5.4.2-system-leveldb.patch
 )
 
 src_prepare() {

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 954a3aa..c16616b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -63,7 +63,7 @@ DEPEND=${RDEPEND}
 
 
 PATCHES=(
-   ${FILESDIR}/${PN}-5.4.1-leveldb.patch
+   ${FILESDIR}/${PN}-5.4.2-system-leveldb.patch
 )
 
 src_prepare() {

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 954a3aa..c16616b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -63,7 +63,7 @@ DEPEND=${RDEPEND}
 
 
 PATCHES=(
-   ${FILESDIR}/${PN}-5.4.1-leveldb.patch
+   ${FILESDIR}/${PN}-5.4.2-system-leveldb.patch
 )
 
 src_prepare() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2015-07-14 Thread Davide Pesavento 
commit: c1de4752dd98902b0116e040b487db93168070dc
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Wed Jul 15 01:13:45 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Wed Jul 15 01:13:45 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c1de4752

[dev-qt/qtwebkit] Extend rpath fix wrt bug #466216 comment #14.

And use sed instead of a patch, should be easier to maintain.

Package-Manager: portage-2.2.20

 dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch | 11 ---
 dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild|  7 ++-
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild |  7 ++-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   |  7 ++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
deleted file mode 100644
index 583ca6c..000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 Tools/qmake/mkspecs/features/unix/default_post.prf.bak 2015-06-23 
14:45:57.255212841 +0200
-+++ Tools/qmake/mkspecs/features/unix/default_post.prf 2015-06-23 
14:46:31.703211791 +0200
-@@ -61,8 +61,6 @@
- }
- }
- 
--contains(TEMPLATE, app): CONFIG += rpath
--
- CONFIG(debug, debug|release)|force_debug_info {
- # Make ld not cache the symbol tables of input files in memory to avoid 
memory exhaustion during the linking phase.
- !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += 
-Wl,--no-keep-memory

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 8f4987c..954a3aa 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -64,13 +64,18 @@ DEPEND=${RDEPEND}
 
 PATCHES=(
${FILESDIR}/${PN}-5.4.1-leveldb.patch
-   ${FILESDIR}/${PN}-5.5.0-rpath.patch
 )
 
 src_prepare() {
# ensure bundled library cannot be used
rm -r Source/ThirdParty/leveldb || die
 
+   # bug 466216
+   sed -i -e '/CONFIG +=/s/rpath//' \
+   
Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+   
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
+   || die
+
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch
elif ! use gstreamer; then

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 8f4987c..954a3aa 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -64,13 +64,18 @@ DEPEND=${RDEPEND}
 
 PATCHES=(
${FILESDIR}/${PN}-5.4.1-leveldb.patch
-   ${FILESDIR}/${PN}-5.5.0-rpath.patch
 )
 
 src_prepare() {
# ensure bundled library cannot be used
rm -r Source/ThirdParty/leveldb || die
 
+   # bug 466216
+   sed -i -e '/CONFIG +=/s/rpath//' \
+   
Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+   
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
+   || die
+
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch
elif ! use gstreamer; then

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 8f4987c..954a3aa 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -64,13 +64,18 @@ DEPEND=${RDEPEND}
 
 PATCHES=(
${FILESDIR}/${PN}-5.4.1-leveldb.patch
-   ${FILESDIR}/${PN}-5.5.0-rpath.patch
 )
 
 src_prepare() {
# ensure bundled library cannot be used
rm -r Source/ThirdParty/leveldb || die
 
+   # bug 466216
+   sed -i -e '/CONFIG +=/s/rpath//' \
+   
Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+   
Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf
 \
+   || die
+
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch
elif ! use gstreamer; then

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2015-07-10 Thread Davide Pesavento 
commit: e0a0c3db69c8072b7d1c8fc43f763748f1ebe7b7
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Fri Jul 10 14:48:39 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri Jul 10 14:48:39 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e0a0c3db

[dev-qt/qtwebkit:5] Apply the 5.5.0 rpath patch to 5. as well.

Package-Manager: portage-2.2.20

 dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch | 13 -
 dev-qt/qtwebkit/qtwebkit-5..ebuild   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
deleted file mode 100644
index ffe44d2..000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Avoid insecure RPATH wrt bug #466216.
-
 Tools/qmake/mkspecs/features/unix/default_post.prf
-+++ Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -60,8 +60,6 @@
- }
- }
- 
--contains(TEMPLATE, app): CONFIG += rpath
--
- CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
- # Make ld not cache the symbol tables of input files in memory to avoid 
memory exhaustion during the linking phase.
- !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += 
-Wl,--no-keep-memory

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 8f0..8f4987c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -64,7 +64,7 @@ DEPEND=${RDEPEND}
 
 PATCHES=(
${FILESDIR}/${PN}-5.4.1-leveldb.patch
-   ${FILESDIR}/${PN}-5.4.1-rpath.patch
+   ${FILESDIR}/${PN}-5.5.0-rpath.patch
 )
 
 src_prepare() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-07-10 Thread Davide Pesavento 
commit: e61b0a0b5ad9df0d38382f94d06c973e84fbec73
Author: Alexander Golikov alexws54tk AT users DOT noreply DOT github 
DOT com
AuthorDate: Fri Jul 10 14:21:45 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri Jul 10 14:21:45 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e61b0a0b

Actually add patch for qtwebkit-5.5.0

Replace patch file name in ebuild.

 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 8f0..8f4987c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -64,7 +64,7 @@ DEPEND=${RDEPEND}
 
 PATCHES=(
${FILESDIR}/${PN}-5.4.1-leveldb.patch
-   ${FILESDIR}/${PN}-5.4.1-rpath.patch
+   ${FILESDIR}/${PN}-5.5.0-rpath.patch
 )
 
 src_prepare() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/

2015-06-23 Thread Vladimir Smirnov 
commit: 496fc27d4dad703180116488ce5cbe95a2cc9f57
Author: Vladimir Smirnov civil.over AT gmail DOT com
AuthorDate: Tue Jun 23 12:50:39 2015 +
Commit: Vladimir Smirnov civil AT gentoo DOT org
CommitDate: Tue Jun 23 12:50:39 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=496fc27d

Actually add patch for qtwebkit-5.5.0

 dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
new file mode 100644
index 000..583ca6c
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
@@ -0,0 +1,11 @@
+--- Tools/qmake/mkspecs/features/unix/default_post.prf.bak 2015-06-23 
14:45:57.255212841 +0200
 Tools/qmake/mkspecs/features/unix/default_post.prf 2015-06-23 
14:46:31.703211791 +0200
+@@ -61,8 +61,6 @@
+ }
+ }
+ 
+-contains(TEMPLATE, app): CONFIG += rpath
+-
+ CONFIG(debug, debug|release)|force_debug_info {
+ # Make ld not cache the symbol tables of input files in memory to avoid 
memory exhaustion during the linking phase.
+ !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += 
-Wl,--no-keep-memory

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-06-23 Thread Vladimir Smirnov 
commit: 2416304c498b607d995e8fb3bd169ba48712016d
Author: Vladimir Smirnov civil.over AT gmail DOT com
AuthorDate: Tue Jun 23 12:50:14 2015 +
Commit: Vladimir Smirnov civil AT gentoo DOT org
CommitDate: Tue Jun 23 12:50:14 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2416304c

Fix rpath patch for qtwebkit-5.5.0_rc

 dev-qt/qtwebkit/qtwebkit-5.5.0_rc.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0_rc.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5.0_rc.ebuild
index 8f0..8f4987c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0_rc.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0_rc.ebuild
@@ -64,7 +64,7 @@ DEPEND=${RDEPEND}
 
 PATCHES=(
${FILESDIR}/${PN}-5.4.1-leveldb.patch
-   ${FILESDIR}/${PN}-5.4.1-rpath.patch
+   ${FILESDIR}/${PN}-5.5.0-rpath.patch
 )
 
 src_prepare() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2015-05-31 Thread Michael Palimaka 
commit: 4b376d4e6d5163cc9d0c9f8f4fd9c3490a210d8f
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun May 31 16:28:54 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun May 31 16:28:54 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b376d4e

[dev-qt/qtwebkit] Remove insecure RPATH wrt bug #466216.

Package-Manager: portage-2.2.20

 dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch | 13 +
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild |  5 -
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild |  5 -
 dev-qt/qtwebkit/qtwebkit-5..ebuild   |  5 -
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
new file mode 100644
index 000..ffe44d2
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-rpath.patch
@@ -0,0 +1,13 @@
+Avoid insecure RPATH wrt bug #466216.
+
+--- Tools/qmake/mkspecs/features/unix/default_post.prf
 Tools/qmake/mkspecs/features/unix/default_post.prf
+@@ -60,8 +60,6 @@
+ }
+ }
+ 
+-contains(TEMPLATE, app): CONFIG += rpath
+-
+ CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
+ # Make ld not cache the symbol tables of input files in memory to avoid 
memory exhaustion during the linking phase.
+ !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += 
-Wl,--no-keep-memory

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
index 08750fb..7812f80 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
@@ -62,7 +62,10 @@ DEPEND=${RDEPEND}
virtual/rubygems
 
 
-PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-5.4.1-leveldb.patch
+   ${FILESDIR}/${PN}-5.4.1-rpath.patch
+)
 
 src_prepare() {
# ensure bundled library cannot be used

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 88a5767..c9a2b5d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -62,7 +62,10 @@ DEPEND=${RDEPEND}
virtual/rubygems
 
 
-PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-5.4.1-leveldb.patch
+   ${FILESDIR}/${PN}-5.4.1-rpath.patch
+)
 
 src_prepare() {
# ensure bundled library cannot be used

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 88a5767..c9a2b5d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -62,7 +62,10 @@ DEPEND=${RDEPEND}
virtual/rubygems
 
 
-PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-5.4.1-leveldb.patch
+   ${FILESDIR}/${PN}-5.4.1-rpath.patch
+)
 
 src_prepare() {
# ensure bundled library cannot be used

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtquick1/, dev-qt/qtscript/

2015-05-15 Thread Davide Pesavento 
commit: fb86681c62fb2f7b8f0907984c98b66d27e193e7
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Fri May 15 10:55:51 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri May 15 10:55:51 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb86681c

[dev-qt] Note that some modules are deprecated starting with Qt 5.5

 dev-qt/qtquick1/qtquick1-5.4..ebuild | 2 +-
 dev-qt/qtquick1/qtquick1-5.5..ebuild | 2 +-
 dev-qt/qtquick1/qtquick1-5..ebuild   | 2 +-
 dev-qt/qtscript/qtscript-5.5..ebuild | 2 +-
 dev-qt/qtscript/qtscript-5..ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtquick1/qtquick1-5.4..ebuild 
b/dev-qt/qtquick1/qtquick1-5.4..ebuild
index a3ed27d..97892e5 100644
--- a/dev-qt/qtquick1/qtquick1-5.4..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION=Legacy declarative framework for Qt4 compatibility for building 
dynamic user interfaces
+DESCRIPTION=Legacy declarative UI module for the Qt5 framework
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

diff --git a/dev-qt/qtquick1/qtquick1-5.5..ebuild 
b/dev-qt/qtquick1/qtquick1-5.5..ebuild
index a3ed27d..2c402f6 100644
--- a/dev-qt/qtquick1/qtquick1-5.5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION=Legacy declarative framework for Qt4 compatibility for building 
dynamic user interfaces
+DESCRIPTION=Legacy declarative UI module for the Qt5 framework (deprecated)
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

diff --git a/dev-qt/qtquick1/qtquick1-5..ebuild 
b/dev-qt/qtquick1/qtquick1-5..ebuild
index a3ed27d..2c402f6 100644
--- a/dev-qt/qtquick1/qtquick1-5..ebuild
+++ b/dev-qt/qtquick1/qtquick1-5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION=Legacy declarative framework for Qt4 compatibility for building 
dynamic user interfaces
+DESCRIPTION=Legacy declarative UI module for the Qt5 framework (deprecated)
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

diff --git a/dev-qt/qtscript/qtscript-5.5..ebuild 
b/dev-qt/qtscript/qtscript-5.5..ebuild
index 6777b7b..f8b3a7b 100644
--- a/dev-qt/qtscript/qtscript-5.5..ebuild
+++ b/dev-qt/qtscript/qtscript-5.5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION=Application scripting library for the Qt5 framework
+DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

diff --git a/dev-qt/qtscript/qtscript-5..ebuild 
b/dev-qt/qtscript/qtscript-5..ebuild
index 6777b7b..f8b3a7b 100644
--- a/dev-qt/qtscript/qtscript-5..ebuild
+++ b/dev-qt/qtscript/qtscript-5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION=Application scripting library for the Qt5 framework
+DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 9489ec3..dbd12d7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1 qt5-build
 
-DESCRIPTION=WebKit rendering library for the Qt5 framework
+DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 9489ec3..dbd12d7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1 qt5-build
 
-DESCRIPTION=WebKit rendering library for the Qt5 framework
+DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-04-26 Thread Davide Pesavento 
commit: 0ae97df07920d82793e4c28657a96c302e388fd7
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sun Apr 26 23:12:16 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Apr 26 23:12:16 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0ae97df0

[dev-qt/qtwebkit:4] Prevent automagic dep on qt-mobility (bug 547350).

Package-Manager: portage-2.2.18

 dev-qt/qtwebkit/qtwebkit-4.8..ebuild | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
index 17b7957..8097f8b 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
@@ -47,14 +47,18 @@ QCONFIG_ADD=webkit
 QCONFIG_DEFINE=QT_WEBKIT
 
 src_prepare() {
-   # Fix version number in generated pkgconfig file, bug 406443
-   sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
-   src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
# Remove -Werror from CXXFLAGS
sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
src/3rdparty/webkit/Source/WebKit.pri || die
 
+   # Fix version number in generated pkgconfig file (bug 406443)
+   sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+   src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
+   # Prevent automagic dependency on qt-mobility (bug 547350)
+   sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \
+   src/3rdparty/webkit/Source/WebCore/features.pri || die
+
if use icu; then
sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \

src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtxmlpatterns/, dev-qt/qtquick1/, dev-qt/qtwidgets/, ...

2015-04-19 Thread Michael Palimaka 
commit: 385689d74e415826937f6e78a776e98b590bbb2e
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Apr 19 17:30:37 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Apr 19 17:30:37 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=385689d7

[dev-qt] Sync keywords with main tree.

 dev-qt/designer/designer-5.4..ebuild   | 2 +-
 dev-qt/designer/designer-5.5..ebuild   | 2 +-
 dev-qt/designer/designer-5..ebuild | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.4..ebuild   | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.5..ebuild   | 2 +-
 dev-qt/linguist-tools/linguist-tools-5..ebuild | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.4..ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.5..ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5..ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5.4..ebuild   | 2 +-
 dev-qt/qtdbus/qtdbus-5.5..ebuild   | 2 +-
 dev-qt/qtdbus/qtdbus-5..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.4..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.5..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5..ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.4..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.5..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5.4..ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5.5..ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5..ebuild | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.4..ebuild   | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.5..ebuild   | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5..ebuild | 2 +-
 dev-qt/qtquick1/qtquick1-5.4..ebuild   | 2 +-
 dev-qt/qtquick1/qtquick1-5.5..ebuild   | 2 +-
 dev-qt/qtquick1/qtquick1-5..ebuild | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5.4..ebuild | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5.5..ebuild | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.4..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5.4..ebuild | 2 +-
 dev-qt/qtsvg/qtsvg-5.5..ebuild | 2 +-
 dev-qt/qtsvg/qtsvg-5..ebuild   | 2 +-
 dev-qt/qttest/qttest-5.4..ebuild   | 2 +-
 dev-qt/qttest/qttest-5.5..ebuild   | 2 +-
 dev-qt/qttest/qttest-5..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild   | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.4..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.5..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.4..ebuild | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.5..ebuild | 2 +-
 dev-qt/qtx11extras/qtx11extras-5..ebuild   | 2 +-
 dev-qt/qtxml/qtxml-5.4..ebuild | 2 +-
 dev-qt/qtxml/qtxml-5.5..ebuild | 2 +-
 dev-qt/qtxml/qtxml-5..ebuild   | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.4..ebuild | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.5..ebuild | 2 +-
 dev-qt/qtxmlpatterns/qtxmlpatterns-5..ebuild   | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/dev-qt/designer/designer-5.4..ebuild 
b/dev-qt/designer/designer-5.4..ebuild
index d169dea..066a566 100644
--- a/dev-qt/designer/designer-5.4..ebuild
+++ b/dev-qt/designer/designer-5.4..ebuild
@@ -13,7 +13,7 @@ DESCRIPTION=WYSIWYG tool for designing and building Qt-based 
GUIs
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
 else
-   KEYWORDS=~amd64 ~arm ~hppa ~x86
+   KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
 fi
 
 IUSE=declarative webkit

diff --git a/dev-qt/designer/designer-5.5..ebuild 
b/dev-qt/designer/designer-5.5..ebuild
index d169dea..066a566 100644
--- a/dev-qt/designer/designer-5.5..ebuild
+++ b/dev-qt/designer/designer-5.5..ebuild
@@ -13,7 +13,7 @@ DESCRIPTION=WYSIWYG tool for designing and building Qt-based 
GUIs
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
 else
-   KEYWORDS=~amd64 ~arm ~hppa ~x86
+   KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
 fi
 
 IUSE=declarative webkit

diff --git a/dev-qt/designer/designer-5..ebuild 
b/dev-qt/designer/designer-5..ebuild
index d169dea..066a566 100644
--- a/dev-qt/designer/designer-5..ebuild
+++

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-03-25 Thread Davide Pesavento 
commit: 36f38f5bc528352ac59bbdc9866293f0f24a58d6
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Thu Mar 26 01:43:22 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Thu Mar 26 01:43:22 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=36f38f5b

[dev-qt/qtwebkit:5] Raise zlib dep based on the bundled copy version.

Package-Manager: portage-2.2.18

 dev-qt/qtwebkit/qtwebkit-5.4..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
index 8d53be1..1d4e88d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
@@ -34,7 +34,7 @@ RDEPEND=
=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
-   sys-libs/zlib
+   =sys-libs/zlib-1.2.5
virtual/jpeg:0
virtual/opengl
x11-libs/libX11

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 8d53be1..1d4e88d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -34,7 +34,7 @@ RDEPEND=
=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
-   sys-libs/zlib
+   =sys-libs/zlib-1.2.5
virtual/jpeg:0
virtual/opengl
x11-libs/libX11

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 8d53be1..1d4e88d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -34,7 +34,7 @@ RDEPEND=
=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
-   sys-libs/zlib
+   =sys-libs/zlib-1.2.5
virtual/jpeg:0
virtual/opengl
x11-libs/libX11

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-03-15 Thread Michael Palimaka 
commit: daa797d94e8158f4bacb01d31b75cc4eb1db22bf
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Mar 15 14:43:35 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Mar 15 14:43:35 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=daa797d9

[dev-qt/qtwebkit] Remove bundled library to ensure it cannot be used.

Package-Manager: portage-2.2.17

 dev-qt/qtwebkit/qtwebkit-5.4..ebuild | 3 +++
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 3 +++
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
index 48021cc..0cfb6a9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
@@ -69,6 +69,9 @@ DEPEND=${RDEPEND}
 PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
 
 src_prepare() {
+   # ensure bundled library cannot be used
+   rm -r Source/ThirdParty/leveldb || die
+
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch
elif ! use gstreamer; then

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 48021cc..0cfb6a9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -69,6 +69,9 @@ DEPEND=${RDEPEND}
 PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
 
 src_prepare() {
+   # ensure bundled library cannot be used
+   rm -r Source/ThirdParty/leveldb || die
+
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch
elif ! use gstreamer; then

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 48021cc..0cfb6a9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -69,6 +69,9 @@ DEPEND=${RDEPEND}
 PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
 
 src_prepare() {
+   # ensure bundled library cannot be used
+   rm -r Source/ThirdParty/leveldb || die
+
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch
elif ! use gstreamer; then

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2015-03-14 Thread Michael Palimaka 
commit: fa9569964aba22b7849b2a91b38d4479e3a6293e
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Mar 14 18:20:44 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Mar 14 18:20:44 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa956996

[dev-qt/qtwebkit] Ensure system copy of dev-libs/leveldb is used wrt bug 
#519190.

Package-Manager: portage-2.2.17

 dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch | 25 ++
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild   |  3 +++
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild   |  3 +++
 dev-qt/qtwebkit/qtwebkit-5..ebuild |  3 +++
 4 files changed, 34 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch
new file mode 100644
index 000..0a476c6
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp
 Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include leveldb/db.h
+ #include leveldb/env.h
+-#include helpers/memenv/memenv.h
++#include leveldb/helpers/memenv.h
+ 
+ int main(int, char**)
+ {
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
 Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include leveldb/comparator.h
+ #include leveldb/db.h
+ #include leveldb/env.h
+-#include helpers/memenv/memenv.h
++#include leveldb/helpers/memenv.h
+ #include leveldb/slice.h
+ #include string
+ #include wtf/PassOwnPtr.h

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
index 568f10e..48021cc 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RDEPEND=
dev-db/sqlite:3
dev-libs/icu:=
+   =dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
=dev-qt/qtcore-${PV}:5[debug=,icu]
@@ -65,6 +66,8 @@ DEPEND=${RDEPEND}
virtual/rubygems
 
 
+PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
+
 src_prepare() {
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index 568f10e..48021cc 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RDEPEND=
dev-db/sqlite:3
dev-libs/icu:=
+   =dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
=dev-qt/qtcore-${PV}:5[debug=,icu]
@@ -65,6 +66,8 @@ DEPEND=${RDEPEND}
virtual/rubygems
 
 
+PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
+
 src_prepare() {
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 568f10e..48021cc 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RDEPEND=
dev-db/sqlite:3
dev-libs/icu:=
+   =dev-libs/leveldb-1.18-r1
dev-libs/libxml2:2
dev-libs/libxslt
=dev-qt/qtcore-${PV}:5[debug=,icu]
@@ -65,6 +66,8 @@ DEPEND=${RDEPEND}
virtual/rubygems
 
 
+PATCHES=( ${FILESDIR}/${PN}-5.4.1-leveldb.patch )
+
 src_prepare() {
if use gstreamer010; then
epatch ${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-03-05 Thread Michael Palimaka 
commit: e8f5e70aae66355348780cbff3817fa099a3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Mar  5 09:48:57 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Mar  5 09:48:57 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e8f5e70a

[dev-qt/qtwebkit] Add missing dependency wrt bug #540124.

Package-Manager: portage-2.2.17

 dev-qt/qtwebkit/qtwebkit-5.4..ebuild | 1 +
 dev-qt/qtwebkit/qtwebkit-5.5..ebuild | 1 +
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
index af9e2f8..568f10e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
@@ -62,6 +62,7 @@ DEPEND=${RDEPEND}
dev-util/gperf
sys-devel/bison
sys-devel/flex
+   virtual/rubygems
 
 
 src_prepare() {

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
index af9e2f8..568f10e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5..ebuild
@@ -62,6 +62,7 @@ DEPEND=${RDEPEND}
dev-util/gperf
sys-devel/bison
sys-devel/flex
+   virtual/rubygems
 
 
 src_prepare() {

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index af9e2f8..568f10e 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -62,6 +62,7 @@ DEPEND=${RDEPEND}
dev-util/gperf
sys-devel/bison
sys-devel/flex
+   virtual/rubygems
 
 
 src_prepare() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2015-01-11 Thread Davide Pesavento 
commit: 901eb3b9b165b6ec51bbb6d18c37454503001f96
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sun Jan 11 18:17:29 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Jan 11 18:17:29 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=901eb3b9

[dev-qt/qtwebkit:5] Add missing dep wrt bug 536188

Package-Manager: portage-2.2.15

---
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild | 1 +
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
index cc1567b..7acc8d9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4..ebuild
@@ -59,6 +59,7 @@ RDEPEND=
 DEPEND=${RDEPEND}
${PYTHON_DEPS}
dev-lang/ruby
+   dev-util/gperf
sys-devel/bison
sys-devel/flex
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index cc1567b..7acc8d9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -59,6 +59,7 @@ RDEPEND=
 DEPEND=${RDEPEND}
${PYTHON_DEPS}
dev-lang/ruby
+   dev-util/gperf
sys-devel/bison
sys-devel/flex

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2014-10-22 Thread Michael Palimaka 
commit: a4aa2ab527a53d34537b9deaa89333e83611e365
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Oct 22 17:19:40 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Oct 22 17:27:11 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4aa2ab5

[dev-qt/qtwebkit] Remove libxml2 and xslt USE flags wrt bug #511594.

Package-Manager: portage-2.2.12

---
 dev-qt/qtwebkit/metadata.xml   |  2 --
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild   | 13 +++--
 dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild | 13 +++--
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild   | 13 +++--
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 13 +++--
 5 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0d4bcf5..b8a1666 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,12 +7,10 @@
inside the event loop (recommended by Nokia)/flag
flag name=gstreamerEnable HTML5 audio/video support via 
pkgmedia-libs/gstreamer:1.0/pkg/flag
flag name=gstreamer010Enable HTML5 audio/video support via 
pkgmedia-libs/gstreamer:0.10/pkg/flag
-   flag name=libxml2Use pkgdev-libs/libxml2/pkg for XML 
parsing/flag
flag name=multimediaEnable HTML5 audio/video support via 
pkgdev-qt/qtmultimedia/pkg/flag
flag name=printsupportEnable printing via 
pkgdev-qt/qtprintsupport/pkg/flag
flag name=qmlBuild QML/QtQuick bindings/flag
flag name=webpAdd support for WebP image format/flag
-   flag name=xsltEnable XSLT support/flag
/use
upstream
bugs-tohttps://bugreports.qt-project.org//bugs-to

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE=gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev 
webp xslt
+IUSE=gstreamer gstreamer010 multimedia opengl printsupport qml udev webp
 REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 
 RDEPEND=
dev-db/sqlite:3
dev-libs/icu:=
+   dev-libs/libxml2:2
+   dev-libs/libxslt
=dev-qt/qtcore-${PV}:5[debug=,icu]
=dev-qt/qtgui-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]
@@ -47,17 +49,12 @@ RDEPEND=
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10
)
-   libxml2? ( dev-libs/libxml2:2 )
multimedia? ( =dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
printsupport? ( =dev-qt/qtprintsupport-${PV}:5[debug=] )
qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
-   xslt? (
-   libxml2? ( dev-libs/libxslt )
-   !libxml2? ( =dev-qt/qtxmlpatterns-${PV}:5[debug=] )
-   )
 
 DEPEND=${RDEPEND}
${PYTHON_DEPS}
@@ -72,8 +69,6 @@ src_prepare() {
elif ! use gstreamer; then
epatch ${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch
fi
-   use libxml2  || sed -i -e '/config_libxml2: WEBKIT_CONFIG += 
use_libxml2/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
use multimedia   || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
Tools/qmake/mkspecs/features/features.prf || die
use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
@@ -86,8 +81,6 @@ src_prepare() {
Tools/qmake/mkspecs/features/features.prf || die
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += 
xslt/d' \
-   Tools/qmake/mkspecs/features/features.prf || die
 
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE=gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev 
webp xslt
+IUSE=gstreamer gstreamer010 multimedia opengl printsupport qml udev webp
 REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 
 RDEPEND=
dev-db/sqlite:3
dev-libs/icu:=
+   dev-libs/libxml2:2
+   dev-libs/libxslt

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2014-09-28 Thread Davide Pesavento 
commit: e05968d78e17714ec6460919414d151c35647347
Author: Uwe L. Korn uwelk AT xhochy DOT com
AuthorDate: Sun Sep 28 16:06:09 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Sep 28 16:06:09 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e05968d7

[dev-qt/qtwebkit] Remove gone widgets use from metadata

---
 dev-qt/qtwebkit/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 952e31f..bedee28 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -11,8 +11,6 @@
flag name=printsupportEnable printing via 
pkgdev-qt/qtprintsupport/pkg/flag
flag name=qmlBuild QML/QtQuick bindings/flag
flag name=webpAdd support for WebP image format/flag
-   flag name=widgetsBuild various things that depend on 
pkgdev-qt/qtwidgets/pkg,
-   e.g. the WebKitWidgets library/flag
flag name=xsltEnable XSLT support/flag
/use
upstream

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2014-09-28 Thread Davide Pesavento 
commit: 3fd03fd010e224ebbdb1586e7d5ef70b5b525400
Author: Uwe L. Korn uwelk AT xhochy DOT com
AuthorDate: Sat Sep 27 12:52:46 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Sep 28 15:57:33 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3fd03fd0

[dev-qt/qtwebkit] Rework HTML5 A/V backend

 * Fixes bug #523518
 * Instead of simply depending on gstreamer, add a separate USE for
   gstreamer:0.10 to clearly specify which slot should be linked to.
 * Specifying multimedia while having gstreamer* selected does not
   enable the use of qtmultimedia. It will only be selected if we build
   with neither of both gstreamer versions

---
 .../files/qtwebkit-5.3.2-use-gstreamer010.patch  | 18 ++
 dev-qt/qtwebkit/metadata.xml |  3 ++-
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 20 +++-
 dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild  | 20 +++-
 dev-qt/qtwebkit/qtwebkit-5.4..ebuild | 20 +++-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 20 +++-
 6 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
new file mode 100644
index 000..1c02e45
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
@@ -0,0 +1,18 @@
+--- Tools/qmake/mkspecs/features/features.prf  2014-09-27 11:09:50.010617142 
+0100
 Tools/qmake/mkspecs/features/features.prf  2014-09-27 11:17:10.741678989 
+0100
+@@ -96,14 +96,8 @@
+ use?(3d_graphics): WEBKIT_CONFIG += webgl
+ 
+ # HTML5 Media Support for builds with GStreamer
+-unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+-packagesExist(glib-2.0 gio-2.0 gstreamer-1.0 
gstreamer-plugins-base-1.0) {
+-WEBKIT_CONFIG += video use_gstreamer
+-} else: packagesExist(glib-2.0 gio-2.0 \'gstreamer-0.10 = 0.10.30\' 
\'gstreamer-plugins-base-0.10 = 0.10.30\') {
+-WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-}
++WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+ use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+-}
+ 
+ !enable?(video):qtHaveModule(multimediawidgets) {
+ WEBKIT_CONFIG += video use_qt_multimedia

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 952e31f..5a4718c 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,7 +5,8 @@
use
flag name=exceptionsAdd support for exceptions - like 
catching them
inside the event loop (recommended by Nokia)/flag
-   flag name=gstreamerEnable HTML5 audio/video support via 
pkgmedia-libs/gstreamer/pkg/flag
+   flag name=gstreamerEnable HTML5 audio/video support via 
pkgmedia-libs/gstreamer:1.0/pkg/flag
+   flag name=gstreamer010Enable HTML5 audio/video support via 
pkgmedia-libs/gstreamer:0.10/pkg/flag
flag name=libxml2Use pkgdev-libs/libxml2/pkg for XML 
parsing/flag
flag name=multimediaEnable HTML5 audio/video support via 
pkgdev-qt/qtmultimedia/pkg/flag
flag name=printsupportEnable printing via 
pkgdev-qt/qtprintsupport/pkg/flag

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
index 0238091..f59c599 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
@@ -18,7 +18,8 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE=gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt
+IUSE=gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev 
webp xslt
+REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 
 RDEPEND=
dev-db/sqlite:3
@@ -38,11 +39,16 @@ RDEPEND=
x11-libs/libXrender
gstreamer? (
dev-libs/glib:2
-   =media-libs/gstreamer-0.10.30:0.10
-   =media-libs/gst-plugins-base-0.10.30:0.10
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   gstreamer010? (
+   dev-libs/glib:2
+   media-libs/gstreamer:0.10
+   media-libs/gst-plugins-base:0.10
)
libxml2? ( dev-libs/libxml2:2 )
-   multimedia? ( =dev-qt/qtmultimedia-${PV}:5[debug=] )
+   multimedia? ( =dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
printsupport? ( =dev-qt/qtprintsupport-${PV}:5[debug=] )
qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
@@ -61,7 +67,11 @@ DEPEND=${RDEPEND}
 
 
 src_prepare() {
-   use gstreamer|| epatch 
${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch
+   if use gstreamer010; then
+   epatch

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2014-09-01 Thread Davide Pesavento 
commit: 395fa2b0f99c28da6ebf4c93ae6837927049925d
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Sep  1 23:55:48 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Sep  1 23:55:48 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=395fa2b0

[dev-qt/qtwebkit:4] Raise minimum deps to ensure correct multilib USE deps.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild| 10 +-
 dev-qt/qtwebkit/qtwebkit-4.8..ebuild | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index bc6ee6b..5592bbd 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -18,17 +18,17 @@ IUSE=+gstreamer icu +jit
 
 # libxml2[!icu?] is needed for bugs 407315 and 411091
 DEPEND=
-   dev-db/sqlite:3[${MULTILIB_USEDEP}]
+   =dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXrender[${MULTILIB_USEDEP}]
+   =x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+   =x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
-   =media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}]
-   =media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
+   =media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
+   
=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
)
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
 

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
index bc6ee6b..5592bbd 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
@@ -18,17 +18,17 @@ IUSE=+gstreamer icu +jit
 
 # libxml2[!icu?] is needed for bugs 407315 and 411091
 DEPEND=
-   dev-db/sqlite:3[${MULTILIB_USEDEP}]
+   =dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXrender[${MULTILIB_USEDEP}]
+   =x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+   =x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
-   =media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}]
-   =media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
+   =media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
+   
=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
)
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2014-06-24 Thread Michael Palimaka 
commit: 99df390c1aca00ed26be791bae90a5e10b727068
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Jun 24 14:10:55 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Jun 24 14:13:37 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=99df390c

[dev-qt/qtwebkit] Remove patch wrt bug #514924.

The code the patch removes has been removed upstream.

Package-Manager: portage-2.2.10

---
 .../qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch  | 17 -
 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild   |  1 -
 dev-qt/qtwebkit/qtwebkit-4.8..ebuild|  1 -
 3 files changed, 19 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch 
b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
deleted file mode 100644
index d29d5da..000
--- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN 
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 
qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri
 
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri   
   2012-04-28 12:39:16.884473572 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri   
2012-04-28 12:41:14.245006363 +0200
-@@ -3,13 +3,6 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
- 
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
--message(Using gold linker)
--QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
--
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
- CONFIG += production

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index fcddbfe..d3719f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -35,7 +35,6 @@ DEPEND=
 RDEPEND=${DEPEND}
 
 PATCHES=(
-   ${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch
${FILESDIR}/4.8.2-javascriptcore-x32.patch
 )
 

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
index fcddbfe..d3719f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
@@ -35,7 +35,6 @@ DEPEND=
 RDEPEND=${DEPEND}
 
 PATCHES=(
-   ${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch
${FILESDIR}/4.8.2-javascriptcore-x32.patch
 )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/, dev-qt/qtphonon/

2014-06-14 Thread Davide Pesavento 
commit: bab7203f3705349ad607c075a523734cca4668d2
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat Jun 14 23:53:54 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat Jun 14 23:53:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bab7203f

[dev-qt/qt{phonon,webkit}:4] Add MULTILIB_USEDEP for gstreamer deps.

---
 dev-qt/qtphonon/qtphonon-4.8.6.ebuild| 4 ++--
 dev-qt/qtphonon/qtphonon-4.8..ebuild | 4 ++--
 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild| 4 ++--
 dev-qt/qtwebkit/qtwebkit-4.8..ebuild | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild 
b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
index fb5979b..be7dca9 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -21,8 +21,8 @@ DEPEND=
~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
aqua? ( 
~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=,${MULTILIB_USEDEP}] )
!aqua? (
-   media-libs/gstreamer:0.10
-   media-plugins/gst-plugins-meta:0.10
+   media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+   media-plugins/gst-plugins-meta:0.10[${MULTILIB_USEDEP}]
)
dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
!kde-base/phonon-kde

diff --git a/dev-qt/qtphonon/qtphonon-4.8..ebuild 
b/dev-qt/qtphonon/qtphonon-4.8..ebuild
index fb5979b..be7dca9 100644
--- a/dev-qt/qtphonon/qtphonon-4.8..ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8..ebuild
@@ -21,8 +21,8 @@ DEPEND=
~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
aqua? ( 
~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=,${MULTILIB_USEDEP}] )
!aqua? (
-   media-libs/gstreamer:0.10
-   media-plugins/gst-plugins-meta:0.10
+   media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+   media-plugins/gst-plugins-meta:0.10[${MULTILIB_USEDEP}]
)
dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
!kde-base/phonon-kde

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index 1434a14..fcddbfe 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -27,8 +27,8 @@ DEPEND=
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
-   =media-libs/gstreamer-0.10.36:0.10
-   =media-libs/gst-plugins-base-0.10.36:0.10
+   =media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}]
+   =media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
)
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
 

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
index 1434a14..fcddbfe 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8..ebuild
@@ -27,8 +27,8 @@ DEPEND=
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
-   =media-libs/gstreamer-0.10.36:0.10
-   =media-libs/gst-plugins-base-0.10.36:0.10
+   =media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}]
+   =media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
)
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2014-06-10 Thread Michael Palimaka 
commit: bd77962e259106904eee1544b4ab93ec4619127b
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Jun 10 07:57:54 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Jun 10 07:57:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bd77962e

[dev-qt/qtwebkit] Remove Python 2.6 support.

Package-Manager: portage-2.2.10

---
 dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild| 2 +-
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild
index d3914c6..96c19c4 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1 qt5-build
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
index 6667b33..5622849 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1 qt5-build
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 6667b33..5622849 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1 qt5-build

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2014-05-26 Thread Davide Pesavento 
commit: c7f784224f25d0304e56378850a3f1d176e03a98
Author: Uwe L. Korn uwelk AT xhochy DOT com
AuthorDate: Mon May 26 11:28:33 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon May 26 11:28:33 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c7f78422

[dev-qt/qtwebkit] Add subslot dependency for icu

Package-Manager: portage-2.2.10

---
 dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild| 1 +
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 1 +
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild
index aa625b9..d3914c6 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.0.ebuild
@@ -22,6 +22,7 @@ IUSE=gstreamer libxml2 multimedia opengl printsupport qml 
udev webp widgets xsl
 
 RDEPEND=
dev-db/sqlite:3
+   dev-libs/icu:=
=dev-qt/qtcore-${PV}:5[debug=,icu]
=dev-qt/qtgui-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
index 9b5046c..6667b33 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
@@ -22,6 +22,7 @@ IUSE=gstreamer libxml2 multimedia opengl printsupport qml 
udev webp widgets xsl
 
 RDEPEND=
dev-db/sqlite:3
+   dev-libs/icu:=
=dev-qt/qtcore-${PV}:5[debug=,icu]
=dev-qt/qtgui-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]

diff --git a/dev-qt/qtwebkit/qtwebkit-5..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5..ebuild
index 9b5046c..6667b33 100644
--- a/dev-qt/qtwebkit/qtwebkit-5..ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5..ebuild
@@ -22,6 +22,7 @@ IUSE=gstreamer libxml2 multimedia opengl printsupport qml 
udev webp widgets xsl
 
 RDEPEND=
dev-db/sqlite:3
+   dev-libs/icu:=
=dev-qt/qtcore-${PV}:5[debug=,icu]
=dev-qt/qtgui-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

2014-05-18 Thread Davide Pesavento 
commit: 9990afda36c5d276b01dbf0533e8d2d30069087d
Author: Axel Rasmussen axel.rasmussen1 AT gmail DOT com
AuthorDate: Sat May 17 05:35:08 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun May 18 19:36:13 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9990afda

[dev-qt/qtwebkit:5] Add printsupport USE flag

This commit updates the =dev-qt/qtwebkit-5.3.0_rc ebuild to allow for
enabling/disabling of its qtprintsupport dependency.

---
 dev-qt/qtwebkit/metadata.xml |  1 +
 dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild | 25 ++---
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild | 25 ++---
 dev-qt/qtwebkit/qtwebkit-5..ebuild   | 25 ++---
 4 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 7676f35..952e31f 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -8,6 +8,7 @@
flag name=gstreamerEnable HTML5 audio/video support via 
pkgmedia-libs/gstreamer/pkg/flag
flag name=libxml2Use pkgdev-libs/libxml2/pkg for XML 
parsing/flag
flag name=multimediaEnable HTML5 audio/video support via 
pkgdev-qt/qtmultimedia/pkg/flag
+   flag name=printsupportEnable printing via 
pkgdev-qt/qtprintsupport/pkg/flag
flag name=qmlBuild QML/QtQuick bindings/flag
flag name=webpAdd support for WebP image format/flag
flag name=widgetsBuild various things that depend on 
pkgdev-qt/qtwidgets/pkg,

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
index 80b12e7..9b5046c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
@@ -16,9 +16,9 @@ else
KEYWORDS=~amd64
 fi
 
-# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE=gstreamer libxml2 multimedia opengl qml udev webp widgets xslt
+IUSE=gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets 
xslt
 
 RDEPEND=
dev-db/sqlite:3
@@ -42,6 +42,7 @@ RDEPEND=
libxml2? ( dev-libs/libxml2:2 )
multimedia? ( =dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
+   printsupport? ( =dev-qt/qtprintsupport-${PV}:5[debug=] )
qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
@@ -64,22 +65,24 @@ pkg_setup() {
 }
 
 src_prepare() {
-   use gstreamer  || epatch 
${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch
-   use libxml2|| sed -i -e '/config_libxml2: WEBKIT_CONFIG += 
use_libxml2/d' \
+   use gstreamer|| epatch 
${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch
+   use libxml2  || sed -i -e '/config_libxml2: WEBKIT_CONFIG += 
use_libxml2/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use multimedia || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
+   use multimedia   || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use opengl || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
+   use opengl   || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use qml|| sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' 
\
+   use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' 
\
+   Tools/qmake/mkspecs/features/features.prf || die
+   use qml  || sed -i -e '/have?(QTQUICK): SUBDIRS += 
declarative/d' \
Source/QtWebKit.pro || die
-   use udev   || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+   use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use webp   || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
+   use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
Tools/qmake/mkspecs/features/features.prf || die
-   use widgets|| sed -i -e '/SUBDIRS += webkitwidgets/d' \
+   use widgets  || sed -i -e '/SUBDIRS += webkitwidgets/d' \
Source/QtWebKit.pro || die
-   use xslt   || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+   use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += 
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
 
# bug 458222

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
index 80b12e7..9b5046c 100644
---

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/

2014-03-25 Thread Davide Pesavento 
commit: b329efb084c05ffb8ba4ca65bf6ba2b2cb8190c8
Author: Uwe L. Korn uwelk AT xhochy DOT com
AuthorDate: Fri Mar 21 12:45:03 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Tue Mar 25 16:26:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b329efb0

[dev-qt/qtwebkit:5] Remove automagic dependencies.

Package-Manager: portage-2.2.8-r1

---
 .../files/qtwebkit-5.2.1-disable-gstreamer.patch   | 15 +++
 dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild  | 29 +-
 dev-qt/qtwebkit/qtwebkit-5.3..ebuild   | 29 +-
 dev-qt/qtwebkit/qtwebkit-5..ebuild | 29 +-
 4 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
new file mode 100644
index 000..05e41a1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- Tools/qmake/mkspecs/features/features.prf  2014-03-19 18:35:47.795676444 
+
 Tools/qmake/mkspecs/features/features.prf  2014-03-19 18:36:38.602433220 
+
+@@ -99,12 +99,6 @@
+ 
+ # HTML5 Media Support for builds with GStreamer
+ unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+-packagesExist(glib-2.0 gio-2.0 gstreamer-1.0 
gstreamer-plugins-base-1.0) {
+-WEBKIT_CONFIG += video use_gstreamer
+-} else: packagesExist(glib-2.0 gio-2.0 \'gstreamer-0.10 = 0.10.30\' 
\'gstreamer-plugins-base-0.10 = 0.10.30\') {
+-WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-}
+-use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+ }
+ 
+ !enable?(video):qtHaveModule(multimediawidgets) {

diff --git a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,17 +17,16 @@ else
 fi
 
 # TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
 
 IUSE=gstreamer libxml2 multimedia opengl qml udev webp widgets xslt
 
 RDEPEND=
-   dev-db/sqlite
+   dev-db/sqlite:3
=dev-qt/qtcore-${PV}:5[debug=,icu]
=dev-qt/qtgui-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]
=dev-qt/qtsql-${PV}:5[debug=]
-   media-libs/fontconfig
+   media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND=
=media-libs/gstreamer-0.10.30:0.10
=media-libs/gst-plugins-base-0.10.30:0.10
)
-   libxml2? ( dev-libs/libxml2 )
+   libxml2? ( dev-libs/libxml2:2 )
multimedia? ( =dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( =dev-qt/qtopengl-${PV}:5[debug=] )
qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
-   webp? ( media-libs/libwebp:= )
+   webp? ( media-libs/libwebp:0= )
widgets? ( =dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
 }
 
 src_prepare() {
+   use gstreamer  || epatch 
${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch
+   use libxml2|| sed -i -e '/config_libxml2: WEBKIT_CONFIG += 
use_libxml2/d' \
+   Tools/qmake/mkspecs/features/features.prf || die
+   use multimedia || sed -i -e '/WEBKIT_CONFIG += video 
use_qt_multimedia/d' \
+   Tools/qmake/mkspecs/features/features.prf || die
+   use opengl || sed -i -e '/contains(QT_CONFIG, opengl): 
WEBKIT_CONFIG += use_3d_graphics/d' \
+   Tools/qmake/mkspecs/features/features.prf || die
+   use qml|| sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' 
\
+   Source/QtWebKit.pro || die
+   use udev   || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+   Tools/qmake/mkspecs/features/features.prf || die
+   use webp   || sed -i -e '/config_libwebp: WEBKIT_CONFIG += 
use_webp/d' \
+   Tools/qmake/mkspecs/features/features.prf || die
+   use widgets|| sed -i -e '/SUBDIRS += webkitwidgets/d' \
+   Source/QtWebKit.pro || die
+   use xslt   || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+   Tools/qmake/mkspecs/features/features.prf || die
+
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3..ebuild
+++