1 |
commit: 429d211b13cfd976895270e875e506d0194c719d |
2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 27 03:50:19 2021 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 27 04:18:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429d211b |
7 |
|
8 |
www-client/qutebrowser: add USE=adblock, other improvements |
9 |
|
10 |
- Add USE=adblock, enable it by default. |
11 |
- Mask adblock on x86 and arm64, as dev-python/adblock is not |
12 |
keyworded there yet. |
13 |
- Drop scripts flag from IUSE. There is no reason not to install |
14 |
userscripts. Let's always install them. |
15 |
- Install scripts from "scripts" directory (not just "userscripts"). |
16 |
|
17 |
Closes: https://bugs.gentoo.org/773643 |
18 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
19 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
20 |
|
21 |
profiles/arch/arm64/package.use.mask | 4 ++ |
22 |
profiles/arch/x86/package.use.mask | 4 ++ |
23 |
www-client/qutebrowser/metadata.xml | 2 + |
24 |
...er-2.2.3.ebuild => qutebrowser-2.2.3-r1.ebuild} | 62 +++++++++++----------- |
25 |
4 files changed, 41 insertions(+), 31 deletions(-) |
26 |
|
27 |
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask |
28 |
index cfa6f8f09ee..e9bd1aaf19c 100644 |
29 |
--- a/profiles/arch/arm64/package.use.mask |
30 |
+++ b/profiles/arch/arm64/package.use.mask |
31 |
@@ -1,6 +1,10 @@ |
32 |
# Copyright 1999-2021 Gentoo Authors |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
+# Stefan Strogin <steils@g.o> (2021-06-27) |
36 |
+# Requires dev-python/adblock which is not keyworded on arm64 yet |
37 |
+www-client/qutebrowser adblock |
38 |
+ |
39 |
# Sam James <sam@g.o> (2021-04-14) |
40 |
# Supports 64-bit NEON |
41 |
# Note: libpng-compat 1.5.30 does NOT seem to. |
42 |
|
43 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
44 |
index f33dedb8b8d..9532c7c62a5 100644 |
45 |
--- a/profiles/arch/x86/package.use.mask |
46 |
+++ b/profiles/arch/x86/package.use.mask |
47 |
@@ -1,6 +1,10 @@ |
48 |
# Copyright 1999-2021 Gentoo Authors |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
|
51 |
+# Stefan Strogin <steils@g.o> (2021-06-27) |
52 |
+# Requires dev-python/adblock which is not keyworded on x86 yet |
53 |
+www-client/qutebrowser adblock |
54 |
+ |
55 |
# Andreas Sturmlechner <asturm@g.o> (2020-04-25) |
56 |
# Depends on either unkeyworded dev-java/openjdk:11 |
57 |
# or unavailable >=dev-java/icedtea-4, bug #785640 |
58 |
|
59 |
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml |
60 |
index c915949c2ca..8eb60f40da2 100644 |
61 |
--- a/www-client/qutebrowser/metadata.xml |
62 |
+++ b/www-client/qutebrowser/metadata.xml |
63 |
@@ -17,6 +17,8 @@ |
64 |
<remote-id type="github">qutebrowser/qutebrowser</remote-id> |
65 |
</upstream> |
66 |
<use> |
67 |
+ <flag name="adblock">Enable Brave's ABP-style adblocker library |
68 |
+ for improved adblocking</flag> |
69 |
<flag name="scripts">Installs userscripts from the misc/userscripts |
70 |
directory to /usr/share/qutebrowser/userscripts.</flag> |
71 |
</use> |
72 |
|
73 |
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild |
74 |
similarity index 60% |
75 |
rename from www-client/qutebrowser/qutebrowser-2.2.3.ebuild |
76 |
rename to www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild |
77 |
index ab48622e1e2..a546f877c3d 100644 |
78 |
--- a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild |
79 |
+++ b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild |
80 |
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
81 |
LICENSE="GPL-3" |
82 |
SLOT="0" |
83 |
KEYWORDS="~amd64 ~arm64 ~x86" |
84 |
-IUSE="scripts test" |
85 |
+IUSE="+adblock test" |
86 |
|
87 |
BDEPEND="app-text/asciidoc" |
88 |
RDEPEND="dev-python/colorama[${PYTHON_USEDEP}] |
89 |
@@ -26,7 +26,8 @@ RDEPEND="dev-python/colorama[${PYTHON_USEDEP}] |
90 |
dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
91 |
>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml] |
92 |
dev-python/typing-extensions[${PYTHON_USEDEP}] |
93 |
- dev-python/zipp[${PYTHON_USEDEP}]" |
94 |
+ dev-python/zipp[${PYTHON_USEDEP}] |
95 |
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )" |
96 |
|
97 |
distutils_enable_tests setup.py |
98 |
|
99 |
@@ -39,39 +40,38 @@ python_compile_all() { |
100 |
} |
101 |
|
102 |
python_install_all() { |
103 |
+ insinto /usr/share/metainfo |
104 |
+ doins misc/org.qutebrowser.qutebrowser.appdata.xml |
105 |
doman doc/${PN}.1 |
106 |
domenu misc/org.${PN}.${PN}.desktop |
107 |
+ for s in 16 24 32 48 64 128 256 512; do |
108 |
+ doicon -s ${s} icons/qutebrowser-${s}x${s}.png |
109 |
+ done |
110 |
doicon -s scalable icons/${PN}.svg |
111 |
|
112 |
- if use scripts; then |
113 |
- insinto /usr/share/qutebrowser/userscripts/ |
114 |
- doins misc/userscripts/README.md |
115 |
- exeinto /usr/share/qutebrowser/userscripts/ |
116 |
- doexe misc/userscripts/add-nextcloud-bookmarks \ |
117 |
- misc/userscripts/add-nextcloud-cookbook \ |
118 |
- misc/userscripts/cast \ |
119 |
- misc/userscripts/dmenu_qutebrowser \ |
120 |
- misc/userscripts/format_json \ |
121 |
- misc/userscripts/getbib \ |
122 |
- misc/userscripts/kodi \ |
123 |
- misc/userscripts/open_download \ |
124 |
- misc/userscripts/openfeeds \ |
125 |
- misc/userscripts/password_fill \ |
126 |
- misc/userscripts/qr \ |
127 |
- misc/userscripts/qute-bitwarden \ |
128 |
- misc/userscripts/qutedmenu \ |
129 |
- misc/userscripts/qute-keepass \ |
130 |
- misc/userscripts/qute-keepassxc \ |
131 |
- misc/userscripts/qute-lastpass \ |
132 |
- misc/userscripts/qute-pass \ |
133 |
- misc/userscripts/readability \ |
134 |
- misc/userscripts/readability-js \ |
135 |
- misc/userscripts/ripbang \ |
136 |
- misc/userscripts/rss \ |
137 |
- misc/userscripts/taskadd \ |
138 |
- misc/userscripts/tor_identity \ |
139 |
- misc/userscripts/view_in_mpv |
140 |
- fi |
141 |
+ insinto /usr/share/qutebrowser/userscripts |
142 |
+ doins misc/userscripts/README.md |
143 |
+ exeinto /usr/share/qutebrowser/userscripts |
144 |
+ for f in misc/userscripts/*; do |
145 |
+ if [[ "${f}" == "__pycache__" ]]; then |
146 |
+ continue |
147 |
+ fi |
148 |
+ doexe "${f}" |
149 |
+ done |
150 |
+ |
151 |
+ exeinto /usr/share/qutebrowser/scripts |
152 |
+ for f in scripts/*; do |
153 |
+ if [[ "${f}" == "scripts/__init__.py" || \ |
154 |
+ "${f}" == "scripts/__pycache__" || \ |
155 |
+ "${f}" == "scripts/dev" || \ |
156 |
+ "${f}" == "scripts/testbrowser" || \ |
157 |
+ "${f}" == "scripts/asciidoc2html.py" || \ |
158 |
+ "${f}" == "scripts/setupcommon.py" || \ |
159 |
+ "${f}" == "scripts/link_pyqt.py" ]]; then |
160 |
+ continue |
161 |
+ fi |
162 |
+ doexe "${f}" |
163 |
+ done |
164 |
|
165 |
distutils-r1_python_install_all |
166 |
} |