gentoo resync : 29.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
commit: bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree: 3559b3e11424f5529527f2474d8a977a91ee3389 /www-client
parent: 8b2628ad8526c806375e7b157889e4274b70248b (diff)
35 files changed, 1212 insertions, 105 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 512ddc2d1068..471f363885ac 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,9 +20,11 @@ AUX chromium-widevine-r1.patch 428 SHA256 c05800f823b3e9522be70645de6a9b48285603
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX toolchain/BUILD.gn 799 SHA256 7b42f63ac928b7d1ff8e4d91cc620e944d581beb26c64fe7e1560f10a9c5ad94 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d WHIRLPOOL 7d9b145da023b223eaf0a9c6907a42ece9f880b83abcc4ef45624436901bc21fefe5f4823e67350a07b60e2ea4718ee4bf21542264fd2c7d1f6ba6b8cbc3daa0
 DIST chromium-62.0.3202.62.tar.xz 517105788 SHA256 e8df3150386729ddcb4971636627e54815ad447be5f122201e310f5bb0bcc362 SHA512 26296ac1cddfe087e8984b12b4916b9a87b08fc75875900441c9e4abd8b562bb622ac1a34bc9fb2aecf22d5a424ef1247dc694b9e6bdd0ea8b32397f53794723 WHIRLPOOL f17df2fd505a961dcc3dc634243dd11a7af09543325a0e59e2f322488c877af678840652e8308f4ea6c75c3d77fa73156be423007be76feaa9291042bbc63614
+DIST chromium-62.0.3202.75.tar.xz 517136048 SHA256 49cdfe457bcb941b56c13a75bbe2ff394fcb5baa8a49c9b470835fad60dd904c SHA512 1108ac0b383ac654b5b6fb42faee76621d3c476fcf1b6469f498023be7272668f46f7081f74b2a4079ff45dc3c77b225cea7758a11677b0ba5a478e1d8bac87b WHIRLPOOL 0bcb844ec55469ff293672e075dc8bbf4b93809048fc8e5235334dea06e087c91286ba023831ac5254b27241146a06fd33360ef540f6a37cd7092763cc55ab09
 DIST chromium-63.0.3223.8.tar.xz 541587956 SHA256 bced462e16a28ff0a3896539e6c7f72e76cb7ba16640a6cac9a533ec4b8f5ee5 SHA512 6ca0efac47adee14b04cba312397b80aeaed1b0ce9bee427c508c44636ab9a1668f743bd3939d83417129d7e83c38c2f95b72c502c6d834056cf7477ef8b4de8 WHIRLPOOL b9f526eec3626b93f2541461b9b3a79bef283de62d99e30c209859e686db8e09ed327f90d0811703d699e9813cb86e0002be93fa42372e65afef1c96b8c91d35
 DIST chromium-63.0.3230.0.tar.xz 558852780 SHA256 97daa90a6f0ba7dc49a168cbf9c40896e621fb0352ab6de1d2fa428bb63ab64a SHA512 b0aa9a42df303bc7ff412dec30b3bfed292ae39cb5e0f705f28eeb7a60d6125b9cecef7e3ab7798b2ca091ec71215fa5639def6b867c9fdb7a9a85c9b42323b3 WHIRLPOOL 1b9e346018c7056fce3f844d37b69e98529c9dc3ae04bdf07378c7de568d295814a42aa133c463a3be8d22a39b5f62ec69f679ea5dca3fe7e37a15215932c794
 EBUILD chromium-62.0.3202.62.ebuild 19510 SHA256 57744a47ea2207e8146255b0c4c579d0a722883e562b6a16f5da16a3d17d3599 SHA512 6e7354e10e4489149ca84c05a07308beae10fe1fb1172302b0aec071878cf8cbce20ba75c8bab61a02aa87748a982dee81a077f7b11b987b5439626a0d773dab WHIRLPOOL bf74f474780002e8a7c62b9ff9639bd76c9bdb978f9cdf4ec38d3781690e2e1bbd3e7e0b4845ef09bd4a248c9a538c8fce04e09c93c14f44253ab7060d41ba1b
+EBUILD chromium-62.0.3202.75.ebuild 19511 SHA256 5d50b83c2d89302307e83dd0d644ec713b3c685e4fd0fb6b348954680d13a56c SHA512 b0285c363adb1b36bec775ff69091b7c9a94b0d597e7954e1af8fc8a6b5c312d471c5ce75a1e1baab3f1eeed601f6dae4f0320fdc859dd1ad8d3f370af908ce3 WHIRLPOOL 059cea283125c08921bf343e7e5bac8408dfe2ce219abcc8cb4b83750a5a4442ea673eb9d3c2a2423f7a3f00b01e2a83f7db339bb9b4ebdf1451d43fdd3d9b15
 EBUILD chromium-63.0.3223.8.ebuild 19488 SHA256 87be09e2139856c5233d2e74315f7549e79605da663c6ba2e8264dafd1e48720 SHA512 de8e2b69f2dcffd0edaddb4c3aaa5689c959bc9b74b68e0bacf40aa8d32295f116b3e55b389e648a368c692a366a8d6ec5926b0e4794dc41c7ff89408f2238ab WHIRLPOOL da731abfa0d5b286578bee83fd14eb39c0ae537911ad089150a6afdf149439ac1210c3f47f0ceef31fe30b5759b9fac34b358cc4b75948e3972dbf4bd0bcc6fd
 EBUILD chromium-63.0.3230.0.ebuild 19611 SHA256 8123136fa657757dc97e34d1528c8bdeb55be7e932d885ff8e108d2a74465cee SHA512 9104874627988e7d946ac804589399f0e688aa0101da0b00137cc46a3eb15f0b64f09157af8748a93170728672af6e839e2b84b3742d3820956a211f0856ce9c WHIRLPOOL 7ea8ab0400d15fa8721177aef8bc76ad99c08e8a2f4a1ca63fdf99db7b4f744753582663c9dd9fc854878d12906a98a3c1cd10c61e0275a638594c0fec485d9a
 MISC ChangeLog 61379 SHA256 6089c72a9ad011b043f45bf3057c79f999d2aad5f4ecf0f9f45f9ced5156a18c SHA512 05868a71dfe2cbabb32b664968939704ada3c56bdd70aee289dbc60c5708e07df8496090687bf9b4659810872f629d53530990820e0da57b792a31add93d1f19 WHIRLPOOL fb91699e99261a3128ac7d931cfa5ec34a8884682935cc0740a129119f0b8d18a2aa83652ee06e0e6900371007cffbaea46f4e5d450ff2817d12e96cc819cca9
diff --git a/www-client/chromium/chromium-62.0.3202.75.ebuild b/www-client/chromium/chromium-62.0.3202.75.ebuild
new file mode 100644
index 000000000000..6efcf7ee0603
--- /dev/null
+++ b/www-client/chromium/chromium-62.0.3202.75.ebuild
@@ -0,0 +1,653 @@
+# Copyright 1999-2017 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/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	>=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.4.2:=[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-4.6.1
+	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-r3.patch"
+	"${FILESDIR}/${PN}-gn-bootstrap-r17.patch"
+	"${FILESDIR}/${PN}-glibc2.26-r1.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
+		breakpad/src/third_party/curl
+		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/murmurhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/boringssl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/py_vulcanize
+		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+		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/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
+		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
+
+	# 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}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	local ninja_targets="chrome chromedriver"
+	if use suid; then
+		ninja_targets+=" chrome_sandbox"
+	fi
+
+	# Build mksnapshot and pax-mark it.
+	if tc-is-cross-compiler; then
+		eninja -C out/Release host/mksnapshot || die
+		pax-mark m out/Release/host/mksnapshot
+	else
+		eninja -C out/Release mksnapshot || die
+		pax-mark m out/Release/mksnapshot
+	fi
+
+	# 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 ${ninja_targets} || die
+
+	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
+
+	insinto "${CHROMIUM_HOME}/swiftshader"
+	doins out/Release/swiftshader/*.so
+
+	newman out/Release/chrome.1 chromium.1
+	newman out/Release/chrome.1 chromium-browser.1
+
+	# 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/elinks/Manifest b/www-client/elinks/Manifest
index f51067c045f0..15cafc466117 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,6 +1,8 @@
-AUX elinks-0.10.4.conf-syscharset.diff 2580 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c SHA512 3b17025054f9cf2ed9934ce5c19859eb50a216a295e6712659c4899c3539e3fc571e6f289809ad2d07be44330b96107a8dd65754c23f978bd54def28a24b88b3 WHIRLPOOL 230294ec39cec90ae84fd23644bcdadb97de8635eb794b4baf8e93d0b0fc2932f7b54ee25f6c4e49166aa4e296ab05f5588561fcab56867bb3caee0b9ab9db16
+AUX elinks-0.10.4.conf-syscharset.diff 2584 SHA256 375d1b5fe3cc693035f2db1ad18bd940448c19aba0b3f6f75e30deb023d40dbd SHA512 bed691b24adf7aa408af01e3a0a905946f9fe95cc5ded7e1448d9159ef7777bc2df1c3ef37c5498fc0f64bc59df80493fc42076bafa708c80ef5cba78e8bca9c WHIRLPOOL f536c9bf51de0697842a704a65329c75e88f8f3393b846eb0aad44ddde8cba8634a6107c1617b84aa74f52dfc869cdf0dba60a0dad5c1c8502f6c9f6ed0a38f5
 AUX elinks-0.11.2-lua-5.1.patch 538 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef WHIRLPOOL 4f84c457ed14a2d7414edbe374623e5295aa9ee8aa71403d386a46b499143a97d1dc78ff5d8951d602f8d60cefc648f79ed02038267cb58ae79ba062e68d1e34
 AUX elinks-0.12_pre5-compilation-fix.patch 464 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe WHIRLPOOL 1a3303d1ed36429bf47b4a1e55a87917d3fe20417f218999c1a02a90c199b4a1dc914a674c86fce8c62cb5cb3ab11019c2547de8c9cb44fe5660f2673b706062
+AUX elinks-0.12_pre5-libressl.patch 845 SHA256 2187e35039ec4f151e98de3c90aa30b186cc654f7181e644d7174af3feb2fa0a SHA512 7cf844e5f62abc20b9fffd29c82a786504db4e645a794b98238ea7157db1fe8bfc3e4c211c674ff182aa5d540350b2c8cae34a61891dc79afa1e2525448b747a WHIRLPOOL 45694f73f39a30b149e6d4d16ec916c27b7f5d2825fd4e9f6aa52d9542545f3c11731ce32b12929c0384d4c2929f7f731e5940511254b33d893e2e55a747d459
+AUX elinks-0.12_pre5-rand-egd.patch 738 SHA256 4e0b07b958685cad86a7099f021371f358dbe88dcffc8bc6f955cda30e9cf503 SHA512 7d23496380658f102d933a1722313d1b0396afb0b349260cb7cf735baec4edd08cb5ad363880d6bb95ef67e46770daa8b4aa57116a53ec36762db05a58ed09ff WHIRLPOOL 6203081b1acb9df84493a7ff0ce3fdc8e0e336a7798780526e4caefd611790ad425aaeabef660fc92b8500135e10ff8cc2d0bd58fc91dea544b22971f790aeca
 AUX elinks-0.12_pre5-ruby-1.9.patch 7131 SHA256 4274a6434c42b669fbee9e75a79bd02c33d50472bbb8e1c2ea441b3d2eae20de SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6 WHIRLPOOL 691d259ea49b1a859680b245a383fcf1da79626e848fb35489bdfa787c0fe0c99405610a10a03dbdde7847a838e8ac060c37136b8f71ce73751449afd7b293fa
 AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34 WHIRLPOOL 03ae46d5a9497ac81db5cca364aa6cda4bfb3dc5864482e11778dfef752ae4c76a374026fafa3e2507c9626c528b483bd68a3277647b4c200de95197507fefa5
 AUX elinks-0.12pre5-spidermonkey-callback.patch 513 SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43 WHIRLPOOL 224e95b0f09c61de04c1b6e9845a56ca94ee5c99fb90a7c9e57800c1cede50658091d7b1b3a7aec5a0bad9b7eff2e5ca4a1f7a107381bf8208b08e1624661f3d
@@ -9,8 +11,9 @@ DIST elinks-0.10.4.conf.bz2 5370 SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c WHIRLPOOL e6f7746407cd6654c19d4bc71dc4d0fd63070a78f7bc7c43f11f6e388268de963748597b0a2fd03cd22632651800b990ec0819d54799be9bfc4589332e11dbdd
 DIST elinks-0.12pre6.tar.bz2 2854500 SHA256 383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f WHIRLPOOL 2501e7ed557dfcc5ca4175bda3452d8c1dc42c2db2f18a0263373b6f28966619e3b3c75b0ed3d9cb4e04d177bd5d88ecdedda541531adfcd35b6ef4fe4920ed1
 EBUILD elinks-0.12_pre6-r1.ebuild 6169 SHA256 8aa6e19508521d4d980065e2e5bcd61eeba3acb5a0c558ca145dbd0b8ddb620c SHA512 55fdeff2c895755867af2b8955f2c998c0f4630a42bf6b42cd04fc06375319711cd9d16148e4c3522f3aee01fc815afc66f8d7985c861aec93edf662c76dd8b5 WHIRLPOOL ea399425b28c4e9a9e4ce58b4be3480e61815917111464728674a2071bb65c2451e84f880a3c23c69dee135fa6f77c43961cb53ac1ab441e42512b4a62605e88
-EBUILD elinks-0.12_pre6-r2.ebuild 6237 SHA256 a77c2f000850daa94ad1678418c3562dfa74d0c3ca771deb4c7f195198fb9b9e SHA512 577d54441d67bde1ef5c184def7966307d6edbcc7f1150bd7877ac52e92986007b78d7940d368a750459d27943e23a412076a3f48f3842f69dcf7fd3ab79d119 WHIRLPOOL 9d2bd6dddfe15f3ace534675a3d70dd340806f799ab19f1573bcea7915fbc39fd41562610589aebe657a2988e581cccb84fa7bd823c98a3473ba0e906fca89fe
-EBUILD elinks-9999.ebuild 4541 SHA256 1645bce21dfd50610d9d70e2adffaed98542f64161d66ab743e6fa2309a9f1aa SHA512 fc872f241992d8239971b64498d3a1e8b3be26de4b37c1ea3369fb5ff823c96d8e93e9d8d0f6e73bd781836fb1c53d6b6ea11d76d905ca8432d0406a6cee36ae WHIRLPOOL 70c9b08c0299576f20ea3fad5767cfe2713449d569c6f599eee99ae206ad8080290c733d3f529192c36360107bab875f349d7c21d9288038591605a8f30d5499
+EBUILD elinks-0.12_pre6-r2.ebuild 6343 SHA256 e807dc2d6d37388c9613b9dab45e5f2af1223dea72e764fdf1bf5b10dd7bd814 SHA512 f5d57136d9cc2d395bf9557e582a117d45836b81434c5ca35674217930be584587da53d5210e014ecf7b21f3e1ae07a63161f94f85631d85665ff4bd68d6b7ec WHIRLPOOL efae0e1bd4100614f3ff069a1079b0d6cd44c078db1c96939d677b4e72191e385757d603dc04b1d6f12895cc35d9257f3bd43c99f6d026c97b73ac6ad6a8431f
+EBUILD elinks-0.12_pre6-r3.ebuild 5416 SHA256 6eb59b803158f6e914ba86e14ff709ed54c07f2fd3b9a846e8a1d1c4d982709a SHA512 b59b43e845a2b38260b44b6ad9d4c152d7dee2df5f79ef95af2370d75611f7072b47492acd2f6d78d82c71ef8c38d32e7310fd5f830b923d991fcbf1186ebe53 WHIRLPOOL c7ce1bf83cba5bd8ca479907aa0438c062b4407ffabb48be73a2fd65208e20be3734cc22efa5ccd2c8dd576fc88643917dfaf217ff2db2655f567cd7a5d2c17e
+EBUILD elinks-9999.ebuild 4574 SHA256 8e8f25753aac8d4bc7d83719869e99f7af5b918c561cafe2a7f1b37011347b7d SHA512 83afd5e717271d062906b5da0c2a3f47af91c725d20f8f5cd183067c69b108bd036fbf5fdc851049f75902af5cbbba131f96bb05c1df2db7fa65d49756dfd713 WHIRLPOOL 2ec12d3bd7ab9de3218345ac6c2a74ff81c89dcbea0e9a96cda041bb8c7002efad3a4ef53ab9005b708b7a1fca329892d2baf98a11b7ce2b7ae76be16c266f4e
 MISC ChangeLog 4414 SHA256 b262ad1bf7c6a9a6f6c235e3c18dc9d1bf8e02464fe9d02261f027f39030daef SHA512 4e638a40d71c0255fbcaaece19e086b2ab686f3925c94e2bdcdd1db4fc0df5d095c288aecbf1f29eb3d20e9c57e64f325914304c57f3a64167d36533136a8f05 WHIRLPOOL 8081af9da11d5348596d8983c316d0419fbd91653f77c526d4ee975165b3e39f0eefc4af8a631694d8206937491915b808229e3edbdb9792b682b01c4db9e5be
 MISC ChangeLog-2015 31519 SHA256 71745c2c3c1045e62ad4e81c483e1631b1ade3613960e1ceac53e7138667661a SHA512 69e0aed4825d552cc2759f4d450ade766d0af7a9d28bb5dcf0b8f2bd84d42b8ccf3ef3c359ddbca50d6a2adde93d69a9cbbfb1354ddf25d5f76b8debd1bfd281 WHIRLPOOL 46b05f4a92f49f420abd0841116d3e302d5ce9078a8fd4c8df3fe2e56941ba6a21567bbb5130d8a54e677913c7dee25e4a45a27743ce7e3dddc2939e8b0dfe17
-MISC metadata.xml 635 SHA256 03fdbb613dbce47c3e8cd7be83528bdecff6968042931989755f8d55ff4110f3 SHA512 66de279c7b713e59e8579d0990213a152c2a040b02224b4a813e77417aac71fbae4e6ae1e7f0885d1fec5e08dae3d6cf38301e783a7aa25a48250af69b5bfc01 WHIRLPOOL c7e497d81566d35ae20bdebe8b8d8dad03c8b505a522cd59f98dfefaeab8f10639601fcc034362beeea3d0103824eb7b98e849e383696ebe93ceda62f41f2a92
+MISC metadata.xml 989 SHA256 cc80a0b131e9c1dcb136c3b9820bdc1d8d1219a9bbbf1b82818532adcbff4584 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990 WHIRLPOOL b97ead80f12aba36dac7afad2b9e3e7744501a68226cb5929dafceb6e97f3525380773cf13914adb6922d4d1088e6d4232f802f6735d05eb57d643a39052205e
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
index ed3f69831bd0..e9e8625888a0 100644
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
 	epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+	epatch "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
 
 	if use javascript ; then
 		if has_version ">=dev-lang/spidermonkey-1.8"; then
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
new file mode 100644
index 000000000000..b57789f25fd0
--- /dev/null
+++ b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
+	https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
+RESTRICT="test"
+
+DEPEND="
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gc? ( dev-libs/boehm-gc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xml? ( >=dev-libs/expat-1.95.4 )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5:0= )
+	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+	idn? ( net-dns/libidn )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
+	samba? ( net-fs/samba )
+	tre? ( dev-libs/tre )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-parallel-make.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
+	"${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
+	)
+
+src_prepare() {
+	default
+
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv ${PN}-0.10.4.conf ${PN}.conf || die
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+	cd "${S}" || die
+
+	# fix lib order in configure check
+	# (these seds are necessary so that @preserved-libs copies are not used)
+	sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
+		configure.in || die
+	# Regenerate acinclude.m4 - based on autogen.sh.
+	cat > acinclude.m4 <<- _EOF || die
+		dnl Automatically generated from config/m4/ files.
+		dnl Do not modify!
+	_EOF
+	cat config/m4/*.m4 >> acinclude.m4 || die
+	sed -i -e 's/-Werror//' configure* || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
+
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	if use ssl ; then
+		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
+	else
+		myconf="${myconf} --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/elinks \
+		--enable-leds \
+		--enable-88-colors \
+		--enable-256-colors \
+		--enable-true-color \
+		--enable-html-highlight \
+		$(use_with gpm) \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with gc) \
+		$(use_with X x) \
+		$(use_with lua) \
+		$(use_with guile) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with idn) \
+		$(use_with javascript spidermonkey) \
+		$(use_with tre) \
+		$(use_enable bittorrent) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable nntp) \
+		$(use_enable finger) \
+		$(use_enable samba smb) \
+		$(use_enable mouse) \
+		$(use_enable xml xbel) \
+		${myconf}
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	insinto /etc/elinks
+	doins "${WORKDIR}"/elinks.conf
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+	# elinks uses an internal copy of gettext which ships files that may
+	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
+}
+
+pkg_postinst() {
+	einfo "This ebuild provides a default config for ELinks."
+	einfo "Please check /etc/elinks/elinks.conf"
+	einfo
+	einfo "You may want to convert your html.cfg and links.cfg of"
+	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	einfo
+	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+	einfo
+	einfo "You will have to set your TERM variable to 'xterm-256color'"
+	einfo "to be able to use 256 colors in elinks."
+}
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 86a85d7419f6..f608a19718e3 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit autotools eutils git-r3 flag-o-matic python-any-r1
+inherit autotools git-r3 python-any-r1
 
 EGIT_REPO_URI="git://repo.or.cz/elinks.git"
 
@@ -16,14 +16,14 @@ SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 RESTRICT="test"
 
 DEPEND="
 	${PYTHON_DEPS}
+	brotli? ( app-arch/brotli )
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gc? ( dev-libs/boehm-gc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -38,39 +38,43 @@ DEPEND="
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
+	tre? ( dev-libs/tre )
 	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel-make.patch
+	)
+
 src_unpack() {
 	default
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+	default
+
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv ${PN}-0.10.4.conf ${PN}.conf || die
 	if ! use ftp ; then
-		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
 	fi
-	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-	epatch_user
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+	cd "${S}" || die
 
 	# Regenerate acinclude.m4 - based on autogen.sh.
-	cat > acinclude.m4 <<- _EOF
+	cat > acinclude.m4 <<- _EOF || die
 		dnl Automatically generated from config/m4/ files.
 		dnl Do not modify!
 	_EOF
-	cat config/m4/*.m4 >> acinclude.m4
-	sed -i -e 's/-Werror//' configure*
+	cat config/m4/*.m4 >> acinclude.m4 || die
+	sed -i -e 's/-Werror//' configure* || die
 
 	eautoreconf
 }
 
 src_configure() {
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
 	local myconf=""
 
 	if use debug ; then
@@ -79,6 +83,9 @@ src_configure() {
 		myconf="--enable-fastmem"
 	fi
 
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
 	if use ssl ; then
 		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
 	else
@@ -94,8 +101,8 @@ src_configure() {
 		--enable-html-highlight \
 		$(use_with gpm) \
 		$(use_with zlib) \
+		$(use_with brotli) \
 		$(use_with bzip2 bzlib) \
-		$(use_with gc) \
 		$(use_with X x) \
 		$(use_with lua) \
 		$(use_with guile) \
@@ -103,6 +110,7 @@ src_configure() {
 		$(use_with ruby) \
 		$(use_with idn) \
 		$(use_with javascript spidermonkey) \
+		$(use_with tre) \
 		$(use_enable bittorrent) \
 		$(use_enable nls) \
 		$(use_enable ipv6) \
@@ -123,20 +131,20 @@ src_compile() {
 src_install() {
 	emake V=1 DESTDIR="${D}" install
 
-	insopts -m 644 ; insinto /etc/elinks
+	insinto /etc/elinks
 	doins "${WORKDIR}"/elinks.conf
 	newins contrib/keybind-full.conf keybind-full.sample
 	newins contrib/keybind.conf keybind.conf.sample
 
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
 	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
-	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
-	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
 
-	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
-	# are more or less the same.  -- Fabian Groffen (2005-06-30)
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+	# elinks uses an internal copy of gettext which ships files that may
+	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
 }
 
 pkg_postinst() {
@@ -152,5 +160,4 @@ pkg_postinst() {
 	einfo
 	einfo "You will have to set your TERM variable to 'xterm-256color'"
 	einfo "to be able to use 256 colors in elinks."
-	echo
 }
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
index dc64712b29a8..83accf4c2d95 100644
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -1,5 +1,5 @@
---- elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
-+++ elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
+--- a/elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
++++ b/elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
 @@ -12,8 +12,6 @@
    # obsolete config.saving_style. You shouldn't touch it.
    set config.saving_style_w = 1
diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
new file mode 100644
index 000000000000..d41ab689e9f1
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
@@ -0,0 +1,29 @@
+Adapted from upstream
+commit 54ebe365b752f8969a67279d0d29552ab638e025
+Author: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date:   Mon Mar 6 17:39:36 2017 +0100
+
+    Compilation fix for OpenSSL-1.1
+
+--- a/src/network/ssl/socket.c
++++ b/src/network/ssl/socket.c
+@@ -67,7 +67,9 @@
+ ssl_set_no_tls(struct socket *socket)
+ {
+ #ifdef CONFIG_OPENSSL
+-	((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
++#ifdef SSL_OP_NO_TLSv1
++	SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
++#endif
+ #elif defined(CONFIG_GNUTLS)
+ 	{
+ 		/* GnuTLS does not support SSLv2 because it is "insecure".
+@@ -145,7 +147,7 @@
+ 		}
+ 
+ 		if (client_cert) {
+-			SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
++			SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
+ 
+ 			SSL_CTX_use_certificate_chain_file(ctx, client_cert);
+ 			SSL_CTX_use_PrivateKey_file(ctx, client_cert,
diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
new file mode 100644
index 000000000000..6c5679a95bbd
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
@@ -0,0 +1,20 @@
+--- a/src/network/ssl/ssl.c
++++ b/src/network/ssl/ssl.c
+@@ -84,11 +84,16 @@ init_openssl(struct module *module)
+ 	 * cannot initialize the PRNG and so every attempt to use SSL fails.
+ 	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
+ 	 * application coders to seed the RNG. -- William Yodlowsky */
+-	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++	RAND_file_name(f_randfile, sizeof(f_randfile));
++#ifdef HAVE_RAND_EGD
++	if (RAND_egd(f_randfile) < 0) {
+ 		/* Not an EGD, so read and write to it */
++#endif
+ 		if (RAND_load_file(f_randfile, -1))
+ 			RAND_write_file(f_randfile);
++#ifdef HAVE_RAND_EGD
+ 	}
++#endif
+ 
+ 	SSLeay_add_ssl_algorithms();
+ 	context = SSL_CTX_new(SSLv23_client_method());
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 983c04de930f..8dfd5728bec7 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>felix.janda@posteo.de</email>
+		<name>Felix Janda</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
+		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="finger">Enable support for the finger protocol</flag>
 		<flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name="gopher">Enable support for the gopher protocol</flag>
 		<flag name="mouse">Make elinks to grab all mouse events</flag>
+		<flag name="tre">Enable support for regex searches via <pkg>dev-libs/tre</pkg></flag>
 		<flag name="xml">Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a80832f0d156..30f5349ae8a8 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,9 +1,9 @@
 AUX epiphany-3.14.0-unittest-2.patch 1725 SHA256 00a00190fcfec6bc06d411fa150fc31c833d7636d3508d30be8042bb514c28b0 SHA512 5ec81de76fb8bb1574e954d5bdffd81114c022d558573f049c415f037855b65c03e727fd3fa2ce557c12f3a17921dc655c60ef4e1ad06f3bc9a6a42e58ddde70 WHIRLPOOL 437a8b063e7fc0208afc1c409f2c62e00215a64b504b5d2ed42aa4112a8ad7c126c5f88649bdb00b750bf7af84565f5d1bfc4fc1780c8a85774b7ed074ac8283
 AUX epiphany-3.16.0-unittest-1.patch 972 SHA256 fd90814e0768a4c776f909f861ac519b9ed6c3a268b70ba695c6227f67a75ab8 SHA512 ec59eb312e7826306af76fc587fb9435c6ac2da96cd574df381829bda2e2f987a47afef9bdff0e8dc162fe63f43d1a744edc84b84ae387edd1279d77ebdfdc86 WHIRLPOOL 86828f81a6e4339ff8fff4502311c014103942e1902869bb13f2dbaf2fd8b579750e835d66300e13ae012035558e07270bdf53ad1884e367cc9ff9badeacc8ef
 DIST epiphany-3.22.7.tar.xz 2293224 SHA256 a15b7ec19644eec8d40ce11286bbca28ac188202b47e2b9fc593ab0974e9c784 SHA512 8150952e89b86d05958bd9f9a0c78ba583764ec878220c8e328cb936108faf25a10837e038bd1a0ba1279555d2f95f819477cfddcb67c31e5b4c3533daf446bd WHIRLPOOL 1856f814a08896e6000085bc34a1097c72d2cd615263e5974b2008088354644cbb58ee8a3ffeb2d9c3b5edcea5a5c56cb4305b200fb6dfc86a0766fe686b90d5
-DIST epiphany-3.24.4.tar.xz 3213184 SHA256 15f0f664bed190143cce8a03f610fa863b92d9502513c107304e5285924ee5c9 SHA512 98ca26f8f962b8b68c90ac71f793e3c967ba15edab3c4f5dc49e3e325ce8ec02c8fa3c0d3b885ab123637593963ce29583280a03ac70ff3e9a55b7ce91c7145b WHIRLPOOL 5c3c45e07f50a02103c93fdb797fd83c1a29e453930c713089078aee644e40cdc207c6de34992a801d11e987677dd8455957589ed9027b468924d3f33801efe2
+DIST epiphany-3.24.5.tar.xz 3216736 SHA256 fb84bfb1919ba1075d19102a74dd461277ac4666e287687695f7337249d9b2fa SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2 WHIRLPOOL c1d3a6ec1ec528fa62973f5ebb74157da60bd38779ec171eac4e005db7f31e68cf215987a04fe1953d95a9e5622c009121da19c1a4568346354c8494dd1e554b
 EBUILD epiphany-3.22.7.ebuild 1743 SHA256 edfd52cedc963e6782ef5eb901e5cefd78ae2705c5f39a292547d991f22d8d74 SHA512 c8eca05bdffc6a2f0907059d17e96e9abb93084694197f00bb4371596c5cd59d94f16d47f831e1a5bccb41b028007758436f2480900ec25baa3fa0d1bfd15f8b WHIRLPOOL 03eb5c0e20a7688f067f10c677d56dcdb53c409ab8f9b5642cbdb7bf07e384df95463646881720e0a1131d6420febe81cb8140998c936bdca132e0a2ccc2592a
-EBUILD epiphany-3.24.4.ebuild 1979 SHA256 0674285832ea99cf14c9430524dac200fb786a3dc0986fed260a17fdbd671d83 SHA512 04f7dcd409932e6cf5600203045c9e4d784e2b7c38c2bb589c162cd4e576f7047b61ae40c26f9b8031a233719efabe3fe8d11dfb2b3aa61aea85fd0f3b1f69d1 WHIRLPOOL 9db980dfb8a4dea32de75b17995714c7e15e55294fdb2bf9dc97b708bd7ebbf09ed488843b5a4a05797cc3f6f7c150cb055b3e980e433cec47e83735fcbc5e32
+EBUILD epiphany-3.24.5.ebuild 1951 SHA256 b6aaac88bb48a7ddd85791fa24795ff355f274d1da5f9447a55a238522591906 SHA512 c2fff8679f18caff5a1583a19b70e0e4887b5b0b52f1de076ce3c5947ce25a309c1baaf1e566c0b072f3a6ed05183b822c7a5a0898b3542943b7a8edc5830d4a WHIRLPOOL 975e7ecbf22c8cfe6b69d30d932859dfc5288d7614d416953429ff30534ede74ff3919e65e4e10e79b79424bc9963c6bacbee550f1d31e8d25b8a48b33ba9b2c
 MISC ChangeLog 8700 SHA256 1a2c633cdf2ea8a12a408fb35f2f63b2a5e17b6c0214262194403846c01fe483 SHA512 6e341b5cc1ab9853b005db985ec5e5fb6b39b2ac990690b6f203fd7b5cfb0abcef4c2a77c5b9c828a6e267d742b4b2b87fc617146ba3b5639a8e4c2d7bbb7820 WHIRLPOOL 6d614e372b67e46210dee8d95aac7167d5a1405dab3ebb5061b6bfadd9b7aafc41913238a369b0f47017fb66bfc7c4b30005827ecdaa7218ffeb9be06a207f80
 MISC ChangeLog-2015 61615 SHA256 92160101f6d5fe039ed495b9109213d629d5aee30889c414d8d9b47f20267e83 SHA512 3dfda780cd8154576968bc8597a7a17f2336bb0ac5f52fe62880817382888cd6664f925048fdb583da2cdc0f4386f37e3159ff151a9f12fc1bcae05817e53406 WHIRLPOOL 06d760f36bbf5acc2cb132c98ccdc364d7fc4a3ccce641dd9bd922bb094c8126e57db4aaccad59491c0669f8fa4d1891a86ad86418b71968341c245e59454855
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/www-client/epiphany/epiphany-3.24.4.ebuild b/www-client/epiphany/epiphany-3.24.5.ebuild
index d98149a5ecf2..fc7f99fdd507 100644
--- a/www-client/epiphany/epiphany-3.24.4.ebuild
+++ b/www-client/epiphany/epiphany-3.24.5.ebuild
@@ -23,7 +23,6 @@ COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2
 	>=gnome-base/gnome-desktop-2.91.2:3=
 	dev-libs/icu:=
-	>=dev-libs/json-glib-1.2.0
 	>=x11-libs/libnotify-0.5.1:=
 	>=app-crypt/libsecret-0.14
 	>=net-libs/libsoup-2.48:2.4
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index aa3f1ddcf951..77d27d2fc0ea 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_62.0.3202.62-1_amd64.deb 49451474 SHA256 38f3c45d99381711226670da25a80c1b085a550943c56cbe84d672a074daa181 SHA512 87c7a1f831876670e985d6a78138895dd8e1b72f1f840f6651cfd89d688578b47cae21bc9eec86d95e9a6def7962e3ac6d73af3d762a33f557640896256dea57 WHIRLPOOL 41236eb0c41bc00362baccfc88ae2ed07b6e039315eaca72a772636e65f211027726876c8bd29bf26adcb1eefb8ac07b3a22b6cd07fc21ba0aced5a2ebbcdb8a
-EBUILD google-chrome-beta-62.0.3202.62.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
+DIST google-chrome-beta_63.0.3239.18-1_amd64.deb 50018880 SHA256 982ca07a579c0d39b46fbdc0bde6d8fa16ce09f2bf51be4d2030a93305ba49b1 SHA512 1fdf8ecd2aefe0c3d3350e0e1824027e780ee3d8a8b313443ee2f78be488403abb0adae06d768cfccc26ef738372c0826b9dc1308165c8c7568782869b8f6a3c WHIRLPOOL 5bc2ee12644f9f52ed81e0445b0f4e5c3c4b800895779e0d3c0235b0d59b22bb36eb644bfee14fcb9739f1cbf02501b8ce94ead79ebfeaf0532a7ca534f8bbb3
+EBUILD google-chrome-beta-63.0.3239.18.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 21904 SHA256 b56029d26bb3007cfc2f52b8d5031881a614b643fcd2b5966ebb050d567a9ff5 SHA512 1fa256503b4ee20b0e8f8b3e3af6a4d1e581fa2050a0199dcce6495960c74e62e5bcc9b37309671889afe7fc4ca443a0e1f21626d653d426b4ed9582792e9e7e WHIRLPOOL 24e45971afcbcf260a68aee5dac7b2db643d139a0552568d39c0e8b7567435fedbb9a8b5a87563bbd24c8dcf9a9c9a25991a24680bb27c4f7bf1e3dbaf6feada
 MISC ChangeLog-2015 18731 SHA256 244ca1dc0c95828216c5a3a9878ee0c1bf6ca757885b8afc39a9cbd11d7477fc SHA512 70b0fe368012d1d3bd0997af71bed3fdb0f3933383ef4c0335238a7f016435f48f03ccd2c2cb432445c3b0dc1b9e6dcd3b687e65c478899b7bae0701bbf250f2 WHIRLPOOL ddb2e222026feb62390eb8bcc07514c1a00a177fada1eed838155637afbf00fa139e5a59e1175bf7157c97a7aecc6a1aff7ae4304d3251c993661da1105f461a
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-62.0.3202.62.ebuild b/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.18.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-62.0.3202.62.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.18.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 192c996aa446..50b101ca176c 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-unstable_63.0.3236.7-1_amd64.deb 50180726 SHA256 f077a884dcd4d6f2dcc25ec518e46647f5e773bb67cccc8ee8f7715b208d44b1 SHA512 40d61b06ddddb47ca3e1b61a325ff2541b3a07b0b72a8fcdcd5459d76add0d3a5567a8315cbc29c2707d37a952bfc78b67cda26398f04f6af3453cb73aed0f37 WHIRLPOOL 393da715aefb0eabb4b9f926f5c467a55ddbb03760e96b1ae4d448fc8e7bebaf953e22a7589397100c385d4f0d2fe113e69263cef7501d0a87fa1ebdae5f64de
-EBUILD google-chrome-unstable-63.0.3236.7.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
+DIST google-chrome-unstable_64.0.3251.0-1_amd64.deb 50499978 SHA256 ca8f4ec300219c4cbdddd94e22dab92d79dd64b66ad84fd83e32353c3d82661c SHA512 d5b98e64e5dd3c39996ef67b273249686fe96db8aeb34f37b0ce0a4d71a59d88e228de58999b71b6fb7d63610d6a1d963c3702c4e3b7c85065ae328cbec0e5d6 WHIRLPOOL 35b734582de2e332fd640536c41736f7b27412e484196f412ac354d32255c4e151226881ceeb0412dfc77625890324706473e17cc63cd626800677c876cf964a
+EBUILD google-chrome-unstable-64.0.3251.0.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 26760 SHA256 d211ce81fe772ad972458400d9065f652f351a6dff428e1ed65abf256476219f SHA512 3341263860b9c45ade48a8bc0c83303b15ddadf6defbfbcabd6864896d67cf51b818afb3fafb064a373cc89c2b93eb1a27af2b2a8f8e8761a54d1bebbbc0b32c WHIRLPOOL 0c61e5cba799fb10a3e6b123f4c63f9cd6c394a40f4226f6f9b7db97fd1f5ed26c0909013e1d2d037ecbdca9539db590a42589bf78aa4e6955cd01ee5c4a9075
 MISC ChangeLog-2015 24195 SHA256 03cd9f706b00090ca8e0a16169bc3c45a48f3e499191f7fb6565f1988b5b8f62 SHA512 6b25f7c076af400be3e91275fcb82401d40b50327dd76a5796f0d94cf16747a6a5e4dcfa1a3da2ee737dc6bf6ed833ce6e7e2bee31a70c913b76c10f8f44e7b6 WHIRLPOOL 3753a9bee1820b25997933975fef361befc8eb3cdb42562d66b9a35b894738ea687866050be7d5e4c9c48cba0255d0797fe881ea36e4bdc5d65599ae5d45eed8
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-63.0.3236.7.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3251.0.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-63.0.3236.7.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3251.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index fa65e3c48720..9638d354e4cb 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-stable_62.0.3202.62-1_amd64.deb 48500124 SHA256 98a34a85ba0018d3897a8a11de9f29df08e77d64a9d991df66fcf5c5cdd957c6 SHA512 fbab95c597542961701cdf50c89d04a79138019e0f805fdefdc86474748bc83d3a7c3d16153768bd50cd360e02c302cfb1fe00f612290fd2472da698f9b595de WHIRLPOOL b2096af5f28373b497540513769497604e1ab22e88f908f12745881807ebdb067341b224598a98fc250af135fe38ba15a0432acb87aeb5bea0d1a38eacd09199
-EBUILD google-chrome-62.0.3202.62.ebuild 3536 SHA256 d67e093912b71d32bf2f76ba784200c2715e43168e28f5c5d74c56ffe451c101 SHA512 bd8215fd16e9881fcdf712e20b0f9b5df8c5ffef6beee296b927d084f2619748369ba95318cd3238f80ad330c0be8f0926153f6c3a653fbbb09fa0780441055a WHIRLPOOL f5539db2d7c8c470ed1b7b16196614bd259a8a2dff4a3f272ffa50f947530c54fedd76c463c41a0d3a32dac2fe4251eca14b2502e59863ab596269fdd4331483
+DIST google-chrome-stable_62.0.3202.75-1_amd64.deb 48725174 SHA256 1d54877408fa494781fedb0982b77eab0bc38f86041d0739e87a5e3603148f30 SHA512 d0a304b9007bb645b2ed0850edec186f068c21c9f15f336bb2e3b94c4b2a3f942e2c76fb7f627f741a1560774774469318edefaaf0875e0dbc3547d838559c25 WHIRLPOOL bb9207b1dd4ca30d86302d73de9bd7cbbd6cfc727b8870990d346c2f101f463bbfc5312f0bbe41f8f6cf8862f2739d57c211d36afb81d64ad5ae92c2562f6e37
+EBUILD google-chrome-62.0.3202.75.ebuild 3536 SHA256 d67e093912b71d32bf2f76ba784200c2715e43168e28f5c5d74c56ffe451c101 SHA512 bd8215fd16e9881fcdf712e20b0f9b5df8c5ffef6beee296b927d084f2619748369ba95318cd3238f80ad330c0be8f0926153f6c3a653fbbb09fa0780441055a WHIRLPOOL f5539db2d7c8c470ed1b7b16196614bd259a8a2dff4a3f272ffa50f947530c54fedd76c463c41a0d3a32dac2fe4251eca14b2502e59863ab596269fdd4331483
 MISC ChangeLog 15250 SHA256 73cfe6d0cbf08ee8af13d3a4f9d4766a7fc1040475bce04983d9c033ad41b288 SHA512 5c6a4881e92fd43fd57531d36aa84ff96e003d135f1349ae7af496fbd447d866ffc06b39439bdda491a2c33192ddbfcdd38c38d5817d4bbc132717d8d626282e WHIRLPOOL fed163457dd66744687e272904d11da742d612cb00bc7c4ec5a879fddaf763fcbb1f8edba843ee74778a0220882db627864aef34bee96dd6da83310fce9289e2
 MISC ChangeLog-2015 99571 SHA256 2e606e15340fff7031cc7cedcef68d619d6109ddc5c99a99bcff9b43b83dbe76 SHA512 0b6c83844cceb0ccc3b8afcece7c374e5a6e018b89575c8515968aa585da9ab9162bc7cc01208398d1c945b6fd27db9501841784b35cd24e27a1dad208ebc11b WHIRLPOOL f77a08d02c17bd51f926d4a1377acf22028c441316906f5664346e7a28e4eb19c8d88bda26016756e88ca3ada2bda406a92ce6dbe021d11e4ea55e718eb63a95
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome/google-chrome-62.0.3202.62.ebuild b/www-client/google-chrome/google-chrome-62.0.3202.75.ebuild
index eb98674ec422..eb98674ec422 100644
--- a/www-client/google-chrome/google-chrome-62.0.3202.62.ebuild
+++ b/www-client/google-chrome/google-chrome-62.0.3202.75.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 46de819e0771..fa6f18621beb 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,7 +1,7 @@
-DIST opera-beta_49.0.2725.18_amd64.deb 51398360 SHA256 f8dfe57b4d907d7742f536fa9b5420ddc81186dab650cb34ac9d98191efdae25 SHA512 ee40329b70cb14cfa91b11db3189f0a3748f481f6dbc9ecdf06cc72a13ccd589f56ae3445fc2b6ff4664f50360056c3376487bbecadc708756218fdbf9575a10 WHIRLPOOL 5729432593e5ec1251fcd06595ce2c2eb8d601c5653352370fef70fb012d33b973eb5594e7a42770368786446208eeb1856a293d5d10a9d81be878e5623f60dc
 DIST opera-beta_49.0.2725.23_amd64.deb 51405422 SHA256 df69ee3a7ba658303bcbbb793812129017c270a81d50c90448553ed524252ff2 SHA512 c55688edad0294e00181a4b0fb1475a103cb1fb1d4949a5c029e846d82cde13ee697c90ee7ce7bebdda03ee6b63a4b48413f383d33ddda17b8c941f62bd23a0b WHIRLPOOL 25125d4185f64dbedbcd1d2a5cef23759cacf96b540c94aee38f1c87101738db74e379ee85f022caeb12bed37858559557f1517dcc4350cbc61a2edbf129caba
-EBUILD opera-beta-49.0.2725.18.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
+DIST opera-beta_49.0.2725.27_amd64.deb 51520734 SHA256 2223449c47bccf6e7320b8bca159ad0c7e6e3f6974b6e348bf9f2793c9c4d5c9 SHA512 feecc11cc940e433b6838582a821a9c1a02d05c4184da7c608e20e05061170caf20dea1b2bfef6fb1144c7e236ba5f6af7471efbade3b8b6a36a7a86a7c3f2e9 WHIRLPOOL ab547c6d651454b25908261b75604e9959304f34af04bf3a7321095c372a8d9c43449392f4fe365f27094875362f82b54642a1604e5b049f60dfded0e6a41713
 EBUILD opera-beta-49.0.2725.23.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
+EBUILD opera-beta-49.0.2725.27-r1.ebuild 2316 SHA256 4f489cb4f226c90af70201f11ab39a8ecb022424d8390d90467773c66dc332d8 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf WHIRLPOOL b520987a250fe9a55cf98f70518cf4e3544090365826af53fbf68550b00690a318e51f708506d81e46026bffba1bf2d2195c06a1a5413e4a10120a2477e384c2
 MISC ChangeLog 15103 SHA256 fa2792b312ef741fa92927cc59971a69072fe6805e76db02a06b8116dac44f00 SHA512 9affbf0fd1bdaba029e118a98a2ac3c5f15f93da18ba1c44432f4bb6340320183eb97794bc7ffebed6eb7c87075278aad19d81eab4e1049f7de0d10d53680cf3 WHIRLPOOL a375ffb483a8ef6f8654787d58fe831f6f1e44ff5fb152d0f113ee05801b3abaf64f5f7f039cc2c9960b425ea3b566a4023c79c2e72a11f8d2bd8a6730ea0054
 MISC ChangeLog-2015 5355 SHA256 609cd90fcfb8b6b7bf0d6a267d21eb0919244a066a84aa1c52d78bb7c314b758 SHA512 75aa0b1de69d27cd099c7d87ef45a694346cb2b45b8843db71fea4155f141122ff563813a0addc83132a548cf0f7251903abb32e3d659da225a6a25d009b4671 WHIRLPOOL da3039eaf919802faae87a7295089aff1a44c025431eb95277e0cfd10a6ab77849720eb380e8b0558d06bb69979308495f00919b2222474f39022843d8a6d9e1
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.18.ebuild b/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild
index c125ba2ec2ad..96ac80993a41 100644
--- a/www-client/opera-beta/opera-beta-49.0.2725.18.ebuild
+++ b/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
-inherit chromium-2 multilib unpacker
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="http://www.opera.com/"
@@ -96,3 +96,19 @@ src_install() {
 	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
 	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 5b68cda57a98..7184f0f8947a 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,7 +1,7 @@
-DIST opera-developer_50.0.2739.0_amd64.deb 50078620 SHA256 7b90cf95784f99f4d331ee573dfeb88e8772a98f58636bcf0720414d473ef560 SHA512 40666d167537c34c189da81b49d781a48bf7529b913faf33f5e48ac9d01076e3d43c23e44b1ad3b485af56fcecf3632cf26fea1f717d2298c733e42aeb4f9d2f WHIRLPOOL 5ae1491bb585ee4644af530462cdb23f10247fd635508681381ffb978d62c704a771d4818cd6f30c743d544fea598ea9f4b08f0008f3845b406fdfffba07c089
 DIST opera-developer_50.0.2743.0_amd64.deb 50330442 SHA256 ca1f1c29ce4ef2eb8a7ab4ebebd4250c6c437ade3caf23cb828da815ff665d8a SHA512 68c897427af2bc448704005f6250d335d99d28a965bc16c7468303fec7cbb5a2146b53cb5dc27b3dbba1afcba6061bbd3556845784b222dbbc1655d7f6c00a84 WHIRLPOOL a2f8da14a9448e9c5e515a4209df4724b50a3f79e565571473bca0bbde71fd6d0acf39ba3c05d6ef8ecfcb7fa0e6bf7aa9829b42b43509188a3748ed24381e80
-EBUILD opera-developer-50.0.2739.0.ebuild 2044 SHA256 1e1cabd03e6b27b19f683210b3451b808ac892076e3d88b025b4e4e616d5e966 SHA512 38157ad10b0e33ecf38925d6c0472c22cd167628f48d2d160c74f103ab5c85751fc58be165823fe7262160d9f10ee1c1a888acca9a3363635d50cb07698058b7 WHIRLPOOL abde7dc3ab167529db2124efa369571d7f8bd939b5b7afc823dc00299b3b6613e663c88df5a4f48d2489a0d18dd760b017ea3345ac6824f14fd9e5fc37ebe50a
+DIST opera-developer_50.0.2753.0_amd64.deb 50446720 SHA256 b265d88d484e8dd66bebc85914503031b4275d4bf79c5b4143e9295bc480e4c1 SHA512 1babfa6a4ec10ee28d3c1a034dd610bb557473e264b7db29355c014a9a4f2f975834e8d6cf8334f692862a99a4a9b39db1e9528fd9be8c969adb1f56b9ba3c43 WHIRLPOOL 7c4c3ca31650a7703bd6a5aaae1e5196d8b8a9493c15f26a35389803d2c5020f2a3ecd6aa82e1236799d269c8c0ffe10cf553bcdf9cd6ef6e76ab4193109bf66
 EBUILD opera-developer-50.0.2743.0.ebuild 2044 SHA256 1e1cabd03e6b27b19f683210b3451b808ac892076e3d88b025b4e4e616d5e966 SHA512 38157ad10b0e33ecf38925d6c0472c22cd167628f48d2d160c74f103ab5c85751fc58be165823fe7262160d9f10ee1c1a888acca9a3363635d50cb07698058b7 WHIRLPOOL abde7dc3ab167529db2124efa369571d7f8bd939b5b7afc823dc00299b3b6613e663c88df5a4f48d2489a0d18dd760b017ea3345ac6824f14fd9e5fc37ebe50a
+EBUILD opera-developer-50.0.2753.0-r1.ebuild 2316 SHA256 efffb72210be941d46dbfd1fa49629ffe2efac7e9f5ef5e542984b7c18492030 SHA512 5df232e6a39fc6b70a1bca945a84042fa85e606f79832d650899ba0c32301cbad46c5b70bc7c2d5b4b4814991aa2263d012b3808680ef0c8c43f27655e481dac WHIRLPOOL 82f8a1236bc7638da44f2dd2f4cd96579edf87772a417552c67448dde1a8d8978140d4618ef1c14dfe2c9fca668fb44997ef69cfd3722215cce6a22017236047
 MISC ChangeLog 16377 SHA256 1a4a1e4e3422a894db2726fe1ceac5c2f77bbac69c6b054d52b4a026552e8a2b SHA512 3429c4032a9d8db677e166e4717358c658ddeb88e6d754aacb0897bacc9cd4903e94d21fa6746411cbc3ceb3f332170a9f74fa876f18335647a869fcdc5a21f1 WHIRLPOOL 93588892f12187d28d78679b944a5d240cb4f3fc84351ae78268d62cf61f0eabe1de847ed80e99179ece933170612ea3dbde22834c6a1f441bae260e7c4ea8bd
 MISC ChangeLog-2015 8576 SHA256 c7585ab906eb43df74fa3eee2938df70b05358a563cad5e2753175d362b03c6f SHA512 f3008826717c39fdd3c3e9b8f427d2ec31d9bdf108cfa9605f7457dfd317da43418f625ba14b2a20e5b38bbff10b27bda7ba0d4caed454f960567f1dd3946580 WHIRLPOOL e302edaee04b3b67a4c89a3e385a4d3daeac33eb4fc6f7d4155b17156bbe574aeb108da4d848cde6db71c8bdb22b8048fa5478ff05a63e91bf7552ca2864f900
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/opera-developer/opera-developer-50.0.2739.0.ebuild b/www-client/opera-developer/opera-developer-50.0.2753.0-r1.ebuild
index e915da3167e1..79b9f057efbf 100644
--- a/www-client/opera-developer/opera-developer-50.0.2739.0.ebuild
+++ b/www-client/opera-developer/opera-developer-50.0.2753.0-r1.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
-inherit chromium-2 multilib unpacker
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="http://www.opera.com/"
@@ -96,3 +96,19 @@ src_install() {
 	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
 	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 4b1e14a7d509..9403872c8408 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,11 +2,11 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_48.0.2685.39_amd64.deb 50196574 SHA256 e5b67f5cd19337edab6dc7e7c2660ff8d5e0fd88c1c255963903530ffb01b51e SHA512 e7a934a45fc0de8214431496766cb14d4b232f15b446c7d97df5088f0d92672c6583932f522b7bc82ffa979146351281a007c68eb2335d4744f2628d08f84832 WHIRLPOOL ef8d7381687e25ba46643ce39fd921e3667c3e6c0a288346caf4dd1f43e9bd98cbbe9fb142e4718cec30afa84c1656b715f6d42916cd92076bbc6ee9e101babd
 DIST opera-stable_48.0.2685.50_amd64.deb 50181884 SHA256 83c7ec7db3331de54200b7f4189acc6ca9a104b0908e05312549cd3b32ec8677 SHA512 f4e775d9e8fc1f589dda8c48e558fac93907300ff8054b9408ac656293982cf2bcbb9592279313d46efe88e2c977da6f8b39e6db8ecbe687f6135cdba2c61d5a WHIRLPOOL 56ce7a471cf9678cadad123920dcef99b1bd3349dc9576636826c679b467e2cb5ed1f7c64ccc13ff42b4d4412ed3cbdf96c5b3abae705a17ff7a9344e65733d8
+DIST opera-stable_48.0.2685.52_amd64.deb 50149108 SHA256 1709b44fe1daca3df1063e0566716768c1476fc455fd6d75078d68252096f608 SHA512 ef104214ccac7e5b55ba30484dc9756036b87bc8cbafa99e7f2e06641e71385e31ce35b922b1ff50ef9eb3a7083b133e48450baacc2ffaba0c01becc855833b9 WHIRLPOOL a015885bb2e1bfa84691fb7c78b9af827aa4a17ab6533bd1546ed1231f505f2bb389623ddf57c38480c025025a9cf8a1302f9860caa809844ed1630e01f6b318
 EBUILD opera-12.16_p1860-r1.ebuild 5987 SHA256 3f9a2e893b5204919f51ffb18dcc9b43370529d28122d0787d504fbf96d61869 SHA512 f0fe61c21d4a8180b5d0149aa0d4621bf60e4684803828f7743e73f894386e0c3945201ec46f16ea1fda4e780d0ea3447f32d55d985673a1643b2055efb12099 WHIRLPOOL 68a5f0263ff917476de41bf978ecf067a8ecb87191f7f404a040b0ceb0abb0af48cad027ebcecc99afe66cd0927889466220ef29b313efbc57857ee741d36d52
-EBUILD opera-48.0.2685.39.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
 EBUILD opera-48.0.2685.50.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
+EBUILD opera-48.0.2685.52-r1.ebuild 2239 SHA256 d29ffa215e64c63fa160f74042b508609ddf11eb9de25960e6aa391b6b917d8d SHA512 d19aa77e5d041a7d738462b2c0b61c8839b61531119b680d82643e599b7b5aaaf9ecd1b5b97515a515ec2059d7f80ec3a5f48fe5b6b35aab507033eaa96006de WHIRLPOOL 79d606c0fdc2df5c64b34f534522bd8162cb55d035903fc37d965f72db833aa85f1b10584ab05189af1bdd077cf5335115d4f0bdd25f9e5ed09e2cf6153dec07
 MISC ChangeLog 11319 SHA256 b5dbbcac51e80d3bf3b17b6ec3bbd38e3aac7c88a0ede8fd1cbfbc4ed2f23ede SHA512 4beffc37f3a3014505181ee1483734aa9ac6f783e07a82a092e5c9a293e8c5270e447ee027becd1fc919cbd3d451ee60e49063703c0b9251646bb1f49a9f4e85 WHIRLPOOL c922aa713b0f04718e062b34adeb4f2d261904ecbe1695e15f1bbcc8bf737b2ea516c05a84ea1e3c0ec8e6da2d5fc9778053885e5ac0cf92d86183c517b6ca35
 MISC ChangeLog-2010 112299 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 SHA512 9dc4dc7e7508bb1621c390837ec2e47d9e96075906b2060be419ee64e505c8f0da9e4d3a8bc7cc2de66c6efc383f026afb8fa5e886afa15da6349514a93c9edb WHIRLPOOL edaf1c2e810e91d37b2d90847640900374b447a12e2e0e927654966cc18c3a14f332ce6daa07c5a0049da06f5e89bfd0daddb5f73a4d79b334ded4397349cf7a
 MISC ChangeLog-2015 41138 SHA256 6209a7f61e8f513d7bd17f64d8c4d12e5e4318227d9033d7117427b1d241ac8b SHA512 2bbbd008b586cc177280674c2dcacf7464645ebd3ddd4b18fe86ecea30d9e9f973d286b4fcab65cd1f09d994938dc6449b28f606c2a190fbc07301a2f919e6ed WHIRLPOOL e6fca4beb9f81f9633c56b02c7e94d3f9cc46fd8ed0a66ab297f790b00b8c132c10048996d9c4427283048cebb76c74602d8e9ccb0e1edd2f68b7245d9fee092
diff --git a/www-client/opera/opera-48.0.2685.39.ebuild b/www-client/opera/opera-48.0.2685.52-r1.ebuild
index 824ffea24a6f..aead2f06e723 100644
--- a/www-client/opera/opera-48.0.2685.39.ebuild
+++ b/www-client/opera/opera-48.0.2685.52-r1.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
 	zh-TW
 "
-inherit chromium-2 multilib unpacker
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="http://www.opera.com/"
@@ -91,3 +91,19 @@ src_install() {
 	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
 	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 50825baa6519..ab8768ee1b4e 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,8 @@
-DIST qutebrowser-0.8.4.tar.gz 3040566 SHA256 f5ce98c5bc57ae29dc31f8896fad6911feab91277a9554761126219e0f8e8671 SHA512 0dc5c83f875a207cecb351b07895b48c3ad014f0ed7c45fce8023aa77f27f81f7ee2da2c376d0081760fb66fffcc811e3231d0aa50d19a7339b4cf5101eff9ad WHIRLPOOL 9bb957be49b9ca5b044fe582a7e77f7bed705f34c8329a8aaf907d93e9bb4e74103668abf2ac9e01403801099d3372e358652b758b2f01bee8fb881c8bcae683
 DIST qutebrowser-0.9.1.tar.gz 3091676 SHA256 5aabfd6824ece72a2ca2dd02f4ee47f5b3c48a289c9f3e1854d3b30e980dc95d SHA512 521bb306964865a17326701f8d4e46369583e8d81d4807ea2ee7252cbb734133ec06902780d191f8e8a95cb3ee4f9590d7bda223aa43bc25c986c343d6b17017 WHIRLPOOL 0f96d66033b53c0009db3dfa87b4fc5b53cc56ea4caf2f6388cdcd9f1721986cee6c6d04d3c376a9ee719483a6d6a9dea8e1501c612e46fdc9396b80ff2f7e5e
-EBUILD qutebrowser-0.8.4.ebuild 1936 SHA256 ff53a6e9d56a3d7dd45e320659c21f21aaddaeb73900b87a4066ccece09b08c1 SHA512 1bd81ca4b9e24eec59be7b5522502e54fe52c52490cb10f064be458d933d5b74dd4e7da18f623826f39c199667dd62b113dabdc1e45f660a9dd29d349b4d6277 WHIRLPOOL d1a3ab09b0d36c1b104d1b38753c4155f950087d9d08aea360c40efe2dc0cb656487e8a101c26dd15143687725c786e0f7b4e5596d02f040027c5c0572032897
+DIST qutebrowser-1.0.2.tar.gz 3272237 SHA256 f33281bd6d23bdfad7fbf8b85a01ae9cbc6bd343a957bbebcdd38f9ee8ae7624 SHA512 a2b548dd7577064000845e696b87d65e0d7452053741832036c6a89f5f3d1cf03a241e4c8c202c57bf87ecc843a7003dd3d5eb32169a32420345ff46e9cf3186 WHIRLPOOL e14c811c070e5a71adc9537115bd2a9e6c50fb8cdc4f285330c6d5e62721c8e21a5139a71cbcd72e372556fb09be1f3e52380829ed5ea74d71f87bf4158ee8b6
 EBUILD qutebrowser-0.9.1.ebuild 1952 SHA256 1c84f3a84a0ef84f13c12781284916adb8edd4e0413e92824449f41e23ebab43 SHA512 03c90528d5480ad59d9f0a157bee37b20d203ba08095709b5125b1edf17647afe96e8ca38e8f92a06904843c3da99527cfaa17cd6ceef63aed1c95e15d65dce2 WHIRLPOOL b6074455fbaf9fd22c41215d6176ad9838878c83e5205d86bb1a9ed61ed93aade4a1780ce11ea3ee78684b2047d689185ff0eaabdf79f008aa3e043cd74dbd1d
-EBUILD qutebrowser-9999.ebuild 2111 SHA256 cb047390f12878300aa90c1d4fb2294d707388718e50d63e271e6c517cefd2b1 SHA512 fa21fec5d4982bfc3ce2f61ef2dcb9d9e8339200e463689826e0340efb48e5ca05419224ecff98a69e8fbe56b8ab733ce3b31e53a4ef7e5d7c7aa40e42dec105 WHIRLPOOL fe5e15215749e8e60eadbfa77b8ea69b1b60fa3a734cda549af37a5816837a566fa33b05081fbc3ede6b31c6a5ae55769cdf413696a16842597f7047da4e256f
+EBUILD qutebrowser-1.0.2.ebuild 2237 SHA256 9dd81a65ebeb55a6773999d628441fcf1fb41b08d4f3f5ac30d9a1d8fe1e546f SHA512 37450af6a1636d9e9310a412470fa7c94c66eea3f0d2549374b6447fcfd8cc6a7dc7030833a4230b5d4f16a849c9cc5481d3bf26fb6fd890d70aee720bb8eaf6 WHIRLPOOL 2d07ad237e425e0fcd4cc88717a6bcea6d24e8e4ff3b9020a8120820bd77bca1268dc8833c6f9c19c372394c8bb8e439237e049ed2888c2b525ab9317e14bcb9
+EBUILD qutebrowser-9999.ebuild 1981 SHA256 e8c1a616adce0178467e8bb5aa97a6376c41632d20f2e90b1a296bc7c78d9acd SHA512 7e84a074b489c8abd6226ffba4e3169926b1f5c6e7362892968fcce562a87f4f3b93fdc2900a51a926c4e40e895a2487ea39cf86b41b49c60f87d30d1a668fd4 WHIRLPOOL c7947e58e81bc520c95d282a6d1930fa04ad81579065b4daed553c7c9e19170259d7710fca542b845960c1f36c4ef77d2a1c566411da5a008a72684de766aca4
 MISC ChangeLog 5368 SHA256 7238059888b60b1ad6390b40f17a8c419bec536b56d8ba8ed9ea74494b7dda4f SHA512 d2a7eac903dcecdef506d8dcd696747491264dbb077a8fa6e68032b4ca304f911426d15313fcf815da08ac159c5f9ba10adb4f0bba7f63ab3ef6ed99113ca6f5 WHIRLPOOL 618e3b2b36d9b34a620902895cf4340d6ce4f636814c6f38d9f63de12fb3f8c004204496f9799ba1556c8f5b3827e4835ad8935e5d397be0b0453146e65fdb24
 MISC ChangeLog-2015 601 SHA256 f8207f1b2aa1ed32d252028e2987aa863ae07ed28a1c240c21243eadf371dd48 SHA512 333f553b42617acacc46035e37e603f8c6926059dff52b872da807057d59bb4e12132b3d291068250241bb367ddd94c0b992fcd4ea381ccce532ba12f3cbac39 WHIRLPOOL 890c6b6a390c0ba358f320c2dae693c0c39c94c6188a3d9d3467968d5e10d5c5b6f77ef1b9c079d8cb63cdeb9d6553739f6c0cfa04ba2ed50c4bca22f5c69121
-MISC metadata.xml 460 SHA256 998c63853be5cbdb1fa4abe5f6cfe0f1f78d92cea687d540d3871cf04fd69829 SHA512 db701396e7cbd7c44ef3cf758daa2e1e6af00df5e5a65df7b138b34995c35ffc26d3af2cded41df1983a6d4ca5de8636e73915331c239613bc3e905569867768 WHIRLPOOL 502096d4e4530f8965b506cbe120228a335d5fe4393a1e0046cd777c6d664b53896270be2e5d5c5088c034eca7b8f59077a1668df0550fd0cc870b1625ead993
+MISC metadata.xml 445 SHA256 77a59f5e4a11966f20f68c6919c6b515fc38c73248a1593a62436c225a15110d SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed WHIRLPOOL 91a928502bd11865d1922878316dd018e6a67a8e9992117517a389bb67fde9f5ce196d85d0123954e010e19b48609ddfa50fb28ff8dc383904b0fc4d4808f68d
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 0b5baae9f956..7623d04971cf 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -5,10 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<use>
-		<flag name="webengine">Install packages required for
-		experimental rendering support with webengine.</flag>
-	</use>
+	<maintainer type="person">
+		<email>jsbronder@gentoo.org</email>
+		<name>Justin Bronder</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
diff --git a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
index 82042ee94095..aa893e7d04e9 100644
--- a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
@@ -1,41 +1,49 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
-inherit gnome2-utils distutils-r1 eutils fdo-mime
+inherit distutils-r1 eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/The-Compiler/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
-HOMEPAGE="http://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gstreamer test"
+IUSE="test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
+if [[ ${PV} == "9999" ]] ; then
+	# Highlighting needed to create help files.  Alternatively,
+	# scripts/asciidoc2html.py could be patched to optionally set
+	# '--attribute pygments' when calling asciidoc
+	DEPEND="${DEPEND}
+		dev-util/source-highlight"
+fi
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
 RESTRICT="test"
 
 python_compile_all() {
@@ -52,9 +60,8 @@ python_test() {
 
 python_install_all() {
 	doman doc/${PN}.1
-	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
 
-	domenu ${PN}.desktop
+	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
 	distutils-r1_python_install_all
@@ -66,7 +73,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 2688b7223b3c..0b25416e3db8 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,46 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
-inherit gnome2-utils distutils-r1 eutils fdo-mime
+inherit distutils-r1 eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/The-Compiler/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit / QtWebEngine"
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gstreamer test webengine +webkit"
-REQUIRED_USE="|| ( webengine webkit )"
+IUSE="test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,printsupport,webengine?,webkit?,widgets]
-	dev-python/sip[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
-	webengine? (
-		>=dev-python/PyQt5-5.7.1
-		>=dev-qt/qtwebengine-5.7.1:5
-	)
 "
 
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
 RESTRICT="test"
 
 python_compile_all() {
@@ -57,9 +52,8 @@ python_test() {
 
 python_install_all() {
 	doman doc/${PN}.1
-	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
 
-	domenu ${PN}.desktop
+	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
 	distutils-r1_python_install_all
@@ -71,7 +65,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 776ebf475350..58f882c64d6a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,8 +1,12 @@
 AUX vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch 1190 SHA256 e67cfe8b6a7bd14b20ab2d3f8fc26018544b0fd3218a704e6af584c474d8da9a SHA512 550c0b9a9683c389846e058c31074ccdc7164c2ec1d13ad4a4b7daa0e3f4a0f469d6ec71cc4c293cb6403427d589d0084b96ec5caa27f69548fbfe5c8608865b WHIRLPOOL cbd948618af24e7e4070df51695c1e6166bd606053b23ddcae64f7d020cec8724d8d9409c8a19eeee5f102bbf558e58993fba7b995774b387fdd63e35399d525
-DIST vivaldi-snapshot-1.13.966.3_p1-amd64.deb 53410782 SHA256 a7a20c765d9a5ea22337424a66706f1909c6e18ea7ccef01575d245d3cb80db1 SHA512 5b71245656885584b4dbd5a02da89e5fede1ea246f5fc14a7cc3216cf40191d0183dcf80fcb3a433a75073e474bb45d111590777b8fee6ce1ab8fb68b2bc8b19 WHIRLPOOL 9a699723abfd50413957da4da1ceaa132a6bf58c102197bbb9a4c0458632a95e7e87e5a46788268efec6d7fe447928ccac7ca66006a2b1de5c536fcf67188c1e
-DIST vivaldi-snapshot-1.13.966.3_p1-i386.deb 54706528 SHA256 3d132d1f2428ba816d2b93764205b2772f1fa84f2dac71cfbd60794121b1898b SHA512 373006f4b93e4f5bcd32bdd55ec97844a5eb1569a5177f541ffc572b4c7298e80e5479baf0ba5a5c2ed516beb27d68be5d092aab741e06e62b5e38b219f30d7b WHIRLPOOL c53f769b38448f5ecfce26167eaab82afdc73688e184f7dbd6f2c7b546e6f055946c5b54e21355e78fe536621898d40683f8e477b81877c1cc471763dbcf80f7
+AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 SHA256 260fe8e0c736f6ee34136b417d4798099d83abc55adffca6903966d21fa73a66 SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb WHIRLPOOL 036b6f99ffe4c39231293c3a49fca90aa52de8273757dd1fbcf3660c669fd05d22ed6952ccfd50b18e008d6f279cc60d020284581cef63385c9234ba6c1a6b36
 DIST vivaldi-snapshot-1.13.971.8_p1-amd64.deb 53403290 SHA256 1ee7306a6f6c02e1b66a4d36671bbfaf63a4119980e988a8ec67b54963d83e32 SHA512 884548741be907c6c3eaaabccb2d87440cbc07da886e0fdd7197fcd8e17ef7e59a977a6ead35ce5ffa1743bb038ea48a54af727d7cdf1b6ccf1974a2094e87ff WHIRLPOOL c4cfbd05a5123b402855a89d3e1016fc5d2f5abf91e3fe20e68e7b8d306d59e80c0e3c4ad1aa639b113bfe37d165f81eb56bce9241fe7e6e27c6de139e615e0e
 DIST vivaldi-snapshot-1.13.971.8_p1-i386.deb 54726014 SHA256 a6e5a8274881a4f53f5e528bc0d832566611eca15f2fba0d10f3307c905e5629 SHA512 a6d4f14c34e2ebfda6db6c47d8db76acf64a7a7f21da95debe4aff01eeeef856a3c353f4c9a4f4658d5a39ffe64f715ab3eace9b614f8fa13a33ff04b7886305 WHIRLPOOL b7c2b769a98b7c4eb42db61f571b3224731d5720ecbfeea666d86b2c6ee3c28f84d96cf9512412ce82497ed95e8f68b094ba729aecb4524fd1a83a82929ce48d
-EBUILD vivaldi-snapshot-1.13.966.3_p1.ebuild 2343 SHA256 f2a8fcae2c937e3269a431082d9b32b4e378fa54284fcec6453f3d42de83ca86 SHA512 f76fe53df1cd4985a1333767388a64192f3b311595db5386ff0f69d5ea6f9435816c4ea66c65bc327c9d75a3cff17481b7f1c38f487eab76d6795e643e2e6a56 WHIRLPOOL df97e0c8252f7f2dd24deadee466282ddd56e4d15b2b18f5af20ae93fc78155d6b53f79fd3abfdeb64fb7e730fd5c5322400b9b22f27670f9861ce3c79ba9d00
+DIST vivaldi-snapshot-1.13.997.3_p1-amd64.deb 50485472 SHA256 81b132dfda7f82374a631cf81ec63a8f8c5f5b59c1af871d02ecff25c805ea89 SHA512 d88cac768f34788b8c3b6550bfe03ad64557e731af57b85a144f6c4622d256749f0498dac2d73c689890c8d5fe76c66efe0963813481d2a593b9ffcbfea7a966 WHIRLPOOL a9fa9cc3690f0943b42030f95f7cd3ddf1682aa9ea3160bef967619d30f2475e6b0ea48ff397a622d29f2a6bc04baf0357089a51212952342481be8503a98272
+DIST vivaldi-snapshot-1.13.997.3_p1-i386.deb 50953694 SHA256 d1f3a38651cef629c6aa77fc8d401593ed4915b6fd68a6177f25ff8a8fd8db45 SHA512 016fbe2bbf007a12417a14200c7136f0fbf887a74d76b2c6e34603da44f42bbc84a9a981cb8652e5c2c504080e0e4330fdf8a8a8886ef93a1ecdb73bc48ebb79 WHIRLPOOL 5c4212551fe57fa118fd7814cd3ecedcd685846d891860279c8fb8bcbad1d40604b37e26bbf56c118fffbbc3304749003aa48f04199125d200c5b61dac35a075
+DIST vivaldi-snapshot-1.13.998.3_p1-amd64.deb 50480568 SHA256 614bef3d831c0ad5aea661789856bcc64acaf1056f0c5e2761b58462b32aef53 SHA512 cf184ada5c09cfd47bc4f97df6c48f69535149153cab9594dcab40e75301b0fcc8ff6847e30a681cee98d194ec6d3d93dbf7c0c5934110c797be189774453889 WHIRLPOOL 8dcbea6c53df56a62460cf2d117903bc24bee78a4eb814a55a80c4e9ad71479361c4bb27ebc83304f1d41e91512b7f55bc265478a2007396bc4ee2603516db11
+DIST vivaldi-snapshot-1.13.998.3_p1-i386.deb 50952110 SHA256 ac06dd0fef18c0e00b6cf7702b9171b226f9534be955bf3487b64ab11e1d1a75 SHA512 818dd2b1a26a20b9c2192ccceeac734b032416b349267aa17758a781a5f243923bf270f97e792d3828918600bd98c642403f4f629f71a69c464646e1ae0335dc WHIRLPOOL 7d6e59dc2e52d4538e8b7accc09c783f726fbe565f0964ef99c69755067eb6d66bfafb8852770d8dc306b4c2fa61c4120f6b1e3bf833fa8866630734bb81f390
 EBUILD vivaldi-snapshot-1.13.971.8_p1.ebuild 2343 SHA256 f2a8fcae2c937e3269a431082d9b32b4e378fa54284fcec6453f3d42de83ca86 SHA512 f76fe53df1cd4985a1333767388a64192f3b311595db5386ff0f69d5ea6f9435816c4ea66c65bc327c9d75a3cff17481b7f1c38f487eab76d6795e643e2e6a56 WHIRLPOOL df97e0c8252f7f2dd24deadee466282ddd56e4d15b2b18f5af20ae93fc78155d6b53f79fd3abfdeb64fb7e730fd5c5322400b9b22f27670f9861ce3c79ba9d00
+EBUILD vivaldi-snapshot-1.13.997.3_p1-r1.ebuild 2354 SHA256 792d8210ae35215af58dd79d8882bf68a5eeca4ce6e1acc91af2c7ca3b6f8eff SHA512 c9e8bd094c64fa28cca7cc477e9ff6a4bd55d5ed0ff3028b8f40040d13f969b49849e3b5aa531e4d204f90d83f433ae6596794538558e7cc1e452272804ddf4c WHIRLPOOL 6d1845b060d2427721ba2906e075b29200f22d4bdffcbdd142f8429b03fd05fa0f822b289edf1a10398d26a4cd32ae53019f63ff25f920eb51a5e7c11a136df7
+EBUILD vivaldi-snapshot-1.13.998.3_p1-r1.ebuild 2565 SHA256 8995b9510e9e93c0aaac5fa6a3e2650b928c0d1b416cd6b9e16d30f00653c3ae SHA512 b6b4bf0e5f493e8f4ef5f2b123487e6b6bcb12d775b521ebfec96b775972022ff23a8d9bb127cd273c3ae3efcf984c193b2f4de8e52103a4bcf87f75afb428bf WHIRLPOOL 30597acfd6ea429c0d4e2195a415416d9d7c223a1a148a0ad7edff77f6fa8bff6021a241255c946cc2fc1251fce8b994c237f1813dd324123c48bee522614e0a
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
new file mode 100644
index 000000000000..807164299ac4
--- /dev/null
+++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
@@ -0,0 +1,27 @@
+--- a/opt/vivaldi-snapshot/vivaldi-snapshot
++++ b/opt/vivaldi-snapshot/vivaldi-snapshot
+@@ -32,14 +32,14 @@
+       # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
+       # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
+       if [ -r "$1" ]; then
+-        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
++#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
+           if [[ -n "$LD_PRELOAD" ]]; then
+             export LD_PRELOAD="$LD_PRELOAD:$1"
+           else
+             export LD_PRELOAD="$1"
+           fi
+           export VIVALDI_FFMPEG_FOUND=YES
+-        fi
++#        fi
+       fi
+     fi
+   fi
+@@ -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'
+ 
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild
index eda36f1e1ac4..53dd25845f8d 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild
@@ -92,7 +92,7 @@ src_prepare() {
 	chromium_remove_language_paks
 	popd > /dev/null || die
 
-	epatch "${FILESDIR}"/${PN}-1.12.955.3_p1-libffmpeg.patch
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
 
 	epatch_user
 }
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild
new file mode 100644
index 000000000000..fff39bc27059
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 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 )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	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.13.997.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 c0d3e341390b..fd0c36d1f4e7 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-1.11.917.43_p1-libffmpeg.patch 1154 SHA256 18095976e22d4567d93d99c7b61f49b7d3895cc2eb363517649c60696ba62378 SHA512 cce5c30231f3e1d6904d12c3bddf63ac02978bfbd0fe44f248899060c332bb0c242c0d2e18b62568fc65bd144b6a83c38ea6c4ec88db4512a7add4057fe7a605 WHIRLPOOL aaf311083722a14e90e335f7b9d3ece3750ce0d6bc42a85948860edb4c9c6007d89c7b08abc1cb0c3a7f33814e1038cf1115da34a865b7d1889f550a5edea8cb
-DIST vivaldi-1.12.955.36_p1-amd64.deb 50500430 SHA256 12775223bfd916d8792dfbfa4d5cd5985def263ab6eb9e1ce5de6fec17d9063a SHA512 5344b94fcdd0c30bd0c8ee6862b0e2c4e7cc71f0ff9a221c14d0cb35b40b79053a3d9b4c9c6059b4f7ded26890e7dee25c7c23b8e5869b1b1290bcc45dc1f7eb WHIRLPOOL 0ce6fcb2f99ade1f15cd605f5f642ad17e56f4336e1a1662243ebb20579a6d9d745728c4a74f72cde86a3469434398baf4d34bdf2d2ea5dd216a7119e2575ff7
-DIST vivaldi-1.12.955.36_p1-i386.deb 51560038 SHA256 5f5e378f9911eb61e805a0da3d612c968fdb7ac21470d32e768a54739265de4d SHA512 8b056c1032195348860271553c7e5818cf456c61bd81b9bbb8cab85182232d994898e65660f04d8d6a983f503c4b4dbf55b7478387ac11126ae680e6ba41dca7 WHIRLPOOL 27752dcc1bbfcbdc2085117ef0ed44e715b64e3a095bde42dd5feecf551f4c665fcc99cbdb7e22be48f8b56e762beebefec665bb8fabc2a492c15e91222d2b45
 DIST vivaldi-1.12.955.38_p1-amd64.deb 50507742 SHA256 1c3fb2c2ecac7a9d54a641fbbe59743b85de6ffc896b600bcf26dfb98dd601af SHA512 1585e8717376e92cfce30aadda19d2b7cff2136bc0c0f9bbe7d438f6a7d57efcbce5cbdedf66c45103032f03873d544b699e1d6a07f13bafbea3d12c5a2817a9 WHIRLPOOL 30d9eadb320e5163925b4b36c984653c67586cf062954decb49d24fa322fe76b1ac0f6cc8c94d0d973346e475edceb76d0964e73ee688c1b8d14cdca08e6cfce
 DIST vivaldi-1.12.955.38_p1-i386.deb 51539886 SHA256 489ddb25d0854bfd1604d051860fba2c5d555f0b32c4f0d4a21a00728c7ab111 SHA512 285a4c55530c01bd0c19944cde34f37ca08b54153b674a029a1f0b6288b0b92b1addff39a32a880c2bee2389664c601348d46b4da405d77b5d73218a95e82336 WHIRLPOOL cec03f316346fd4bd2235dd9c8c02c3dd0da9424b22535e22ba664697c066c4918f5b849dac9069a8356a8f3070d62058245c78ed8977394370a0215e4a739f8
-EBUILD vivaldi-1.12.955.36_p1.ebuild 2704 SHA256 929c5d71903824d1597000e3948e4ecb946a35eeb029364b49d09030e37c5df5 SHA512 99dde58bb6dbdb3c39290b76770a741608f5ff9504fb54d9496597a927339574cf78ca5ecbd9e39c7913ef1dbde62b9b451634c6834d480ecf4c9fd3b08e8cd6 WHIRLPOOL be27255ff8a31acffa09eb07ed6e1e6defe2847a161a865832fe61c1f58453a31d97e5a634cf8b734a9f9a22fd96942eddcb93fb1f22e8c9893427db5e6f6bd0
-EBUILD vivaldi-1.12.955.38_p1.ebuild 2706 SHA256 99ebb18f52ce54a7b88a176df7fdd7fbb9f41db54677fbd9b1def5277db3bb72 SHA512 c2d3c7bd018edeaf0687e233ceecb9a7baae3331bf61a22ee3da84feb6e111f4a247d6180804deee92c27dffc95ae21719d2605e1c4fd1c5b94d6b17533bf86f WHIRLPOOL dbea74164bb0fb932fe54ad242adaaecd50a6ecab22e2e92e29794199c8df9d97f8ef64a3a8e157c0ccf7536e1d65c85c44063d70cef0b7f0d3471944c61f7e1
+DIST vivaldi-1.12.955.42_p1-amd64.deb 50770152 SHA256 e652d16db1b188ee61ad24e57b548eefce7c564873bbb99b3029c0a1077e6b91 SHA512 1f393c5f901eafc7359276ced79cd3b6b0d5c25fbf170f421d6da1d57700d021b8437215a0f58de1f1e787d8d989841f2ebe562233da328dd35461e6a0fe5cb8 WHIRLPOOL 51db8073234526e6e6760ffbcbb323fb3194cffe12b5756d291be29730ad28e501ce005dcf36e5a1d86d1f508a026d848b37d740a8303d76ef587e0b90df803f
+DIST vivaldi-1.12.955.42_p1-i386.deb 51637778 SHA256 a035067b9bff853424eaa102a632d7c6c362a7d0cced27239f7277f016266441 SHA512 b0bcbf284571169bc0945103ccd7848adc5f7f5bd99faa457f3d63579d090c73105d7ce36bd7ffdf802c6d53a6fdaa80e346cd659f02d402c36f331d9346f5f7 WHIRLPOOL b6a5f3ba2d66dca1f3a735ca8690b83224c7e2a36740c95e024d9221b087fa3030e21c5da2d0dcbfcc77911dad6f6ac42cec0999f9b88d42d834aec7016a2788
+EBUILD vivaldi-1.12.955.38_p1.ebuild 2704 SHA256 929c5d71903824d1597000e3948e4ecb946a35eeb029364b49d09030e37c5df5 SHA512 99dde58bb6dbdb3c39290b76770a741608f5ff9504fb54d9496597a927339574cf78ca5ecbd9e39c7913ef1dbde62b9b451634c6834d480ecf4c9fd3b08e8cd6 WHIRLPOOL be27255ff8a31acffa09eb07ed6e1e6defe2847a161a865832fe61c1f58453a31d97e5a634cf8b734a9f9a22fd96942eddcb93fb1f22e8c9893427db5e6f6bd0
+EBUILD vivaldi-1.12.955.42_p1-r1.ebuild 2918 SHA256 f7d96e178ad7d2bf5a8c864fffaf9edfc56ac5edc8758904e9fc15e510a92055 SHA512 c291296ea2bcf7eda51d83f7af2e9a3b2fe3b882155df824bb48f2bda44e7465d102f2b6b4854e1e28c2266cddfe8c3dc162cd84f06a2789c69144e623a13be6 WHIRLPOOL 284b0dbd8590ef7d6cc6ec6a50dc9896c7efe83bc2b85039eb57e11cf2c017918706d749d5dd33e1dc053b1d561121eac5d6747dc61808f34cc1fd6c1f1eee6f
 MISC ChangeLog 30542 SHA256 90dd48a74abe464786554337fc1abfe5987d3bef7c0b55a8e8e0549280c77895 SHA512 5dedcecb081555a877fd0c9e6132f6b6e94181ccf901a20c4326805ff5dfb3cd792d93a53dcc6b15cb185d0dc734f554d11214c20cfe66d2f78349b3b72f416b WHIRLPOOL 246ea2fa4c39ad53c8de8d331ecbd7c80d381a73880b119f4784f7bd4340dd5bc60bdf19e795b619f29fb4a06d5229a6c209f6533a24beccc4dcf8f5cee7ad76
 MISC ChangeLog-2015 6330 SHA256 f6edba68d9f23c66f3f4bd93d8d9c724f4ebe700bfe1d83e7d2754c70eeb89a4 SHA512 3089a150ca0d7b6733077610aed7e5c6e491a9b879c3353fa9141da64193d68a431601e749f9751128951a1300332943834babb3a3b14bc70a918b711ee79055 WHIRLPOOL a3b3197a356b17357f3483d32ed464cab137c3f6be73b1e223f303ea8a8c667008d45140aeac01b3d7cc9be17af159f18c633343839b8a2bebefab876dd93533
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild
index 31012c00e4f0..be52a5d2c96f 100644
--- a/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-client/vivaldi/vivaldi-1.12.955.36_p1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.42_p1-r1.ebuild
index be52a5d2c96f..e38e3424c8c5 100644
--- a/www-client/vivaldi/vivaldi-1.12.955.36_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.12.955.42_p1-r1.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	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 multilib unpacker toolchain-funcs
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
 
 #VIVALDI_BRANCH="snapshot"
 
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
@@ -112,3 +112,17 @@ src_install() {
 
 	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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
commit	bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree	3559b3e11424f5529527f2474d8a977a91ee3389 /www-client
parent	8b2628ad8526c806375e7b157889e4274b70248b (diff)