[gentoo-commits] proj/qt:qtbase59 commit in: www-client/qupzilla/

[gentoo-commits] proj/qt:qtbase59 commit in: www-client/qupzilla/

[Michael Palimaka]

commit:     79f540fd9be7bb24c35f2e1481be2d86fb96a47e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 26 14:50:03 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 14:50:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=79f540fd

www-client/qupzilla: Sync w/ tree - USE=kwallet, https, deps

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-client/qupzilla/metadata.xml         | 27 ++++++++++++++-------------
 www-client/qupzilla/qupzilla-9999.ebuild | 12 ++++++------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index 5f0517cc..b2c82f81 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <use>
-    <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
-      shown inside the page, not blocking the application window. When closing
-      browser windows with open dialogs, this can crash the application.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">QupZilla/qupzilla</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+		<flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
+			shown inside the page, not blocking the application window. When closing
+			browser windows with open dialogs, this can crash the application.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">QupZilla/qupzilla</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild
index ef2a574d..0fc69015 100644
--- a/www-client/qupzilla/qupzilla-9999.ebuild
+++ b/www-client/qupzilla/qupzilla-9999.ebuild
@@ -25,15 +25,14 @@ else
 fi
 
 DESCRIPTION="A cross-platform web browser using QtWebEngine"
-HOMEPAGE="http://www.qupzilla.com/"
+HOMEPAGE="https://www.qupzilla.com/"
 SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs"
+IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
 
 RDEPEND="
-	>=dev-qt/qtconcurrent-5.8:5
 	>=dev-qt/qtcore-5.8:5
 	>=dev-qt/qtdeclarative-5.8:5[widgets]
 	>=dev-qt/qtgui-5.8:5
@@ -47,12 +46,13 @@ RDEPEND="
 	x11-libs/libxcb:=
 	dbus? ( >=dev-qt/qtdbus-5.8:5 )
 	gnome-keyring? ( gnome-base/gnome-keyring )
-	kde? ( kde-frameworks/kwallet:5 )
+	kwallet? ( kde-frameworks/kwallet:5 )
 	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/linguist-tools-5.8:5
+	>=dev-qt/qtconcurrent-5.8:5
 	virtual/pkgconfig
 "
 
@@ -95,7 +95,7 @@ src_configure() {
 		DEBUG_BUILD=$(usex debug true '') \
 		DISABLE_DBUS=$(usex dbus '' true) \
 		GNOME_INTEGRATION=$(usex gnome-keyring true '') \
-		KDE_INTEGRATION=$(usex kde true '') \
+		KDE_INTEGRATION=$(usex kwallet true '') \
 		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
 
 	eqmake5