1 |
commit: 79f540fd9be7bb24c35f2e1481be2d86fb96a47e |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Aug 26 14:50:03 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 26 14:50:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=79f540fd |
7 |
|
8 |
www-client/qupzilla: Sync w/ tree - USE=kwallet, https, deps |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
www-client/qupzilla/metadata.xml | 27 ++++++++++++++------------- |
13 |
www-client/qupzilla/qupzilla-9999.ebuild | 12 ++++++------ |
14 |
2 files changed, 20 insertions(+), 19 deletions(-) |
15 |
|
16 |
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml |
17 |
index 5f0517cc..b2c82f81 100644 |
18 |
--- a/www-client/qupzilla/metadata.xml |
19 |
+++ b/www-client/qupzilla/metadata.xml |
20 |
@@ -1,17 +1,18 @@ |
21 |
<?xml version="1.0" encoding="UTF-8"?> |
22 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
23 |
<pkgmetadata> |
24 |
- <maintainer type="project"> |
25 |
- <email>qt@g.o</email> |
26 |
- <name>Gentoo Qt Project</name> |
27 |
- </maintainer> |
28 |
- <use> |
29 |
- <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs |
30 |
- shown inside the page, not blocking the application window. When closing |
31 |
- browser windows with open dialogs, this can crash the application. |
32 |
- </flag> |
33 |
- </use> |
34 |
- <upstream> |
35 |
- <remote-id type="github">QupZilla/qupzilla</remote-id> |
36 |
- </upstream> |
37 |
+ <maintainer type="project"> |
38 |
+ <email>qt@g.o</email> |
39 |
+ <name>Gentoo Qt Project</name> |
40 |
+ </maintainer> |
41 |
+ <use> |
42 |
+ <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag> |
43 |
+ <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs |
44 |
+ shown inside the page, not blocking the application window. When closing |
45 |
+ browser windows with open dialogs, this can crash the application. |
46 |
+ </flag> |
47 |
+ </use> |
48 |
+ <upstream> |
49 |
+ <remote-id type="github">QupZilla/qupzilla</remote-id> |
50 |
+ </upstream> |
51 |
</pkgmetadata> |
52 |
|
53 |
diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild |
54 |
index ef2a574d..0fc69015 100644 |
55 |
--- a/www-client/qupzilla/qupzilla-9999.ebuild |
56 |
+++ b/www-client/qupzilla/qupzilla-9999.ebuild |
57 |
@@ -25,15 +25,14 @@ else |
58 |
fi |
59 |
|
60 |
DESCRIPTION="A cross-platform web browser using QtWebEngine" |
61 |
-HOMEPAGE="http://www.qupzilla.com/" |
62 |
+HOMEPAGE="https://www.qupzilla.com/" |
63 |
SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz" |
64 |
|
65 |
LICENSE="GPL-3" |
66 |
SLOT="0" |
67 |
-IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs" |
68 |
+IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs" |
69 |
|
70 |
RDEPEND=" |
71 |
- >=dev-qt/qtconcurrent-5.8:5 |
72 |
>=dev-qt/qtcore-5.8:5 |
73 |
>=dev-qt/qtdeclarative-5.8:5[widgets] |
74 |
>=dev-qt/qtgui-5.8:5 |
75 |
@@ -47,12 +46,13 @@ RDEPEND=" |
76 |
x11-libs/libxcb:= |
77 |
dbus? ( >=dev-qt/qtdbus-5.8:5 ) |
78 |
gnome-keyring? ( gnome-base/gnome-keyring ) |
79 |
- kde? ( kde-frameworks/kwallet:5 ) |
80 |
+ kwallet? ( kde-frameworks/kwallet:5 ) |
81 |
libressl? ( dev-libs/libressl:= ) |
82 |
- !libressl? ( dev-libs/openssl:0 ) |
83 |
+ !libressl? ( dev-libs/openssl:0= ) |
84 |
" |
85 |
DEPEND="${RDEPEND} |
86 |
>=dev-qt/linguist-tools-5.8:5 |
87 |
+ >=dev-qt/qtconcurrent-5.8:5 |
88 |
virtual/pkgconfig |
89 |
" |
90 |
|
91 |
@@ -95,7 +95,7 @@ src_configure() { |
92 |
DEBUG_BUILD=$(usex debug true '') \ |
93 |
DISABLE_DBUS=$(usex dbus '' true) \ |
94 |
GNOME_INTEGRATION=$(usex gnome-keyring true '') \ |
95 |
- KDE_INTEGRATION=$(usex kde true '') \ |
96 |
+ KDE_INTEGRATION=$(usex kwallet true '') \ |
97 |
NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '') |
98 |
|
99 |
eqmake5 |