commit: 5f79006dd5952b9b832557b698ceddd3ed7c824e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 22:13:11 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 22:21:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f79006d
www-client/vivaldi-snapshot: Install icons with newicon
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
index 6a8463950f6..73a74a24df6 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
@@ -76,7 +76,7 @@ CHROMIUM_LANGS="
zh-CN
zh-TW
"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg
+inherit chromium-2 desktop multilib unpacker toolchain-funcs xdg
VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
VIVALDI_HOME="opt/${PN}"
@@ -164,14 +164,6 @@ src_prepare() {
etc/ \
|| die
- local c d
- for d in 16 22 24 32 48 64 128 256; do
- mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
- cp \
- ${VIVALDI_HOME}/product_logo_${d}.png \
- usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
- done
-
# Remove scripts that will most likely break things.
rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
@@ -189,6 +181,13 @@ src_install() {
fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+ local logo size
+ for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+ size=${logo##*_}
+ size=${size%.*}
+ newicon -s "${size}" "${logo}" ${PN}.png
+ done
+
if use proprietary-codecs; then
dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \
/${VIVALDI_HOME}/lib/libffmpeg.so
