summaryrefslogtreecommitdiff
path: root/www-client
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/Manifest.gzbin6883 -> 6881 bytes
-rw-r--r--www-client/chromium/Manifest11
-rw-r--r--www-client/chromium/chromium-63.0.3239.108.ebuild662
-rw-r--r--www-client/chromium/chromium-64.0.3282.140.ebuild (renamed from www-client/chromium/chromium-64.0.3282.119.ebuild)3
-rw-r--r--www-client/chromium/chromium-64.0.3282.85.ebuild678
-rw-r--r--www-client/chromium/chromium-65.0.3315.3.ebuild1
-rw-r--r--www-client/chromium/files/chromium-ffmpeg-r0.patch21
-rw-r--r--www-client/conkeror/Manifest8
-rw-r--r--www-client/conkeror/conkeror-1.0.3.ebuild59
-rw-r--r--www-client/conkeror/conkeror-1.0.4.ebuild6
-rw-r--r--www-client/conkeror/conkeror-1.0_pre20140212.ebuild4
-rw-r--r--www-client/conkeror/files/conkeror.sh (renamed from www-client/conkeror/files/conkeror-r2.sh)0
-rw-r--r--www-client/opera-developer/Manifest4
-rw-r--r--www-client/opera-developer/opera-developer-52.0.2857.0.ebuild (renamed from www-client/opera-developer/opera-developer-52.0.2850.0.ebuild)0
-rw-r--r--www-client/opera/Manifest4
-rw-r--r--www-client/opera/opera-51.0.2830.26.ebuild (renamed from www-client/opera/opera-50.0.2762.58.ebuild)0
-rw-r--r--www-client/phantomjs/Manifest4
-rw-r--r--www-client/phantomjs/phantomjs-2.1.1-r1.ebuild99
-rw-r--r--www-client/qupzilla/Manifest2
-rw-r--r--www-client/qupzilla/qupzilla-2.2.4-r1.ebuild120
-rw-r--r--www-client/surfraw/Manifest3
-rw-r--r--www-client/surfraw/files/surfraw-2.3.0-completion.patch43
-rw-r--r--www-client/surfraw/surfraw-2.3.0.ebuild87
-rw-r--r--www-client/uget/Manifest4
-rw-r--r--www-client/uget/metadata.xml13
-rw-r--r--www-client/uget/uget-2.2.0.ebuild62
-rw-r--r--www-client/vivaldi-snapshot/Manifest12
-rw-r--r--www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1090.3_p1.ebuild (renamed from www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1089.3_p1.ebuild)1
-rw-r--r--www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1094.3_p1.ebuild119
-rw-r--r--www-client/vivaldi/Manifest5
-rw-r--r--www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch10
-rw-r--r--www-client/vivaldi/vivaldi-1.14.1077.45_p1.ebuild129
32 files changed, 623 insertions, 1551 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 4668682e1fde..1bca12292afa 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
Binary files differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 666a5948b6dd..c75a04a43768 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,6 +4,7 @@ AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c2
AUX chromium-clang-r1.patch 808 BLAKE2B f3f6cfc679b65f214e6667dc29e4241ae9344be02b5cddd1c25a6410c205e3ad1cf182719b4ba795a5b065fc736c0175803fdaad66439ed2989fc27ff9a12758 SHA512 dfb81895fb78983e5adba54351d94e9174aa6a523c5a78738aad8223330cde6739dea6d82328d603f693a2d5810df890eccc4bed202d73875c9c97be506936e5
AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1feace304c6db309460b74f630dd59c424f152ebf6a1d88025c14b7162d14a38afde6e74a87ca04d3424fd9b6 SHA512 f5edc9b573269a7a6944e17019fa858e7162c548400eceabdabe695d7e10d3179b7593415ec3eaef226defdd1628fd8c9cc66c0b46ebe6ac1afe5035a319c379
AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005
+AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5
AUX chromium-gcc-r0.patch 2344 BLAKE2B f7fdff3e72e57c222e02a202fffa6785eeb90408094099b8e04cd8cecfc5cd5006801ffaafaa8561a4402ee5fa4bd8b9f489ac6ac3e34c212a683f5793c21124 SHA512 0e29192c8637b050c4976455c798ce0dc078c1e92ec0ed51da71866c2d35242e720f4ca468a431e8ea696700c8ef003a71e8ec06c573bab5355b96e8388a2844
AUX chromium-gcc-u2f.patch 1670 BLAKE2B 9d83331ec5e9d4ef3b58e9119c7c152abe61daf8b32e168662de9e734d935c24913b603c631d148ed1cb7b5364e751cbb9bcc7e58e5c34f375958898fc0cf8f5 SHA512 f10486ef46940fa740ca2d7e8225924704a4f89b709ef3dfb7ad128865982c220f8971d169515d9d1be08ee112aef1cac95281f0a5af4615256d9760966545f1
AUX chromium-gcc5-r4.patch 3648 BLAKE2B 44ad25ba69e100f7df35a2532ad1c8e55acf9dbbdcb1c28000c755748ef62848d325c7e379e06d1a0567dbda0e3f97808755ef90e2b7a197aa74a786d0280ca0 SHA512 6b6d80c8adfbb317003712b94cfdf733af48ee5f32d10b6f6e8599cd08b7a9d8b73e6cec2902ed55eb0a962ba9c9cf14a70299e132ec7bfec29806ed23836791
@@ -15,16 +16,12 @@ AUX chromium-vulkan-r0.patch 4070 BLAKE2B d4b272fce24bee6a961f58d2f4ef74ddf6a56e
AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-63.0.3239.108.tar.xz 534294640 BLAKE2B f0f87115e91d7a2aa331cbab05475cac098f6ec37b8ca82b6a84911edcf0104a89557304467704911a3f3b3232d8a83d575bd545df1c31518e50c2563d83c095 SHA512 3cb7c8569d2d061f5abf4ad68d9ea1716a1b07bdf8dfa7b600d558d308374ff5dbda9f947e67e21186e3e716fe9524fc63e8eabd9eac1fa805f0eb7d994c32c8
DIST chromium-63.0.3239.132.tar.xz 534286424 BLAKE2B 52658d4e8ff50bb8bdb1d397bc90a36e73407810198c4f28eea29bd0a4ad98bd4af947bdb8a5ecdbd73a248be8f375ba80c74c9a097aa57ef51eed1dc440ff95 SHA512 96e9ebdf1c3dc14a914bee50ced9547d5a94838ed602552379711ba67f00381173059ceb8a552efadd3175ceaa4cb6c15902fe582fc2eba7b7bdb8a19f47d1a0
-DIST chromium-64.0.3282.119.tar.xz 482256308 BLAKE2B 786a03cfa5affbf1d3e0b69d6094ca1bdea953cd88a91c8f9df50c35e01f7d24908cb986f59672f904c693027778b01437a68eba2b0f57a328f6091bedaa6b55 SHA512 5ad3e110dcecd8f37a98c32ff8837e6b1f81c3375afdcb03c0375aebe148a2f2f49b6dc91bd3565d25e29bc587fbc9721062d2f04cee647b3cfdadd03437865a
-DIST chromium-64.0.3282.85.tar.xz 482224568 BLAKE2B f8650721a2a30ea7f9c651efab58c54a225d7dda177c924c2ade132d488bb4b415e6155426384a005bafbcff5affbc99e142f45c85042cc6367e17c88c806f12 SHA512 52842b4f8304b4eb4e8fb25b586e0d03af5a5d0aebe2fc9ae517f97e05ee5ece3f71fd2b48a4f148fccec859b13c98a669ccbb4183d99ebd3bcf7e617ca241d0
+DIST chromium-64.0.3282.140.tar.xz 482252896 BLAKE2B 68d71353fca6f6022119baeeb4db42722d82a9f2d2c1738b372cc8d35b58ee5fada8af96b08ffc3599555b4f9f41be29eed2df3cc43ce4e5f3a94db07ac8efff SHA512 84a559e594d544ce3784b2d30831bd0cf4ef04896c0d107793b158f996aac0a41b731ed0c0fb751da2e06de7202df8235348468ff28fb4aef6e8cfb56ab0d89d
DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
-EBUILD chromium-63.0.3239.108.ebuild 19852 BLAKE2B dcdf02aa189a5a184395d69a4e4d854d1860453a257b59e0393104a628c3603c1f717fab4803785b87a22bc4d9ea66c3de88cc9f5f3b1b44e08871f210b04314 SHA512 889e192997c46188590b5ede0b79c1a5abe9bff0bc7b4e1464b6cebad494d26158977d942764d143c36a475063d97aaee925d7d1155e5cfb74d654fd82fc348f
EBUILD chromium-63.0.3239.132.ebuild 20062 BLAKE2B 5f3131a161c5993743a9294337ff5dd9a69aad085199367518ecfe461b92f51c4633a5e68ef9098b53121381e5ba28d9c8731871c54c5183f75bd5329e15b7a7 SHA512 b78f21944f38fa42883c51e2ffccbaa0e2ea07382b12964fc3104d9ff1a59511efd94b6954ff79f7025b535fe1655b4bde443ca794b950972e0682e5c431b37f
-EBUILD chromium-64.0.3282.119.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
-EBUILD chromium-64.0.3282.85.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
+EBUILD chromium-64.0.3282.140.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
EBUILD chromium-65.0.3298.3.ebuild 20478 BLAKE2B 6a47301263f82cfbc260e6af2c4234ae70863b904cbdc9a069174ba8e0e195b92331662ff51f412e46a0d622bf9beb70a0900366dbcb54c24170cbdc34d85e13 SHA512 1341dbc98ae59d67db968bea7b41ef9be82e140ff17afbef9d0578cb91bcb82f74f2c411a80c50818dd77a9dd04d792c8a34edd76b485eaab96b9a9354fc6baf
-EBUILD chromium-65.0.3315.3.ebuild 20473 BLAKE2B 9f2680782bd95007807fc7e484e9637175cf9a5929a5e85ca3c2845cffbb07bdf2976c72d7c4534e78db553d8dcc1d7c5361dab2e6465abca1f988b4f6705b62 SHA512 20e4e17943324632170627e70cda0107bdd59ccec9ed7766cf984ea4782ba58f8199658fb7ac9080d31472cb78195c79f92b04345ee8715b43e3d65c3158fcb4
+EBUILD chromium-65.0.3315.3.ebuild 20513 BLAKE2B e32383801314add6f6997a26e0a11c091b38f8cc27e4ba974c8ba96a6a01707c67f9118a37204af993a15d3746755f0e504b17afda7a33be2dc98a9a75f33142 SHA512 27c13ce2174e0f0fff75b54946760fdc58976330e9c5ba2e52ccdf9bf5c3c9c8d4577db3246b6e754447af11d08ce7588f1957953920cee96b0e189540ca1ca3
MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild b/www-client/chromium/chromium-63.0.3239.108.ebuild
deleted file mode 100644
index b696500ab6ef..000000000000
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ /dev/null
@@ -1,662 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi 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 sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
- app-arch/bzip2:=
- cups? ( >=net-print/cups-1.3.11:= )
- dev-libs/expat:=
- dev-libs/glib:2
- system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- >=dev-libs/re2-0.2016.05.01:=
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-1.5.0:=[icu(-)]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
- >=media-libs/openh264-1.6.0:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-3:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- !=net-fs/samba-4.5.12
- media-libs/opus:=
- )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !=www-client/chromium-9999
- !<www-plugins/chrome-binary-plugins-57
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
- >=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-6.9.4
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
- $(python_gen_any_dep '
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- ')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
- has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
- has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-widevine-r1.patch"
- "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
- "${FILESDIR}/${PN}-gcc5-r4.patch"
- "${FILESDIR}/${PN}-clang-r1.patch"
- "${FILESDIR}/${PN}-webrtc-r0.patch"
- "${FILESDIR}/${PN}-gcc5-r5.patch"
-)
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
- # bugs: #601654
- die "At least clang 3.9.1 is required"
- fi
- if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
- # bugs: #535730, #525374, #518668, #600288, #627356
- die "At least gcc 5.0 is required"
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="5G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="25G"
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- eshopts_pop
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- # Make sure the build system will use the right python, bug #344367.
- python-any-r1_pkg_setup
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- third_party/WebKit
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/blink
- third_party/boringssl
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/polymer
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_2
- third_party/cld_3
- third_party/crc32c
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/freetype
- third_party/glslang-angle
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/modp_b64
- third_party/mt19937ar
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/openmax_dl
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/build
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/qcms
- third_party/sfntly
- third_party/skia
- third_party/skia/third_party/gif
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/spirv-tools-angle
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/subzero
- third_party/usrsctp
- third_party/vulkan
- third_party/vulkan-validation-layers
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/widevine
- third_party/woff2
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/third_party/inspector_protocol
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-libvpx; then
- keeplibs+=( third_party/libvpx )
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- fi
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
- if tc-is-cross-compiler; then
- local -x AR=${BUILD_AR}
- local -x CC=${BUILD_CC}
- local -x CXX=${BUILD_CXX}
- local -x NM=${BUILD_NM}
- local -x CFLAGS=${BUILD_CFLAGS}
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- einfo "Building GN..."
- set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
- echo "$@"
- "$@" || die
-}
-
-src_configure() {
- local myconf_gn=""
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libpng
- libwebp
- libxml
- libxslt
- openh264
- re2
- snappy
- yasm
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-libvpx; then
- gn_system_libraries+=( libvpx )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=true"
-
- # Optional dependencies.
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gconf=false"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # https://bugs.gentoo.org/588596
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- if ! use system-ffmpeg; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- bootstrap_gn
-
- einfo "Configuring Chromium..."
- set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-
- # Work around circular dep issue
- # https://chromium-review.googlesource.com/c/chromium/src/+/617768
- eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- if use widevine; then
- # These will be provided by chrome-binary-plugins
- rm out/Release/libwidevinecdm*.so || die
- fi
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- doins out/Release/*.so
-
- if ! use system-icu; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/resources
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser \
- "Chromium" \
- chromium-browser \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-64.0.3282.119.ebuild b/www-client/chromium/chromium-64.0.3282.140.ebuild
index f9d0c892ec16..a87d5daac9e1 100644
--- a/www-client/chromium/chromium-64.0.3282.119.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.140.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
@@ -151,6 +151,7 @@ PATCHES=(
"${FILESDIR}/chromium-cups-r0.patch"
"${FILESDIR}/chromium-clang-r2.patch"
"${FILESDIR}/chromium-angle-r0.patch"
+ "${FILESDIR}/chromium-ffmpeg-r0.patch"
)
pre_build_checks() {
diff --git a/www-client/chromium/chromium-64.0.3282.85.ebuild b/www-client/chromium/chromium-64.0.3282.85.ebuild
deleted file mode 100644
index f9d0c892ec16..000000000000
--- a/www-client/chromium/chromium-64.0.3282.85.ebuild
+++ /dev/null
@@ -1,678 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi 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 sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
- app-accessibility/at-spi2-atk:2
- app-arch/bzip2:=
- cups? ( >=net-print/cups-1.3.11:= )
- dev-libs/atk
- dev-libs/expat:=
- dev-libs/glib:2
- system-icu? ( >=dev-libs/icu-59:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- >=dev-libs/re2-0.2016.05.01:=
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-1.5.0:=[icu(-)]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
- >=media-libs/openh264-1.6.0:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-3:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- !=net-fs/samba-4.5.12
- media-libs/opus:=
- )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !=www-client/chromium-9999
- !<www-plugins/chrome-binary-plugins-57
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
- >=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-6.9.4
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
- $(python_gen_any_dep '
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- ')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
- has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
- has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
- "${FILESDIR}/chromium-widevine-r1.patch"
- "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
- "${FILESDIR}/chromium-webrtc-r0.patch"
- "${FILESDIR}/chromium-memcpy-r0.patch"
- "${FILESDIR}/chromium-cups-r0.patch"
- "${FILESDIR}/chromium-clang-r2.patch"
- "${FILESDIR}/chromium-angle-r0.patch"
-)
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
- # bugs: #601654
- die "At least clang 3.9.1 is required"
- fi
- if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
- # bugs: #535730, #525374, #518668, #600288, #627356
- die "At least gcc 5.0 is required"
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="5G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="25G"
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- eshopts_pop
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- third_party/WebKit
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/polymer
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/crc32c
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/freetype
- third_party/glslang-angle
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/modp_b64
- third_party/mt19937ar
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/openmax_dl
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/build
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/qcms
- third_party/sfntly
- third_party/skia
- third_party/skia/third_party/gif
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/spirv-tools-angle
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/subzero
- third_party/usrsctp
- third_party/vulkan
- third_party/vulkan-validation-layers
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/widevine
- third_party/woff2
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/third_party/inspector_protocol
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-libvpx; then
- keeplibs+=( third_party/libvpx )
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- fi
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
- if tc-is-cross-compiler; then
- local -x AR=${BUILD_AR}
- local -x CC=${BUILD_CC}
- local -x CXX=${BUILD_CXX}
- local -x NM=${BUILD_NM}
- local -x CFLAGS=${BUILD_CFLAGS}
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- einfo "Building GN..."
- set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
- echo "$@"
- "$@" || die
-}
-
-src_configure() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local myconf_gn=""
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libpng
- libwebp
- libxml
- libxslt
- openh264
- re2
- snappy
- yasm
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-libvpx; then
- gn_system_libraries+=( libvpx )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=true"
-
- # Optional dependencies.
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gconf=false"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
- # Disable forced lld, bug 641556
- myconf_gn+=" use_lld=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # https://bugs.gentoo.org/588596
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- if ! use system-ffmpeg; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- bootstrap_gn
-
- einfo "Configuring Chromium..."
- set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-
- # Work around circular dep issue
- # https://chromium-review.googlesource.com/c/chromium/src/+/617768
- eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- if use widevine; then
- # These will be provided by chrome-binary-plugins
- rm out/Release/libwidevinecdm*.so || die
- fi
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- doins out/Release/*.so
-
- if ! use system-icu; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/resources
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser \
- "Chromium" \
- chromium-browser \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-65.0.3315.3.ebuild
index b8011501a833..c2d2f2fcaf78 100644
--- a/www-client/chromium/chromium-65.0.3315.3.ebuild
+++ b/www-client/chromium/chromium-65.0.3315.3.ebuild
@@ -152,6 +152,7 @@ PATCHES=(
"${FILESDIR}/chromium-gn-r0.patch"
"${FILESDIR}/chromium-vulkan-r0.patch"
"${FILESDIR}/chromium-gcc-r0.patch"
+ "${FILESDIR}/chromium-ffmpeg-r0.patch"
)
pre_build_checks() {
diff --git a/www-client/chromium/files/chromium-ffmpeg-r0.patch b/www-client/chromium/files/chromium-ffmpeg-r0.patch
new file mode 100644
index 000000000000..40632235babc
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r0.patch
@@ -0,0 +1,21 @@
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -632,18 +632,8 @@
+ if 'win' not in target_os:
+ configure_flags['Common'].extend([
+ '--enable-pic',
+- '--cc=clang',
+- '--cxx=clang++',
+- '--ld=clang',
+ ])
+
+- # Clang Linux will use the first 'ld' it finds on the path, which will
+- # typically be the system one, so explicitly configure use of Clang's
+- # ld.lld, to ensure that things like cross-compilation and LTO work.
+- # This does not work for arm64, ia32 and is always used on mac.
+- if target_arch not in ['arm64', 'ia32'] and target_os != 'mac':
+- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
+-
+ # Should be run on Mac.
+ if target_os == 'mac':
+ if host_os != 'mac':
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 490f058fd728..23c9218cac69 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,10 +1,8 @@
-AUX conkeror-r2.sh 342 BLAKE2B 40b2f866d78ef29498ea68afbe020fb62d317a33138d5f94eac095afeee671e31463cbdba8a1b5bd822e3add57748c86d72f7f652db0b17dcf19098502f31829 SHA512 e7a79a442b157e73b759e1afab554128ea6cde4631ddeedcea6d93f8fda15f443903924127818c3753f22ca7d8b41010b337eca31f86edd36f3a6d67be840b71
AUX conkeror.desktop 353 BLAKE2B c99cf942bcf97bbdc1567a60d0d15252ae378c91eeac57c066763007270eff39ffc39dd0ba5654b3e674fa33a2750327af2c313ed9f4b8ed212860f5074beb93 SHA512 ea48c755c800d2df417d5461e07a41305545de4086e22bf741804c60bb6d7f002685481eb505593c02f5948887026f5b9f15f853794c0c85c9aba7c060cf0f64
-DIST conkeror-1.0.3.tar.xz 243360 BLAKE2B 3380016a37dda88cb0a8aea65918fdfda8cf58c08a018d9ef14b487fae63957b15b1d42e31e5971c546d5a8f691b9f7d52ff8b6c171bee8bfc9cc6a9d5a25637 SHA512 ce5fae1037fbadc639f5bdf37c627dd03f32a2a41db40aa640348f4a8c63e8775d4fa90f06a5488133e5739e7e64a60e2a3de11de389b67290eddf12628f4e5a
+AUX conkeror.sh 342 BLAKE2B 40b2f866d78ef29498ea68afbe020fb62d317a33138d5f94eac095afeee671e31463cbdba8a1b5bd822e3add57748c86d72f7f652db0b17dcf19098502f31829 SHA512 e7a79a442b157e73b759e1afab554128ea6cde4631ddeedcea6d93f8fda15f443903924127818c3753f22ca7d8b41010b337eca31f86edd36f3a6d67be840b71
DIST conkeror-1.0.4.tar.xz 243876 BLAKE2B 112a05a8601f67f1a360f8fa947c0d325aac8276f72f02a6162fd3ec886d8b912e75991c94e4ec5bb9ebb44c6762bcbcb7f5a18c89410ba7d2294c38f66aba84 SHA512 4d6f3391b3ddcaedf532b9108cecfea2378c15307a669a46dcdd98ed39bdf25f6facf741aba66be4f683afe951e1c25ca011a94440d98bb0621d9b2cb10adeca
DIST conkeror-1.0_pre20140212.tar.gz 310931 BLAKE2B 19d558317789d2c26990bce2ae86e4c9c3a9b91e7e59bb57a59f4338b3a9f9ff2352cfdd93860c3f927cad26ddecad7adaec3454a9ec4096836fb068311724d5 SHA512 08174a50b5aca69a76ee1686c460cd62bc51d75030c067202be5acb947e6ebfb209adf5797be0096256eef913e688c401cdccd5afa1e738390458b244378c41e
DIST conkeror.png 5105 BLAKE2B 7d8d455e76987d0db00748ea6d5319793685b2e0061539f9378411245644f46a8e40eadfb59a5d543c17d058e2dc5f85c1cc3d2deabe5b988adb9dd689fa2bcd SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f
-EBUILD conkeror-1.0.3.ebuild 1561 BLAKE2B 18e65526dd01c807b482aba76ca380251c659fdb53b19d3b29a21ddd58ca3e8314c9fba9f894c7abf3e33ea31a0561fb6638d75e62b53a5298c125c8f0680b6d SHA512 636411bd37cb631341c446df2ed52817dbac9c548a54d9c49be0e5ade436156d195082ee320a9967c8e8ed8bbf30b8a7ca4d0bd9f9708f92ff7c5e4533643942
-EBUILD conkeror-1.0.4.ebuild 1553 BLAKE2B 4778cb89e4e3e173e8c70b5bc4b9a2acdbb87f9fabae224143dbf956ad52fa194dd3329459fe718fe41784566d836e8c6850fcbd98dd63f2190ab33d67fc40ea SHA512 204d9eddda633779b0e821edf30188021ef00bd588bbf858298832c746a58ff80465225c1f9da3ff5031d700b4905cc3a64cbcd5f607df182c95a61d5ac50812
-EBUILD conkeror-1.0_pre20140212.ebuild 1551 BLAKE2B 6637a056455c9c16910f8b1eae8e923e5fdab4c0bb3209e7cb9c75dec8c8256bf27aafbad40c9c889a9eb691f08ffad6a44bfff9c25feaa8f804567bf30d73d3 SHA512 a4750a5a575cda7d5e062e5cacff3ac237cb6cd024d22345faa927e7de49cd85af2e6819f01de54ef2cbbbf97aaae5d1c9e6b18047562664e0290815ddddad7c
+EBUILD conkeror-1.0.4.ebuild 1549 BLAKE2B 80721b7f3aa1c859416d3c64776300dfee85e57517fbf5855720f799978391390eadfde9299a9d658e0bec686c0667e1b77f340d610c5db28ffee3439c5a3fd5 SHA512 b5cc4f661235380cba8a5923a5cee2f91a5c4327868ccdc561a73ed37077ca39a41c5b6e05282c351277bd2127861efef113312f837762c5281bd6c256ad6f74
+EBUILD conkeror-1.0_pre20140212.ebuild 1548 BLAKE2B acbe24f6f0f4b5779ae992344f5358113f93a5c82136ab3d78983f11289e802b56ef82e47d1b22228efd0f5cce4dcd72cd1277a6d735013a4748c8525e84a309 SHA512 049702fe656a95e80447075a861cb442c4f56ccfbc264a7a71da761b6f38b40be4a1b79d99217ddb6ad6668bbaf64062052ee426ab17cec8487a081209686686
MISC metadata.xml 702 BLAKE2B 9768c0d3e10cb9898b5e80075926dfb4b8a3c6ce8ddf694c72989077c27d1dec0acc3cf3e522452b9281f21a2719011293eefa4bcb44b26a793c3348745dc1c0 SHA512 ef47f81c9122a73eb93dd60fc60cd414ce12f1f1c48413cdf7d7e3d3c47e4865dbe24927385b7fae27aebd2508acfccae1bd84cf7fef19a506aec9315f454c18
diff --git a/www-client/conkeror/conkeror-1.0.3.ebuild b/www-client/conkeror/conkeror-1.0.3.ebuild
deleted file mode 100644
index 3e66718c9e60..000000000000
--- a/www-client/conkeror/conkeror-1.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
-HOMEPAGE="http://conkeror.org/"
-# snapshot from git://repo.or.cz/conkeror.git
-# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
- https://dev.gentoo.org/~ulm/distfiles/${PN}.png"
-
-# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 )
- ( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
- unpack ${P}.tar.xz
- cp "${DISTDIR}/${PN}.png" . || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- insinto /usr/share/${PN}
- doins -r branding chrome components content defaults help locale modules \
- search-engines style tests
- doins application.ini *.manifest Info.plist
-
- exeinto /usr/libexec/${PN}
- doexe conkeror-spawn-helper
- dosym ../../libexec/${PN}/conkeror-spawn-helper \
- /usr/share/${PN}/conkeror-spawn-helper
-
- newbin "${FILESDIR}/conkeror-r2.sh" conkeror
- domenu "${FILESDIR}/conkeror.desktop"
- doicon "${WORKDIR}/conkeror.png"
-
- doman contrib/man/conkeror.1
- dodoc CREDITS README
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/www-client/conkeror/conkeror-1.0.4.ebuild b/www-client/conkeror/conkeror-1.0.4.ebuild
index ae31992df34e..da0f8a16c9e9 100644
--- a/www-client/conkeror/conkeror-1.0.4.ebuild
+++ b/www-client/conkeror/conkeror-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
# CC-BY-SA-3.0 for conkeror.png
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 )
( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
@@ -42,7 +42,7 @@ src_install() {
dosym ../../libexec/${PN}/conkeror-spawn-helper \
/usr/share/${PN}/conkeror-spawn-helper
- newbin "${FILESDIR}/conkeror-r2.sh" conkeror
+ newbin "${FILESDIR}/conkeror.sh" conkeror
domenu "${FILESDIR}/conkeror.desktop"
doicon "${WORKDIR}/conkeror.png"
diff --git a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
index cbabbb2f05bf..a212377519f2 100644
--- a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -42,7 +42,7 @@ src_install() {
dosym ../../libexec/${PN}/conkeror-spawn-helper \
/usr/share/${PN}/conkeror-spawn-helper
- newbin "${FILESDIR}/conkeror-r2.sh" conkeror
+ newbin "${FILESDIR}/conkeror.sh" conkeror
domenu "${FILESDIR}/conkeror.desktop"
doicon "${WORKDIR}/conkeror.png"
diff --git a/www-client/conkeror/files/conkeror-r2.sh b/www-client/conkeror/files/conkeror.sh
index 9b46d5bb0c07..9b46d5bb0c07 100644
--- a/www-client/conkeror/files/conkeror-r2.sh
+++ b/www-client/conkeror/files/conkeror.sh
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 024219caf1a2..8a8ef776637e 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_52.0.2850.0_amd64.deb 53492848 BLAKE2B 656ed619806b33d757b3fd4f2bb398c44b5b2f675ef3e0c319f647facbe29290681f95c83f26437dd77b8afee049da1a205d54c365ccea1111e2ee22944edc87 SHA512 fd29a6b0501a52547eac1fc078c20396a5d1e495d5e5a0f3a48ba5199ee9f9a3b2a873aa5b0337d6136202e1671ceffb60b707280461f5a8a89a7dc73ed27d28
DIST opera-developer_52.0.2852.0_amd64.deb 53763992 BLAKE2B 2530aa7d2f0e1e8ce3f8e309c9c318003425db775bad0378f32cbf958110d9fab67190c69d0724cca0cc79f347038c21b65a281bc79d64f64f4ccea33d7a20f0 SHA512 cc2c2deaff565002a668f70ad175f2ae4d978e4c9a79453541d5b702f451f96668c09cb05efb6fdd899d84a15aae3b375bf0983adff7f659f57c9a522314e3ec
-EBUILD opera-developer-52.0.2850.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_52.0.2857.0_amd64.deb 53543592 BLAKE2B c6808f382d1927b926797867dd5c36f23644a4fa576f81570cc4dc9ce43914a2ebb2192154dacc95e3d8e2f4aea60dad035f22a29b0a3f7ddd75eb42958ba3b6 SHA512 1002a0295dbf5741baa06d3631899766cf3e69d1deb23c6161a0055e04a7b38e14a22b0be51b68215ab80bac7eeeb6c0a1981bab53a0466fa1cc05de50d18dcf
EBUILD opera-developer-52.0.2852.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-52.0.2857.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-52.0.2850.0.ebuild b/www-client/opera-developer/opera-developer-52.0.2857.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-52.0.2850.0.ebuild
+++ b/www-client/opera-developer/opera-developer-52.0.2857.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c69baa225693..09523bca85ea 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_50.0.2762.58_amd64.deb 52204642 BLAKE2B e06e3118b4e4b5b810aa9c62795dfcd4564edcd50fea95239c92a0d74fd7034f187d0c4ed0e31d7eab106786b50b8989fd77f3701372e7906dd76dea42a6f601 SHA512 14892a66bbd688bef8ed7b36f5bc7a6e2a9fe6d07356a093981f000bb81eb853ae18efd10c019bff9b52005542f7e15946fe7b54295bb6fbf513352899170081
DIST opera-stable_50.0.2762.67_amd64.deb 51961360 BLAKE2B 3f5eba38b5a6b1f65cdb00c71188c217ad850ec851423120fdfafead4fc9a58f0e4ac65a3e00526ceb507a75b204bc95acf6c6c9a31742a09710e04887721c4a SHA512 e0c9dc26b65d35988380d1e387be931cb82b917aec69da104529bdf17cc9950e6ec0d7557d3ae8acd6b4701c95af63ae25cedfff8876700d85b388519bd6198b
+DIST opera-stable_51.0.2830.26_amd64.deb 52162180 BLAKE2B 49a2e96d31ccc322638b388c1f4cb4d96fbfde72edab0c3bc9b535d24246ef07b04a94c164fca9109941c706d376036361f22b5d665e1322eb34e435411765f6 SHA512 907bddae177df54fc1ca6124ffa5ace63adffaaac67ee9c19ac674d4c28813db6c7c1368f626d74f15dfafa89ce906eea3306829fa4b664fdf1751c71ebdd685
EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-50.0.2762.58.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
EBUILD opera-50.0.2762.67.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-51.0.2830.26.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-50.0.2762.58.ebuild b/www-client/opera/opera-51.0.2830.26.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-50.0.2762.58.ebuild
+++ b/www-client/opera/opera-51.0.2830.26.ebuild
diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
index fec699ca175c..561bff00bb46 100644
--- a/www-client/phantomjs/Manifest
+++ b/www-client/phantomjs/Manifest
@@ -1,6 +1,7 @@
AUX phantomjs-gcc5-compile-fix.patch 860 BLAKE2B ebfcae37b0fc84ea8080d9ec24783dd7baa2b57bc79bc32f6003bc3101c815603ef9276de7ce4a110fc5d26efa4033e0fe3bc55a6b46473682a552de1d4b4e5d SHA512 95838ebb8406fcecae852bca8ed95d8a18f194e2255603e1170c102ffdeb99d6134a34a3142e915437b71d845225676657ab28fb6ed8b744ddeafe75c83885c0
AUX phantomjs-python3-udis86-itab.patch 664 BLAKE2B 6e12ad96e8489dfc4a1b1c221e1c160e04d7d3ab3fe5ce3e3b633e85063d13c3281dea22058421f9de79518e8f22c1e787adb71e971e272bc2cc455f32cdd43c SHA512 39f5803fe063953edb6fe848c2b12b3c2ba87224304ff49ad6798c8b3a9c7b99049ec24176efa54cf97c092fbfcce7c7676ef20e0ad16db1b86f69d158d972f2
-DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 SHA256 9715d61865b092721b7498be01b75b9d6541673f03d9aa7a29406262a5e20804 SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df WHIRLPOOL 7b0bceb762bfdab4f9d5f1bd6fa96c23c7b71ea153ed656333e12ea34069f9f86840a755cf19568d2243890f11d4cef486f2366d40792afa7e9ed25fdd0317e2
+DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 BLAKE2B 4a0fe19ae338ebb1846e2f04c3a6ea2f790d3835044d089304f7eba1d1f3bf0af41148d87b6f4a32103a5613cb1b470a8572189653bb3c38a64fb0c12e475feb SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df
+DIST gentoo-phantomjs-patchset-0.02.tar.bz2 8017 BLAKE2B 0bde29dab19ced08afeab0484e0d88f9fee35306ddba0aeda3cef158ad0f818a7f93f6d1462766399231513d1279dc1071bde4e82d82c67e156eaeb0c52d6f87 SHA512 88e8acb47842b108c4f01bc778c25d95011462b9d6732e6cca20372824a93321731d1976b19736a87d6e51737dffa0c76a15983d4b0739e97c7dc55ea065e791
DIST phantomjs-1.9.8-source.zip 40965044 BLAKE2B f0ba4e7684539daf19b3f4c012ca680cbce8858ec1639714d14726e8234e4392d7239cd9f797471bdf3fdcf46ee81b006548891f645f5d71783a28a749c32616 SHA512 3692268a2706b097484ade500a2b24ce33d243b8ebbdf5ae8dea4b5e37adea5a84c11528e2862b9da71deb53cd14a985f1878d190a91c440632dd22cbfaf78fb
DIST phantomjs-2.0.0-source.zip 110092872 BLAKE2B cbd27e1803801cfd8316effcf532f68fe03ce3ebee2b972c8ad2c909522e362b28d0054e73272d0eb0a1cb68a68a1942f2d04072b3e0524a8fa0fe84092ff6a9 SHA512 c8262353ee4daa842ef891b41e006baccf1815a99cf3262aeba457cfc37bbef6cb2ca234e69bd33a5446014fe802b3e35591e2eb0d49d8483c1f75bacf9d6f42
DIST phantomjs-2.1.1.tar.gz 1880406 BLAKE2B e54e8a1d42cdbf6fb98c90283a0ebcb4145350bc34d76b8a0d01163fcca15b7e6bbf7043e2d17bbf21c5d01e7fd0e76a4386f9c01dfc8727998f8d0f17da9291 SHA512 07b769133957c5194c9afdaa347bd9a019ebe47653f98adf17a35d3dd12714d2f8e3773ced91d7d99f31cb18d7f73167022d5b0a3906d9aac0732ef96341f5ec
@@ -8,5 +9,6 @@ DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 BLAKE2B 2fd956a2d8cb64e31bff107
DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
EBUILD phantomjs-1.9.8.ebuild 1972 BLAKE2B fa8d56274e95fb425f003f9a4f74e21d0c46776e73695a817b29fc13f7ad331e50be3acfbf02da7549adc7c0755ced07392b3419d4875631f05e51ad44e1b4d5 SHA512 58cd58785d25d34aaebd091c73b8c50e4e8b974db1e77cf0cd4ec9929c07a54641f8bdcd825b1ad47a421b8dd91465b9aca65d9a2028b12e5445eea4c4a74fe2
EBUILD phantomjs-2.0.0-r1.ebuild 2147 BLAKE2B 2604c350aa778d7dfa9b3f94170f178469459c052b40dc21736dcd61d8977b72f194994389a72936d91b8da11ba8d894a6a234fb48d1736ed9ad267282016dd3 SHA512 d8de3eb916fbd8219058c54c218bdc586df698bdb8e7bbcc7eed7de8c828e2c39771ee0c4d75ceeea62421f4d2bb8e6a2b35d1b91a07f29787d3f825842d7d96
+EBUILD phantomjs-2.1.1-r1.ebuild 2794 BLAKE2B 37c80004693ab37067d2bdee4168b30e1ce7ccf6e8c28f8a2abfad09bd1057b9987cd9b9f4093902a2b6a088e268a14bd83c0cfe8fd250c26e339dc799bce0ba SHA512 a526af772650a51ab635f7e714bda1449d0b43160107e306f55311d3305a345bf33e7873a2028378c7dccf954324383fbef4a740c2ee7c3f5fcab1d68fd572f9
EBUILD phantomjs-2.1.1.ebuild 2794 BLAKE2B bd3410849ebbb936b26c844c10a77ca44fa0db2c74a599dea0b6483227f7fbccdacd44b013e23cdc139c3fa8b9196d5ba4404dc0d1db3c31a7c92cf7ffba3b7c SHA512 2e1f2a0bc357ab3e131c31a5c78ec7cf35284c19e9c714c3cf202c8a153b6d948eafff5e53fd95e54cafbce149044480f0d204db470bbfc124299c0a484cacab
MISC metadata.xml 382 BLAKE2B 8f4b356d275737c3d790bdd8007f6edce0b9def238278ba810dcb4dc136738928aa2ed0e3a0f16fae2b9aeab18a3677bc452153381a50e82330bcd374f58323c SHA512 67e68f44de1b0a5554104a67d363c414ca0a03842633a0e08e9f1d8e30f8b0f19aea14185c0e791d945f047e319a137904f551058b37b5f7622bcafe343f82b5
diff --git a/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild b/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..c9a611bdeb3e
--- /dev/null
+++ b/www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+QTB_PV="5.5.1"
+QTB_P="qtbase-opensource-src-${QTB_PV}"
+QTW_PV="5.7.1"
+QTW_P="qtwebkit-opensource-src-${QTW_PV}"
+
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
+HOMEPAGE="http://phantomjs.org/"
+SRC_URI="https://github.com/ariya/phantomjs/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://download.qt.io/archive/qt/${QTB_PV%.*}/${QTB_PV}/submodules/${QTB_P}.tar.xz
+ https://download.qt.io/community_releases/${QTW_PV%.*}/${QTW_PV}/${QTW_P}.tar.xz
+ mirror://gentoo/gentoo-${PN}-patchset-0.02.tar.bz2"
+
+inherit eutils toolchain-funcs pax-utils multiprocessing
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples fontconfig libressl truetype"
+RESTRICT="mirror"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+RDEPEND="dev-libs/icu:=
+ fontconfig? ( media-libs/fontconfig )
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ truetype? ( media-libs/freetype )
+ dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+ net-misc/openssh[-bindist]
+ app-arch/unzip
+ dev-lang/ruby
+ virtual/pkgconfig"
+
+src_prepare() {
+ ebegin "Moving third-party libraries into position for build"
+ mv -T "${WORKDIR}/${QTB_P}" "${S}/src/qt/qtbase/" || die "QT base ${QTB_PV} failed"
+ mv -T "${WORKDIR}/${QTW_P}" "${S}/src/qt/qtwebkit/" || die "QT webkit ${QTW_PV} failed"
+ eend "$?"
+
+ ebegin "Instilling C/CXX/LDFLAGS respect in main source"
+ # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+ sed -i \
+ -e "/^SYSTEM_VARIABLES=/i \
+ CC='$(tc-getCC)'\n\
+ CXX='$(tc-getCXX)'\n\
+ CFLAGS='${CFLAGS}'\n\
+ CXXFLAGS='${CXXFLAGS}'\n\
+ LDFLAGS='${LDFLAGS}'\n\
+ QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+ QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+ QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+ QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+ QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+ QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
+ src/qt/qtbase/configure \
+ || die
+ eend $?
+
+ ebegin "Instilling C/CXX/LDFLAGS respect in test suite"
+ # Respect CC, CXX, LINK and *FLAGS in config.tests
+ find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
+ sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
+ 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
+ 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+ {} + || die
+ eend $?
+
+ default
+}
+
+src_compile() {
+ ./build.py \
+ --confirm \
+ --jobs $(makeopts_jobs) \
+ || die
+}
+
+src_test() {
+ ./bin/phantomjs test/run-tests.js || die
+}
+
+src_install() {
+ pax-mark m bin/phantomjs || die
+ dobin bin/phantomjs
+ dodoc ChangeLog README.md
+ if use examples ; then
+ docinto examples
+ dodoc examples/*
+ fi
+}
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 6d0ed50e02b8..93049730c2ce 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,10 +1,8 @@
AUX qupzilla-2.1.2-openssl-1.1.0.patch 4631 BLAKE2B 27ede6f8ac9f198b147bf3eddecbe9f78c50dff050f3e9bd8565620847eec1cb6fb3c3f8164a51f7220b9365c275ce9ea4321e0e7e99976170748a75ef674c8c SHA512 0171a9d64c4202c3893767c962b7951d6f431d7e70a7de1385e80c097dd6d1e55fd77be8da3621a9d15cb6982a92d4049e0dc6058c00b7bf7fc90439d659479f
DIST QupZilla-2.1.2.tar.xz 2767560 BLAKE2B 4d012f86618680a112c227d07d71c24d6fc2c517be63fe172abc99eb0c20e8b2756e2cc51049b0dff91e1739357121afe0b1e7328df372370dec969995447eb0 SHA512 d09a394ba70ae0f7f908940a26d6554a3706b6638c197d16b75e1e5855f76015c8e13b7155c40dacee3a38080a0c277d9410eaf07cf912dc4b295eafe1ff6343
-DIST QupZilla-2.2.4.tar.xz 2525660 BLAKE2B b94841d12c8f374df2fb4a8773d9d7e6b1b6b35db51ddd20d94f7a2cb70a345226baff64bf15be756e3911fa86714588e9e8c51842562ca558f1abd537ce3ffa SHA512 07a71fb3eb52356589871fb458fa3e931ee01f87e67ecbba614f715181130f9bec53e2f6df2c83f08d0223990f8bbe225ea21171e048574b265ae20576b48053
DIST QupZilla-2.2.5.tar.xz 2532760 BLAKE2B b9bf3f5415aa5a06397a7b9f98f56a16a7c9238d561bf6a2583214e43b23c53c825c8274b51ff0e34ced8aac6077c12dad60968d88abe810ccb35dbd2a457e0e SHA512 78e02141f18268a5f31a896c49e4f6cbd709e609dfcdb50277fc20123526e5316b79ede612dcac74ff07103334c381e4d657b18b6e187a10983d5a44a649858a
DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
EBUILD qupzilla-2.1.2.ebuild 3107 BLAKE2B 759e2b8ca800b96a7132986b4c776f260b05c6397999351abaf624d3aeceb46433aa7f6de662b35d7fc4079ac775b379569bd087ed3ecf59ba9b780053a09462 SHA512 d3d945b8fc44e0e7b64867b6cc66f018640791745fbb6e67fe533cb397046ac133a72ddd256d86d232421366ebc6eda90295f22f1cf2279e5fe0707c33e6097d
-EBUILD qupzilla-2.2.4-r1.ebuild 3170 BLAKE2B 4479a06e959575816f22e0b0ec6ba3f2a9a3b075c5d24500b365d2b4e26b01940a174b5377664b8c131fc77aa33c25274bf30b968e24841b197a13ba9901547b SHA512 6c66b91432da2509b7be6ed28695fb062c62927f0dacfebd86f3407cd6d5328a49847cc11e1992505bd0cbe6bee7492e0015a753bfa91eea56a9412254754d3d
EBUILD qupzilla-2.2.5.ebuild 3170 BLAKE2B 4479a06e959575816f22e0b0ec6ba3f2a9a3b075c5d24500b365d2b4e26b01940a174b5377664b8c131fc77aa33c25274bf30b968e24841b197a13ba9901547b SHA512 6c66b91432da2509b7be6ed28695fb062c62927f0dacfebd86f3407cd6d5328a49847cc11e1992505bd0cbe6bee7492e0015a753bfa91eea56a9412254754d3d
MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d
diff --git a/www-client/qupzilla/qupzilla-2.2.4-r1.ebuild b/www-client/qupzilla/qupzilla-2.2.4-r1.ebuild
deleted file mode 100644
index acb97d50c177..000000000000
--- a/www-client/qupzilla/qupzilla-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_419 es_ES es_MX es_VE
- eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP
- ka_GE lg lt lv_LV nb_NO nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK
- sl_SI sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA
- uz@Latn zh_CN zh_HK zh_TW"
-
-PLUGINS_HASH="80fea7df7765fdf9c9c64fdb667052b25f1c0a22"
-PLUGINS_VERSION="2017.03.26" # if there are no updates, we can use the older archive
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
-else
- MY_P=QupZilla-${PV}
- SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="A cross-platform web browser using QtWebEngine"
-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 kwallet libressl nonblockdialogs"
-
-COMMON_DEPEND="
- >=dev-qt/qtcore-5.8:5
- >=dev-qt/qtdeclarative-5.8:5[widgets]
- >=dev-qt/qtgui-5.8:5
- >=dev-qt/qtnetwork-5.8:5[ssl]
- >=dev-qt/qtprintsupport-5.8:5
- >=dev-qt/qtsql-5.8:5[sqlite]
- >=dev-qt/qtwebchannel-5.8:5
- >=dev-qt/qtwebengine-5.8:5[widgets]
- >=dev-qt/qtwidgets-5.8:5
- >=dev-qt/qtx11extras-5.8:5
- x11-libs/libxcb:=
- dbus? ( >=dev-qt/qtdbus-5.8:5 )
- gnome-keyring? ( gnome-base/gnome-keyring )
- kwallet? ( kde-frameworks/kwallet:5 )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/linguist-tools-5.8:5
- >=dev-qt/qtconcurrent-5.8:5
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-qt/qtsvg-5.8:5
-"
-
-DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
-
-src_unpack() {
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- # get extra plugins into qupzilla build tree
- mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* src/plugins/ || die
-
- rm_loc() {
- # remove localizations the user has not specified
- sed -i -e "/${1}.ts/d" translations/translations.pri || die
- rm translations/${1}.ts || die
- }
-
- # remove outdated prebuilt localizations
- rm -rf bin/locale || die
-
- # remove empty locale
- rm translations/empty.ts || die
-
- l10n_find_plocales_changes translations '' .ts
- l10n_for_each_disabled_locale_do rm_loc
-
- default
-}
-
-src_configure() {
- # see BUILDING document for explanation of options
- export \
- QUPZILLA_PREFIX="${EPREFIX}/usr" \
- USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
- DEBUG_BUILD=$(usex debug true '') \
- DISABLE_DBUS=$(usex dbus '' true) \
- GNOME_INTEGRATION=$(usex gnome-keyring true '') \
- KDE_INTEGRATION=$(usex kwallet true '') \
- NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
-
- eqmake5
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 861690aeadef..6d80a4e3a145 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,5 +1,8 @@
AUX surfraw-2.2.6-gentoo_pkg_tools.patch 1155 BLAKE2B f550606027a74cc8ca3c8d30329f2023943b7377bbab7693ae1531a6944417a4e6f22d0c7eb45af9764f52f24fff66aa3d5e269fa5d4e269c51e53f277da6cdd SHA512 98733be556508761d27543f5af751333d5aced7371cc6510607e4b7d88e546dcbc8420ae5620b9a8d195f2601cb053352f3bee9b9c513bc51ea5bc0c6c3a1cab
AUX surfraw-2.2.9-completion.patch 249 BLAKE2B a4418c17c2e57481674f63df74efc5bed828900eed629b24d93582a112eb9b062e2384ba02a7fe7c5ee0aadbd338699d0f97f4e71b9ed9d5427b68ac84bffe98 SHA512 058c7e4d1ece46e2b0c7da85aaab47d1908a9c5cdd13bff406d62c22f92ff438f51155097ef90304f6108c1138d015a59b77e969b6070cb3cd79c455728b8d83
+AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf5cb4f62845b56e75baa45741efe3c3405bec7735c77165dc4f9a03047125cc3e35d68cb3e768ef411668f90adf125218 SHA512 6bee4b435d3c52d2165ff76029ab3f7b898d358468c52304f9bf70f5c991e0387928d154d1097cfdd08d826f9c8695e85f587ef529978f7d97cbe07caf183443
DIST surfraw-2.2.9.tar.gz 200042 BLAKE2B c360da9826b6473a1159e67a19e9e12eaf4697b5be4373088169eb6ee1b85f126854f8594c5de8fd0517b7020947be42a5678d1ed7bd798f0925c53a68728c15 SHA512 81ddfc5300f5f052e09187144f39c0e1f0d6a0df9ad82d4457b60498278061ac6736a8236bd2b3516f6ad885d22c8616372b354f11b2dbb46ef4f3790456f016
+DIST surfraw-2.3.0.tar.gz 205557 BLAKE2B 35ca2b46f14fc123fd014682a413c6f22e8c9f05d85e8e76660e099536fda8648446757d467afbe8807c91ec1628c568854ebfda48953e9499a018c30f2bc5ee SHA512 51cdfb68bab701bce635a64ab3d5af669b2330c895180d01cca1c6f3c4005972ba4c573b693df59a2cc4fdb97d4fd11224bae500bbd4a17c3ab446de5241c9a0
EBUILD surfraw-2.2.9-r1.ebuild 2529 BLAKE2B 3b8f3e2755c46a9eb37ff02d604caa7cd8d793b4dbdb14da582f461fcf8726a73f48c8f07eb46d7f92802678eb4f8b07d57a3ad208769b8b2f2d9040ae0ede07 SHA512 ef98382894301ad2e08b31a35008d7f0541cd716f5d95bd1586fb27235e6dc6011623464cebb2101508a34ae5e197eff935107fe52796e657706903fa4331236
+EBUILD surfraw-2.3.0.ebuild 2500 BLAKE2B dc07e0d76023e9464e1262cf504bd776fa8b802515fc2b503eedf06600583d30190b4cb692160e0594bf1a6603376ed69a8119dcaee2e0d99734820b097970c5 SHA512 833b6198cc6a15065845c9cbbc2bc6a02c1ecb8b9c5f8a72c1f32113b9fecd79f82ed76624041124c3f5800f020230b2955ff0ac30024a39d395d5898733f83a
MISC metadata.xml 1439 BLAKE2B 0863a7f2566c13e6ea8fae5379f6f078fb5fe87cded695a011550a7829c3d6ca47c3c39c41922dd055c74a79ecd4cb9a070318c3fa41fe5ec1bbb5cd7f40f613 SHA512 86b0384eac922d16b5e686bdd3470a3eb6a1827c57cc0a31311c378d1068d2c7446dd22af7e57326f667b87ef03862924475bb1fd0b16ad629bc8034586d34ec
diff --git a/www-client/surfraw/files/surfraw-2.3.0-completion.patch b/www-client/surfraw/files/surfraw-2.3.0-completion.patch
new file mode 100644
index 000000000000..1f86ec55f014
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-2.3.0-completion.patch
@@ -0,0 +1,43 @@
+--- a/surfraw-bash-completion.IN
++++ b/surfraw-bash-completion.IN
+@@ -4,6 +4,23 @@
+ # installing the bash-completion package which sets this explicitly.
+ shopt -s extglob
+
++_srpkgname()
++{
++ local pd
++ local dir=$(sed -n -e '/^PORTDIR=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \
++ /etc/make.{conf,globals})/*
++ local cur="$1"
++
++ COMPREPLY=($(compgen -W "$(
++ for pd in $dir
++ do
++ [ ! -d ${pd} ] && continue
++ builtin cd ${pd}
++ echo *
++ done)" -- ${cur})
++ )
++}
++
+ _surfraw()
+ { COMPREPLY=()
+ local cur=${COMP_WORDS[COMP_CWORD]}
+@@ -20,7 +37,7 @@
+ then COMPREPLY=( $( compgen -W "$elvi" -- $cur ) )
+ # "sr go<tab>" for google
+ elif [[ $prev == @(alioth|deb@(bugs|contents|packages|pts|sec)|freshmeat|fsfdir|sourceforge) ]]
+- then COMPREPLY=( $(apt-cache --generate pkgnames $cur) )
++ then _srpkgname ${cur}
+ # "sr debbugs 4<tab>" to check 44bsd-rdist bugs...
+ elif [[ -x /usr/bin/look ]] # in bsdmainutils, "important"
+ then COMPREPLY=( $(/usr/bin/look ${cur:-''}) )
+@@ -29,5 +46,5 @@
+ fi
+ return 0
+ }
+-# test first in case removed-but-unpurged
+-type -p surfraw >/dev/null 2>&1 && complete -F _surfraw surfraw sr
++
++complete -F _surfraw surfraw sr
diff --git a/www-client/surfraw/surfraw-2.3.0.ebuild b/www-client/surfraw/surfraw-2.3.0.ebuild
new file mode 100644
index 000000000000..cea13e94ecb9
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.3.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="A fast unix command line interface to WWW"
+HOMEPAGE="http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw"
+SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+RESTRICT="test"
+RDEPEND="
+ dev-lang/perl
+"
+
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.0-completion.patch
+)
+
+src_configure() {
+ econf --with-elvidir='$(datadir)'/surfraw
+}
+
+src_install() {
+ default
+
+ newbashcomp surfraw-bash-completion ${PN}
+ bashcomp_alias ${PN} sr
+
+ docinto examples
+ dodoc examples/README
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/uzbl_load_url_from_surfraw
+}
+
+pkg_preinst() {
+ has_version "=${CATEGORY}/${PN}-1.0.7"
+ upgrade_from_1_0_7=$?
+}
+
+pkg_postinst() {
+ local moves f
+
+ einfo
+ einfo "You can get a list of installed elvi by just typing 'surfraw' or"
+ einfo "the abbreviated 'sr'."
+ einfo
+ einfo "You can try some searches, for example:"
+ einfo "$ sr ask why is jeeves gay? "
+ einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?"
+ einfo "$ sr rhyme -method=perfect Julian"
+ einfo
+ einfo "The system configuration file is /etc/surfraw.conf"
+ einfo
+ einfo "Users can specify preferences in '~/.surfraw.conf' e.g."
+ einfo "SURFRAW_graphical_browser=mozilla"
+ einfo "SURFRAW_text_browser=w3m"
+ einfo "SURFRAW_graphical=no"
+ einfo
+ einfo "surfraw works with any graphical and/or text WWW browser"
+ einfo
+ if [[ $upgrade_from_1_0_7 = 0 ]] ; then
+ ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called"
+ ewarn "using the 'sr' wrapper script as described above. If you wish to return to"
+ ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
+ fi
+ # This file was always autogenerated, and is no longer needed.
+ if [ -f "${EROOT}"/etc/surfraw_elvi.list ]; then
+ rm -f "${EROOT}"/etc/surfraw_elvi.list
+ fi
+
+ # Config file location changes in v2.2.6
+ for f in /etc/surfraw.{bookmarks,conf}; do
+ if [ -f "${EROOT}"${f} ]; then
+ ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6."
+ moves=1
+ fi
+ done
+ if [ "${moves}" == 1 ]; then
+ ewarn "You must manually move, and update, the config files listed"
+ ewarn "above for surfraw v2.2.6 and above to use them."
+ fi
+}
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index 102cf5f568a8..66b2b2b7855d 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -4,9 +4,11 @@ AUX uget-ar-hardcoded.patch 641 BLAKE2B 52b5b1389e9af06a7608a0e8007e0ddc717d0ca6
DIST uget-1.10.3.tar.gz 484395 BLAKE2B 53ef428559cae0d8a924c3ac75bec874cd39de0034e105dc34e9848c56906bc0f75482b023181a3567d17e82a92b128613b55b94e41a2f87a6bcb039c18151a3 SHA512 c939832ad2b635e5b1d1e448bf075c13362e3f69f708e6669ad435f6467b258441d5adef34cea176082fa107865c2edd3ceb54c5b9074f0d71f94496e4995a34
DIST uget-1.10.4.tar.gz 576147 BLAKE2B 92c599d1ae23b6e457b08c457d1145856c1ba34ced958d1cd6b459a0878e07a91479dea5c1f5d5bf4af9cdcf29d98ca90ee6c26fa9e002bfbfd1df2a65f49a48 SHA512 013654ea6d06e8075bb216082dd85e7a4d1ed8510af4ecaf49c816dbf127f1adb157ca275a574f87900d7980cbe70e1e918fe54f0ceb4d0115da0ba07d4f2273
DIST uget-1.8.0.tar.gz 426031 BLAKE2B ad4b5f664d62c2259a236ee7df7b3880092d957e91584370a39ba546ecba431271a12c3ec3e005db39aacfa6e2b409279befcf83fb6134f004f0f7ef8fec0cac SHA512 c68c591b3c513c4829dfee735cbe8d4ee2c47aed0c5962002de9462c6c12b731e51756785e834aadaef1cb47182b9e560dd836d2e4861f053ec1f2f447c2c68d
+DIST uget-2.2.0.tar.gz 997012 BLAKE2B 4b6207edbb3e5871c5a8d179856920fa5985e65d9655c0d42e7ff9f1d34dfd6489bb1b75615e12432b5d5bbadb3be503bb605eb5256ba3566465ef4e07559466 SHA512 c3e7f0b7cc31df9d1a6c3717f65ad9b14c9e60acb756997b6f6b94f464257c7fb120be5e15bd1d871b89f6485160fb095bd120fb27abc81bd0ee29e57edde468
EBUILD uget-1.10.3-r1.ebuild 1956 BLAKE2B 8b1f518692fe09910cc1d953d801f9638efbd7a5bd07eaf112702ca3155c82a9c49905fb57e794397320485b2e6063ffe89bdb103ea0634ba60e195d6475541d SHA512 7c3ed3df0174b66f7781dcd9aeab88e13808cb314e0660c16eb00994ff536fd7da177fdc57789d538a8e30ab686b044faa2df7914d454db98abe2a3d049650f4
EBUILD uget-1.10.3.ebuild 1780 BLAKE2B 0aa2e2eebbe60a57d70c2f98fcbaab766198ba3b84e7524d183e13470c602248f7606e5116abb38db38bf43a53d81aa841615359aa7213c7c1d5470d7b380c3a SHA512 2762bf8101c314467fd2a5fbc79e26d03ddcfe4d904822fd9d399b63e320ca2a663492605bea7c42e60f0189c1135dee4044b89cc397ea43c9e8a195885c490b
EBUILD uget-1.10.4.ebuild 2074 BLAKE2B 68f4c31980dd19e85f9314f6f9f073e52018eb122b18ac805ad5c7ece041873d200b78b1a71e169e603cda0bb6cd2c50f28dfd9c3efc4bf7d54ba43593e9447a SHA512 737439fea25430a75d6c10645a34e7018949ca61e4383c1706f7ce7df00dccb3aec4315e573cade10072de092727c80891f7059b3dd79844c2cd8b2d9040e2d2
EBUILD uget-1.8.0.ebuild 1671 BLAKE2B dc64dd3f8385b2cb12f896843eee7cc3cba276afb07ac831ebcabed0e6962f20960e1595ea99534f13c0d9e610a66c2bed5155b36d8bbec3ac185a0ef4ea6e3e SHA512 569c3b50bcfbc7db8a74997ae23d0259da8b7cc7513ea59cad6554f9de6ae1395655a02611d93db026ffdfcb37a6f6cf22eb13503e895f681823a5742e999aa7
+EBUILD uget-2.2.0.ebuild 1327 BLAKE2B 83897f4a142bf7ebb86aecb251d4a87dcc858cab8da2e6d4b2dc7a496b9b55eb72e7a8c6188f21a1d2a586c3e76747ae11eb09e59fd15d09b77cd1358227b3d3 SHA512 18ed94579339d2513fef9f00e2f47550f430f55f8f48cad031fb1fae445800e866f196d7406b2b32d81a0f86c0d99a0030767829106142658b1fe5156d49abbd
EBUILD uget-9999.ebuild 1960 BLAKE2B 3365131c859055fdc5618962cf634f7c215d2350606b7f1d0b79cc37b93dc4464c86625f8210c97420f60f5acf90234a572a35483ffd81d77f9200428fc90042 SHA512 dfc753f628afc262f11d78c0dd898c2fc63c0636c4fa4ffe58cff85b02427ae0657417fb1d5f69a951c21fdceeb6b3b1e84ddbacaf15ffa1df1faca6e16a9540
-MISC metadata.xml 834 BLAKE2B f36cba51d278931880bf211e1a7aaf5dce55139fac7d16d6b356d3ad1bf30ce03a3eae4a0bedad010f89fc061c2c29382df033229b62dd02e2d0fece01bdaede SHA512 0b3e7dae0091bae35b9001e37426769811cca64f114fd30e4c6ed553ddcbfc54751e20e6a8d5a65101696883fc58749475b3f7f2e51dae07097989e83403b5b7
+MISC metadata.xml 1295 BLAKE2B 671c18f9324ae048ceedeca7adf38fb8ee842a0b5df4f06cc1163d9d94c4c4ec5ca01a947406a3d9ef3f0823f2f7ec5e4fe19cae34f4c01b118362f201115991 SHA512 be3101757d2e3f69e4f066e3ee63e16d883a86c851d4de6e8975b40f21efa04eef98e3d9e87fdbaadbe779bfe92dbc384cdc682ce8a32e5946107ff2d33f8a82
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
index 07f024846f8c..de4e8c078507 100644
--- a/www-client/uget/metadata.xml
+++ b/www-client/uget/metadata.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>chn2guevara@gmail.com</email>
+ <name>Christian Segundo</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Uget is a download manager. It allows you to classify URLs before downloading
them, and allows you to import URLs from HTML files. Every category has an
@@ -10,8 +18,11 @@
<use>
<flag name="aria2">Enable support for <pkg>net-misc/aria2</pkg> through xmlrpc.
You'll find the plugin in the app's settings.</flag>
- <flag name="hide-temp-files">Make temporary files that are used while downloading hidden.</flag>
+ <flag name="control-socket">Enable JSON-RPC over unix domain socket</flag>
<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+ <flag name="hide-temp-files">Make temporary files that are used while downloading hidden.</flag>
+ <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>net-libs/gnutls</pkg></flag>
+ <flag name="rss">Enable uGet feed messages</flag>
</use>
<upstream>
<remote-id type="sourceforge">urlget</remote-id>
diff --git a/www-client/uget/uget-2.2.0.ebuild b/www-client/uget/uget-2.2.0.ebuild
new file mode 100644
index 000000000000..de8df075331f
--- /dev/null
+++ b/www-client/uget/uget-2.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="aria2 ayatana control-socket +gnutls gstreamer libnotify nls openssl rss"
+REQUIRED_USE="^^ ( gnutls openssl )"
+
+RDEPEND="
+ >=net-misc/curl-7.19.1
+ dev-libs/libpcre
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3.4:3
+ gnutls? (
+ net-libs/gnutls
+ dev-libs/libgcrypt:0
+ )
+ aria2? ( net-misc/aria2[xmlrpc] )
+ ayatana? ( dev-libs/libappindicator:3 )
+ gstreamer? ( media-libs/gstreamer:1.0 )
+ libnotify? ( x11-libs/libnotify )
+ openssl? ( dev-libs/openssl:0 )
+ "
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext
+ "
+
+src_configure() {
+ local myconf=(
+ $(use_enable ayatana appindicator)
+ $(use_enable control-socket unix_socket)
+ $(use_enable gstreamer)
+ $(use_enable libnotify notify)
+ $(use_enable nls)
+ $(use_enable rss rss_notify)
+ $(use_with gnutls)
+ $(use_with openssl)
+ )
+
+ econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 46dfd6ffb147..a967289ece38 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,7 +1,11 @@
AUX vivaldi-snapshot-1.14.1072.3_p1-desktop.patch 347 BLAKE2B f54dcdac06c3011d0fd73d0b8c6576a94c77121c488aa103f856afa0cde4a0cf7c5f6249936fd189469179e14c05e192bce9f426e2c7f6f2978b5f8e2171b47a SHA512 946d7bb5875280a98fba1caf48174b3eb3891cc079879a5f76bc74d6f301064437faf6cbe65acbaa9c6528925e4741205bc8f64fb41ace379be9a8f1d39690a4
AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 1271 BLAKE2B 51c020903f801608f2515df7f9efb125353d42b61e2126c8858d22237eccf21dcc1571b46be74dc65546544cb985b0d4f2e023ea23dd18ef336f5b3ea0f03eea SHA512 1fb9e60240ec5bdf8d422290c9676b3fd3c7dacd88a26b0bd5f19cd160e3ef63d46fd5697ed0798ed3fab9db79da76d9068d36f2760681b53dad89775e12aad4
-DIST vivaldi-snapshot-1.15.1089.3_p1-amd64.deb 53473298 BLAKE2B d8ebea889bc23b54d695b881b1418b7333894c9f1d0cd5fbf28bfd3e710437eaadac522ad69b89f4ebc454c12e8a4c6bb829feb8555cee40466ad8de985889ef SHA512 6ecb88542c8e365c764734a5c869b2d2f9effbd5463a21be931990fb426233c9925185176a3a2d29da5ca9a785166a2db60847ed89708b76270f600636345f76
-DIST vivaldi-snapshot-1.15.1089.3_p1-armhf.deb 47260348 BLAKE2B bc4819126803bccbc664eb60fa4190a87d57a7c04f773f594ae05e27c29dc1a75165dd75588cc3e9375842455ab22b82967013f33f35945c4decfa60f999ca0e SHA512 8ff6f9653ab375fb3e994703c01a53629ca2c8cb4ce9797ff3e500af2da303e632f277cb97661a73935ecb005161554894f740cec9ed58113e728c37172996ff
-DIST vivaldi-snapshot-1.15.1089.3_p1-i386.deb 53023142 BLAKE2B f713fa157d38e85ba9d17a6a94cfa24346ee16aff240e0fe8fc842a2c0d5a1b5e892be432a534d0a237a10f278cc79bea24f0db3e012d759f8cbd3df993e6b00 SHA512 d4ddd360fcd61d49aeebc9eb5289629fa47e379a340ed2ed57fd7c777a307bfd10efe1c51be08e21b5b7c0d03ed872fc9e188d57c8b2d6c06db15b48092b404f
-EBUILD vivaldi-snapshot-1.15.1089.3_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
+DIST vivaldi-snapshot-1.15.1090.3_p1-amd64.deb 53474510 BLAKE2B dc57070b1bd36ca8fd9b57676631468c8146ec7849cdfedf6b51118ea79cf287f354059be0af3a154c3a387d0029b73f08166624a28ba63fb7dcd0808bb8e332 SHA512 a2d937873ad6ad213a097c20bb063e3a9a582916a4b2b91a5b3f86c7db3c170f7455ba43b36cd5862580ddbc11494c1fd547e40c0a0538484008fca99991cb50
+DIST vivaldi-snapshot-1.15.1090.3_p1-armhf.deb 47271950 BLAKE2B 41df28f35809dd2dd252f92aeca8cf1dd71c00e71d1046b163b50aadb0ec6c2eeba369ef8d12eb3b970d3319ecb436df9b352ea66ec6254e7ba3a4ee363cdbe5 SHA512 1aacf2a66fed3d65cda72c0ab7982659afbed6705620853bb7f1e0e9430adcae1fb0679b0554cdf631339e0ab6c01c58499cc21a6d9b1de38b6c0b1727c1596d
+DIST vivaldi-snapshot-1.15.1090.3_p1-i386.deb 53030952 BLAKE2B e41461d06aec3d4741d764841dcc616aa0aa54e52b8a4865b655b28fb4f64e14d4c81977eb84ab63dfc345282d3ec2f50a8c872f6adad04f4a8042c5b1a95a20 SHA512 03fb4b93ad51708a34bfe78cb09325592c19159fba25182219442a83cc6240d97e2be4a59673e946c9b32c27bce04ed13bceb12b3033f71b8264ecc057ceaa35
+DIST vivaldi-snapshot-1.15.1094.3_p1-amd64.deb 53493344 BLAKE2B 9461a42a8c124cffca67eef511d571ec42bfda7a4b28a6fadca71b2ffe51027ce231fba103efc7a9883a6250dd9b00c0dc39cbe35c39722c90002538bb1d8eb2 SHA512 59f000ded4b7b38a1709975380d1ba53a2a419223559b5e0f9820197b275e11db142c9c9539576b40650ca8f4068cec66c879877c2700b23caf5b5e7bb37402e
+DIST vivaldi-snapshot-1.15.1094.3_p1-armhf.deb 47288992 BLAKE2B b4f43ff658ecdfa0e0f2d36fb3dea43f03e7b3f6cfced22dd4081031124df451cdb51c85818051b15b878b5a4c43c0fa2b020bb0a328fb0311e448d812150e93 SHA512 6f2c9a09a92459fd26d97a605a4b39af9f190162113164feb47028cf7176e0a3244613982b4e734513e1fce79707b47a99c6bed23cc45d8c7e2ceb7ea4834d98
+DIST vivaldi-snapshot-1.15.1094.3_p1-i386.deb 53039128 BLAKE2B 0a07cc1e97d9f76fe41ca7a73b6c7ee3e358b73ba54337f14166d2c61cf7de6eb4a6599b61b107ab063e005a3f91adc0e9df145d5aa0c6b1293f8c0e2c11a6d0 SHA512 93cdfe9c8359cc779c32c167a5453d46ecab3333cb33a2a2992fd4636cf4722b3cc58342180a6d782acd1eb25fa3bbe36895e941c2e5f8ee2dfd17b1090920f5
+EBUILD vivaldi-snapshot-1.15.1090.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
+EBUILD vivaldi-snapshot-1.15.1094.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1089.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1090.3_p1.ebuild
index 7998894a831b..ee9ad44cb619 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1089.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1090.3_p1.ebuild
@@ -93,7 +93,6 @@ src_prepare() {
chromium_remove_language_paks
popd > /dev/null || die
- epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-desktop.patch
epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
epatch_user
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1094.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1094.3_p1.ebuild
new file mode 100644
index 000000000000..ee9ad44cb619
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1094.3_p1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ 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
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+ virtual/libiconv
+"
+RDEPEND="
+ >=dev-libs/openssl-1.0.1:0
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/speex
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+ mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+ mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+ chmod 0755 usr/share/doc/${PF} || die
+
+ rm \
+ _gpgbuilder \
+ etc/cron.daily/${PN} \
+ ${VIVALDI_HOME}/libwidevinecdm.so \
+ || die
+ rmdir \
+ etc/cron.daily/ \
+ 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
+
+ pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
+
+ epatch_user
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+ fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 2e174fc96500..d2642628900e 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,12 +1,17 @@
AUX vivaldi-1.13.1008.44_p1-libffmpeg.patch 1106 BLAKE2B 4e15ad477669e534c78ab8973e3b0057597e97cd0b37a110be2acece86a49ecddb5c0a03c958bf42c4d1b2ad54d4b400e9e1319385ccb4bb1fc0448512d8aa09 SHA512 93c6454c3107c665c3c5799561544294c140a8dd187bed79b489f7794648941cb91a51eab8f96f8f304e5453d03e4b35b55b647c3d6f7425825dae9cafa3c3d9
AUX vivaldi-1.14.1072.3_p1-desktop.patch 343 BLAKE2B 1fb9f37e1a8cb011cf13d0bdead1519cbe3884b92b2920b2564a745aa81ca1b7abac00925e58ad425986bc0cfb18e30ed1b2cd633e40601af14eebdfa73c0739 SHA512 2afbdc5f23b85b84dc94ad1da39e7ffe12e584a1496090db6d7706f6944cf1e9c71a8afded1ab386cbc1dbaadedb9e181f91b064946330c33941dfef66b91e7e
AUX vivaldi-1.14.1072.3_p1-libffmpeg.patch 1235 BLAKE2B 35325a2661ace46829514d07a0b0999eb7230554517bdbfa11862c72f7ebcee12987b9fd7bee58bfcc8e22560cd84607d244fc5bbb1b0514cafa888f096f3611 SHA512 08b13b8aae472ed827e3383eb6be0e1842d56bd003e3b4bf1d51ee73e55673a04ddf508d8ba3a6d766b27068101e890d5d80a936211c75fec38b6e1ece21a41a
+AUX vivaldi-1.14.1077.45_p1-libffmpeg.patch 567 BLAKE2B b26ad49c8d4336e572ca4fc4ffb1b90240b0b9d568e48706965fafdfd5681014e33fe0ee418ebde8cbfd55d840bf5ddb1a3e6baa8f69acc92255bfdfee8811ec SHA512 02bafb3edb17cab08b72629a17de772b097883ae132e36c8ccff2d03ef6bc861cba968e746379db612d0f012b81314f19a2a2f90f1b4af4c5cf67e048eeeb9ef
DIST vivaldi-1.13.1008.44_p1-amd64.deb 49265816 BLAKE2B 4d49e00cb0bb7fbf72303eb32da01751b22f9ec252766205893ead6c65e95695457065d2d9dcd5c4d42621a1382b012b2718e67b7f514df2ee7b1ea959eeaeca SHA512 3bb7f5ac0e01b1b3d36b4faae8a0a7874ab8acad5398663c9e51b6f9f26a6f00f01c3a183ff964e18eda2358009c99b270e65a3d35d99cea1de72554a7f6255a
DIST vivaldi-1.13.1008.44_p1-armhf.deb 45147556 BLAKE2B 90d8c056c129273e2c759247d452d4a825cb0ad41052716674fac790bb488d3f0743fa692f302f1c7af3f22adb91b1a115e1bd5c2745560577c14e0645fe0afd SHA512 f390ef2a6afa98212458a803b2411e53849bc2be3ebf54f3fdedc15bd38462239f7590dd31870c312319a38bb0e293948e1bbd1f1a0cdf243747780925c9762c
DIST vivaldi-1.13.1008.44_p1-i386.deb 50145626 BLAKE2B 44c913c2e8242d2b4b5b24fb63bc21dd8636283ebbcc5b72178b7dd4a34e2fc0e5d45fe41fef9ce7c918809e0bfffa1cf3ddbe436626afaa6237b4c85d27c09e SHA512 2f34facdc0ee2662d0ce03347346f8e510c288259aa92306f22c1eced6fc8626275f766401f6468b7a3037c2e7d5e65f692de39753553c7c8537b6c7f7a57a7a
DIST vivaldi-1.14.1077.41_p1-amd64.deb 52284634 BLAKE2B 91a96b201f6d3947145685a519e79a4ebff921df5c5873c5ce790f269e337f6944df71307b45649d0d754aec8b8ff6691748919d680d2354997a4cbb3440a211 SHA512 f6f8afc76699924edcfeacd51f60364506e2e9c07773d0411207507c0493b7427ba0373402c5eab7a10dde699cfee7e6e5c42179bf63c285123ff7e0e88f15b2
DIST vivaldi-1.14.1077.41_p1-armhf.deb 46360044 BLAKE2B d7fba11b524936ebf047162de597a829da1fc362e1d245b1de131431f288219085e17572853537c06637f7ce25ca482a19a703c58939855ee1a0a2ca7fc381a2 SHA512 8a6abbb6b362327aeefb2b526825caac0896b80d8f45870dfe78ad6cf56228deb0b932c157c3e85e66bde6e73dbde0470879d35cbfbf41b984222e2f3da6dc77
DIST vivaldi-1.14.1077.41_p1-i386.deb 51911354 BLAKE2B 050b9b2fb8495d9b9eaf51c61d1dd5bfcbbca0804bfa39e084dc8ded5c4ecd4aea31b459d6f1cba8fc0b5626ed926ed03d0263c47590bbdb024bf31fedc15fcf SHA512 538ff94c056c2fe3ac5c5042191dd3e7fc385d833a6375a05894df2f3945e363c017bb9e717a46b060cba9be81cdbc610cfd3ad3880a6da43ec5a89242a0f8bf
+DIST vivaldi-1.14.1077.45_p1-amd64.deb 52300970 BLAKE2B 20473795e9c8decd47f0ce1594c46a04895129ea3a7e2a3ba5120217e0352933df015816cfe6b900cf1374f18be83d2181087bd52062f250a687e060c515c392 SHA512 331f7e15fde92e8fb0ec7d4713e2cf98fd5de50c650b03c0b2f041464b29ba3c327d8a2a60935238bbded6114ce02d2ce64d053df5e5da2c52eea8d383ba345b
+DIST vivaldi-1.14.1077.45_p1-armhf.deb 46339572 BLAKE2B 8552e9cf2d90499cae9ec5bc431f6c20a16c1828e3a786c736d0119ee75391e21e1934024521c835129f6258d874650835cb06f0a23f3810edcc2aa77a5cf5e6 SHA512 ace2a414729464ad38a278c8fa6ef6a085cc393d14e6f64a0e36c414fbbe42d26b246ffe5eb2b6b20783a12506260d7b9353acb48f3844519e87e37719bc28b5
+DIST vivaldi-1.14.1077.45_p1-i386.deb 51923676 BLAKE2B fb3e15f8f1f9354beb85b92ae807807ea8eb9b62363c40b9c1cc4b2835f8ae3daeb9179869fa3681763da03d69216f057bae0f2127b7ce32f034c4069275e311 SHA512 60ac8449d39ff7689801fcbf9597d441116de72a90f1503338caa927990b8b59246cf02adbdf25beb8ad371aebca19254ee92dfeb706d2bcab87cd526cab5d0c
EBUILD vivaldi-1.13.1008.44_p1.ebuild 2982 BLAKE2B cfb6f088c8ea68f7821aff956a6706b517e2cd8c7f1aafc59267d3e4779d4eccccfe558621d69e8b784ca5e36368293d522d0faa1cc2a8fdf2599bec5e53c77f SHA512 651c20386b716ac98b1a32a46d480de06584a07372ad073edd9865c55ac88f4a3c5cccb0e97e42828cd20dc63766ccd9e7f86797fc610739cbeafa54d7424db7
EBUILD vivaldi-1.14.1077.41_p1.ebuild 3040 BLAKE2B 16bdbb0f33399e053ea38ba55b904360de7b31364da3e7b9f14e404d71fab4a1cf241570bd7c70d92b08f9006b9c1646f758ff24ad146b89228483692ce04960 SHA512 35c2b5885daa0c33cbe710cf5f24c9ed224616f0546eebebf40da5b784e337b455cf9f6c2148d890b7bec43d0563ec028d85f80d3c4808e92b44bed349630569
+EBUILD vivaldi-1.14.1077.45_p1.ebuild 2984 BLAKE2B d97401a2132162dd86f01559d5abda6ce321d4ee2ec723a35125b6950ec82a074d8959d08e2e6b7f415e3abc72a0611dcfe53b53147b66acdc27aa4755908442 SHA512 bc1f7fe69db70c7d103f1eb8a401d356e0f49fb4d2f85a33b94ef4125b24215975b3b0bdfa6843c7d465f03c240ed267e3649a1d3ffbd8b43ded35b189eed618
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch
new file mode 100644
index 000000000000..ec398141a793
--- /dev/null
+++ b/www-client/vivaldi/files/vivaldi-1.14.1077.45_p1-libffmpeg.patch
@@ -0,0 +1,10 @@
+--- a/opt/vivaldi/vivaldi
++++ b/opt/vivaldi/vivaldi
+@@ -54,6 +54,7 @@
+ # Check for libs in preferred order.
+ # Where possible, use other files/directories to confirm it's the correct variant.
+ VIVALDI_FFMPEG_FOUND=NO
++checkffmpeg '/usr/lib64/chromium/libffmpeg.so'
+ checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
+ checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
+ checkffmpeg '/usr/lib64/chromium-ffmpeg-extra/libffmpeg.so' '/usr/share/doc/packages/chromium-ffmpeg-extra'
diff --git a/www-client/vivaldi/vivaldi-1.14.1077.45_p1.ebuild b/www-client/vivaldi/vivaldi-1.14.1077.45_p1.ebuild
new file mode 100644
index 000000000000..74cfe863016e
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.14.1077.45_p1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ 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
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+#VIVALDI_BRANCH="snapshot"
+
+VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
+VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
+VIVALDI_HOME="opt/${VIVALDI_BIN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+ virtual/libiconv
+"
+RDEPEND="
+ >=dev-libs/openssl-1.0.1:0
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/speex
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
+ mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
+
+ sed -i \
+ -e "s|${VIVALDI_BIN}|${PN}|g" \
+ usr/share/applications/${VIVALDI_PN}.desktop \
+ usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+
+ mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+ chmod 0755 usr/share/doc/${PF} || die
+
+ rm \
+ _gpgbuilder \
+ etc/cron.daily/${VIVALDI_BIN} \
+ ${VIVALDI_HOME}/libwidevinecdm.so \
+ || die
+ rmdir \
+ etc/cron.daily/ \
+ 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/vivaldi.png || die
+ done
+
+ pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ epatch "${FILESDIR}"/${PN}-1.14.1077.45_p1-libffmpeg.patch
+
+ epatch_user
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+ fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}