1 |
commit: 4392aa6a07280e9416d643b1f12cd3812b309747 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 27 23:29:26 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 27 23:29:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4392aa6a |
7 |
|
8 |
www-client/vivaldi: Old. |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
|
12 |
www-client/vivaldi/Manifest | 2 - |
13 |
.../files/vivaldi-1.11.917.43_p1-libffmpeg.patch | 27 ----- |
14 |
www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild | 128 --------------------- |
15 |
3 files changed, 157 deletions(-) |
16 |
|
17 |
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest |
18 |
index ba3d87425b4..fe7d4d46f1e 100644 |
19 |
--- a/www-client/vivaldi/Manifest |
20 |
+++ b/www-client/vivaldi/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST vivaldi-1.12.955.48_p1-amd64.deb 50790158 BLAKE2B 873c6246c0b5392332e220c4f1dd6549be6134c8f3e0475972edd55fafe5fdda59e4f23f26d8337502663085175878466ae680caf075da807233660842837724 SHA512 c3075ce2711859f547d79f6b8a22b253a308f702bcff841b707601fa19665d220b8851f202d96a57f28f387087875055a8b94a3798e7e6176398854ab5d32d58 |
23 |
-DIST vivaldi-1.12.955.48_p1-i386.deb 51640720 BLAKE2B 413574323c847a249b7ddf7c545aa495fe69eb0e97d3a5e60ab81fb5f7c5ac171fc00445f1aa6d9ff1c62d3131f208c6798725f694327fda6fa88ac961aee287 SHA512 8a59fa3b4efcdcae82ffafe2ec0b6506d42cd96d6f72c9317708222f2bd94391744b38b1a267702c80144cc6aa842cddcd2b963871306825f403d9a50ddd3f29 |
24 |
DIST vivaldi-1.13.1008.32_p1-amd64.deb 49248234 BLAKE2B 8c9051fd749e37b85f601fe9ba4fd1ac7a5251ef4acd0584fd929ff29d8cd9f70a7e121b56325ffe857774a972cf378541bd81a56f1311b77f0cbb4414c7cbae SHA512 a8f003c2391b80cdaf64feaeef09fed318f03806276bfc2a40369ad6aea0acd70cdb18e674d3407a9ebd6bf1920998461531795d6eac676fae5a94118e4913b5 |
25 |
DIST vivaldi-1.13.1008.32_p1-i386.deb 50138250 BLAKE2B 4e76e4d78fc2ac0093d25750fc38b0594784d85673d8520f520bca8788d6515bf7bb83148e994f52a61a31c72f79ce6b5152c38e06fed58aabe6453c3d05106b SHA512 ef0024038a35cc35e083f0652c5025e327ab39c653d3e44cb188949b8c75704b6cb7e325a87cf17999e8045f6f398841d523fc6bce215dc2caebaf9d63f56653 |
26 |
|
27 |
diff --git a/www-client/vivaldi/files/vivaldi-1.11.917.43_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.11.917.43_p1-libffmpeg.patch |
28 |
deleted file mode 100644 |
29 |
index a0861913d33..00000000000 |
30 |
--- a/www-client/vivaldi/files/vivaldi-1.11.917.43_p1-libffmpeg.patch |
31 |
+++ /dev/null |
32 |
@@ -1,27 +0,0 @@ |
33 |
---- a/opt/vivaldi/vivaldi |
34 |
-+++ b/opt/vivaldi/vivaldi |
35 |
-@@ -32,14 +32,14 @@ |
36 |
- # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version |
37 |
- # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h |
38 |
- if [ -r "$1" ]; then |
39 |
-- if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then |
40 |
-+# if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then |
41 |
- if [[ -n "$LD_PRELOAD" ]]; then |
42 |
- export LD_PRELOAD="$LD_PRELOAD:$1" |
43 |
- else |
44 |
- export LD_PRELOAD="$1" |
45 |
- fi |
46 |
- export VIVALDI_FFMPEG_FOUND=YES |
47 |
-- fi |
48 |
-+# fi |
49 |
- fi |
50 |
- fi |
51 |
- fi |
52 |
-@@ -54,6 +54,7 @@ |
53 |
- # Check for libs in order that they are most likely to appear. |
54 |
- # Where possible, use other files/directories to confirm it's the correct variant. |
55 |
- VIVALDI_FFMPEG_FOUND=NO |
56 |
-+checkffmpeg "/usr/lib64/chromium/libffmpeg.so" |
57 |
- checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra' |
58 |
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra' |
59 |
- |
60 |
|
61 |
diff --git a/www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild |
62 |
deleted file mode 100644 |
63 |
index d177d9c59be..00000000000 |
64 |
--- a/www-client/vivaldi/vivaldi-1.12.955.48_p1.ebuild |
65 |
+++ /dev/null |
66 |
@@ -1,128 +0,0 @@ |
67 |
-# Copyright 1999-2017 Gentoo Foundation |
68 |
-# Distributed under the terms of the GNU General Public License v2 |
69 |
- |
70 |
-EAPI=5 |
71 |
-CHROMIUM_LANGS=" |
72 |
- am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi |
73 |
- hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv |
74 |
- sw ta te th tr uk vi zh-CN zh-TW |
75 |
-" |
76 |
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils |
77 |
- |
78 |
-#VIVALDI_BRANCH="snapshot" |
79 |
- |
80 |
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}" |
81 |
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}" |
82 |
-VIVALDI_HOME="opt/${VIVALDI_BIN}" |
83 |
-DESCRIPTION="A new browser for our friends" |
84 |
-HOMEPAGE="http://vivaldi.com/" |
85 |
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_" |
86 |
-SRC_URI=" |
87 |
- amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) |
88 |
- x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb ) |
89 |
-" |
90 |
- |
91 |
-LICENSE="Vivaldi" |
92 |
-SLOT="0" |
93 |
-KEYWORDS="-* amd64 x86" |
94 |
-RESTRICT="bindist mirror" |
95 |
- |
96 |
-DEPEND=" |
97 |
- virtual/libiconv |
98 |
-" |
99 |
-RDEPEND=" |
100 |
- dev-libs/expat |
101 |
- dev-libs/glib:2 |
102 |
- dev-libs/nspr |
103 |
- dev-libs/nss |
104 |
- >=dev-libs/openssl-1.0.1:0 |
105 |
- gnome-base/gconf:2 |
106 |
- media-libs/alsa-lib |
107 |
- media-libs/fontconfig |
108 |
- media-libs/freetype |
109 |
- net-misc/curl |
110 |
- net-print/cups |
111 |
- sys-apps/dbus |
112 |
- sys-libs/libcap |
113 |
- x11-libs/cairo |
114 |
- x11-libs/gdk-pixbuf |
115 |
- x11-libs/gtk+:2 |
116 |
- x11-libs/libX11 |
117 |
- x11-libs/libXScrnSaver |
118 |
- x11-libs/libXcomposite |
119 |
- x11-libs/libXcursor |
120 |
- x11-libs/libXdamage |
121 |
- x11-libs/libXext |
122 |
- x11-libs/libXfixes |
123 |
- x11-libs/libXi |
124 |
- x11-libs/libXrandr |
125 |
- x11-libs/libXrender |
126 |
- x11-libs/libXtst |
127 |
- x11-libs/pango[X] |
128 |
-" |
129 |
-QA_PREBUILT="*" |
130 |
-S=${WORKDIR} |
131 |
- |
132 |
-src_unpack() { |
133 |
- unpack_deb ${A} |
134 |
-} |
135 |
- |
136 |
-src_prepare() { |
137 |
- iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die |
138 |
- mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die |
139 |
- |
140 |
- sed -i \ |
141 |
- -e "s|${VIVALDI_BIN}|${PN}|g" \ |
142 |
- usr/share/applications/${VIVALDI_PN}.desktop \ |
143 |
- usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die |
144 |
- |
145 |
- mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die |
146 |
- chmod 0755 usr/share/doc/${PF} || die |
147 |
- |
148 |
- rm \ |
149 |
- _gpgbuilder \ |
150 |
- etc/cron.daily/${VIVALDI_BIN} \ |
151 |
- ${VIVALDI_HOME}/libwidevinecdm.so \ |
152 |
- || die |
153 |
- rmdir \ |
154 |
- etc/cron.daily/ \ |
155 |
- etc/ \ |
156 |
- || die |
157 |
- |
158 |
- local c d |
159 |
- for d in 16 22 24 32 48 64 128 256; do |
160 |
- mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die |
161 |
- cp \ |
162 |
- ${VIVALDI_HOME}/product_logo_${d}.png \ |
163 |
- usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die |
164 |
- done |
165 |
- |
166 |
- pushd "${VIVALDI_HOME}/locales" > /dev/null || die |
167 |
- chromium_remove_language_paks |
168 |
- popd > /dev/null || die |
169 |
- |
170 |
- epatch "${FILESDIR}"/${PN}-1.11.917.43_p1-libffmpeg.patch |
171 |
- |
172 |
- epatch_user |
173 |
-} |
174 |
- |
175 |
-src_install() { |
176 |
- mv * "${D}" || die |
177 |
- dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} |
178 |
- |
179 |
- fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox |
180 |
-} |
181 |
- |
182 |
-pkg_preinst() { |
183 |
- gnome2_icon_savelist |
184 |
-} |
185 |
- |
186 |
-pkg_postrm() { |
187 |
- gnome2_icon_cache_update |
188 |
- xdg_desktop_database_update |
189 |
-} |
190 |
- |
191 |
-pkg_postinst() { |
192 |
- gnome2_icon_cache_update |
193 |
- xdg_desktop_database_update |
194 |
-} |