From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 5 Apr 2018 21:52:00 +0100
Subject: gentoo resync : 05.04.2018

---
 www-client/Manifest.gz                             | Bin 7061 -> 7056 bytes
 www-client/falkon/Manifest                         |   2 +-
 www-client/falkon/metadata.xml                     |   4 +-
 www-client/opera-beta/Manifest                     |   4 +-
 .../opera-beta/opera-beta-52.0.2871.27.ebuild      | 114 -----------------
 .../opera-beta/opera-beta-53.0.2907.7.ebuild       | 114 +++++++++++++++++
 www-client/opera-developer/Manifest                |   6 +-
 .../opera-developer-53.0.2903.0.ebuild             | 114 -----------------
 .../opera-developer-53.0.2906.0.ebuild             | 114 -----------------
 .../opera-developer-54.0.2913.0.ebuild             | 114 +++++++++++++++++
 www-client/vivaldi-snapshot/Manifest               |   8 +-
 .../vivaldi-snapshot-1.15.1132.3_p1.ebuild         | 118 -----------------
 .../vivaldi-snapshot-1.15.1146.5_p1.ebuild         | 118 +++++++++++++++++
 www-client/w3m/Manifest                            |  10 +-
 .../w3m/files/w3m-0.5.3-fix-missing-time.patch     |  13 --
 www-client/w3m/files/w3m-0.5.3-underlinking.patch  |  15 ---
 www-client/w3m/files/w3m-img-fb.patch              |  10 ++
 www-client/w3m/files/w3m-time.patch                |  11 ++
 www-client/w3m/metadata.xml                        |   3 +-
 www-client/w3m/w3m-0.5.3-r9.ebuild                 | 140 +++++++++++----------
 www-client/w3m/w3m-0.5.3_p20180125.ebuild          | 129 +++++++++++++++++++
 www-client/w3mmee/Manifest                         |   2 +-
 www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild      |   2 +-
 23 files changed, 592 insertions(+), 573 deletions(-)
 delete mode 100644 www-client/opera-beta/opera-beta-52.0.2871.27.ebuild
 create mode 100644 www-client/opera-beta/opera-beta-53.0.2907.7.ebuild
 delete mode 100644 www-client/opera-developer/opera-developer-53.0.2903.0.ebuild
 delete mode 100644 www-client/opera-developer/opera-developer-53.0.2906.0.ebuild
 create mode 100644 www-client/opera-developer/opera-developer-54.0.2913.0.ebuild
 delete mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1132.3_p1.ebuild
 create mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1146.5_p1.ebuild
 delete mode 100644 www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
 delete mode 100644 www-client/w3m/files/w3m-0.5.3-underlinking.patch
 create mode 100644 www-client/w3m/files/w3m-img-fb.patch
 create mode 100644 www-client/w3m/files/w3m-time.patch
 create mode 100644 www-client/w3m/w3m-0.5.3_p20180125.ebuild

(limited to 'www-client')

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 18009e7c20d1..cd721f0cbdd6 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 058e14fedf18..1bc6d6953b19 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,3 +1,3 @@
 DIST falkon-3.0.0.tar.xz 1985800 BLAKE2B 8505e2c91600d265c28f70c37bf9e8f669ecd907dd9263371a4a4c10b854d32415ec1a3fd6ac163b297d0a9f42c542d4691a6cd417ed81864585f0c66b769e34 SHA512 1d99ecd47022986570dd6bb9b57484abe30838bf52daf669c977e1d2a9381efdd60912fd72b97e0b43b6102159f4343c4d1589d4f6442d0ed62c24f1482a8d97
 EBUILD falkon-3.0.0.ebuild 1583 BLAKE2B 518f7ef4219a2b3bf3bd24842075e1427355182b441a1f35cdd7aab0c743375553856e95a7db7bd8566169319d953e5bffb650b97d1b8338dcaba7d58b3b5cbc SHA512 8425a175b9dce7976ee78cfd83e4a43a08529176ece6d3fefe560f73a52d3cae8ef637dc5a40d6f4b83fe146d543ea9e902ee4671de7ef47ba54927bdcda9384
-MISC metadata.xml 369 BLAKE2B de669dca0f4ec7ab36e7dfb4fc71d68bf8e5f829e0501be7f1e68cd1d8e0866e48ea53396f6c1cf37333032b1254744430d57a17b7cc5c52677b6606dbdb66d5 SHA512 befbc1782dffeb3f3cb44fe7046a8b44037268ee741e774e30dff433b624e6488e4edb09d3c5e796721a16b8887d1df334a70cb26326ae71401db8e7d14f0304
+MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/metadata.xml b/www-client/falkon/metadata.xml
index 007c58ff2baa..080de1ce90f6 100644
--- a/www-client/falkon/metadata.xml
+++ b/www-client/falkon/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 760cfeb3a335..7bba78c08e21 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,3 @@
-DIST opera-beta_52.0.2871.27_amd64.deb 55688388 BLAKE2B b56658262771526fe65f60cecabb88a892a5007c0ca9a10714235f0dc2450011f42e45bd543c226406d866d61d71bb6a1cc233a27b043d52727cf54d1ec84f2b SHA512 f035005195eb618bc23e58ddcb6952755573b30e6848b0019f22b87151063bfe270f1b1bbf93b94e78b86907e33c3906d964a58ab539182bf0b3a06cd617ebca
-EBUILD opera-beta-52.0.2871.27.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+DIST opera-beta_53.0.2907.7_amd64.deb 54555576 BLAKE2B bd8192092ba0c950d4251a695149ab61c32122fc5ab0ed188a4d6fa1e88cc24d47328bd4f25394be7b165b448a2d8941533a7ff6e1cf5772ab7913ca30a32eda SHA512 97dcef04b387af91efffaffb1f0aec1f93e312433f6ca486f07bdaac835ecfa3c4be8bc14ead0385a5d1821971b3aeda07cda43cc845804634b27c15a980d60b
+EBUILD opera-beta-53.0.2907.7.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-52.0.2871.27.ebuild b/www-client/opera-beta/opera-beta-52.0.2871.27.ebuild
deleted file mode 100644
index 308b38bc8be3..000000000000
--- a/www-client/opera-beta/opera-beta-52.0.2871.27.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
-	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 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	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/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	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-beta/opera-beta-53.0.2907.7.ebuild b/www-client/opera-beta/opera-beta-53.0.2907.7.ebuild
new file mode 100644
index 000000000000..308b38bc8be3
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-53.0.2907.7.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
+	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 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	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/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	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 bb3d424c2bc0..0b18a3777cfd 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,3 @@
-DIST opera-developer_53.0.2903.0_amd64.deb 54722416 BLAKE2B f41c0c449850886826cc9216d865a4de0dc2a5d8794734b996c1c6b01e4e8a32c66841829f87e66b47c5f43eb8ef54c38355085896adf4031e25853fa7510fd7 SHA512 01c4fb070a3444dbba1ab28726aa68b823f41683d8fbf9f29c0c72c043c2e7f5c89722346652da4794773a72cb7984189b1bfaa6ba87632ad0a47e2e335269c6
-DIST opera-developer_53.0.2906.0_amd64.deb 54717986 BLAKE2B f7dddbbdae353ee6597f32d89051a2ea4e1f0426b6cc47a358ac7b054dc931bc4fd28947e2eb7f14f22282c79de93ee39324a74d80139f1f030bbe070468a2cb SHA512 315552c5c59bcfde0a9692d84d7438b7f128d43fe39f935954571421137979305bd15b58dc152b24876ed9ee9425f55d50c85d8cdc3ff95243b7bf036b1aeb30
-EBUILD opera-developer-53.0.2903.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
-EBUILD opera-developer-53.0.2906.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_54.0.2913.0_amd64.deb 54606726 BLAKE2B 23ca3f0066f934ce5699192a5b8c2ff226c5aa50e80235f2d8710141ecc0375dd766ce93b56e317663d5b64d87d0ff6753670879fcf593f44b783729682a9c57 SHA512 896c06f64a228378a73297995923a5c57b161d5ee13c25328eea81a76888e3fc6fb10add063d3d1d8888a0f75f745910acc073712c70d2bc958745f078931177
+EBUILD opera-developer-54.0.2913.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-53.0.2903.0.ebuild b/www-client/opera-developer/opera-developer-53.0.2903.0.ebuild
deleted file mode 100644
index 12a41bce61c8..000000000000
--- a/www-client/opera-developer/opera-developer-53.0.2903.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	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 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	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/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	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/opera-developer-53.0.2906.0.ebuild b/www-client/opera-developer/opera-developer-53.0.2906.0.ebuild
deleted file mode 100644
index 12a41bce61c8..000000000000
--- a/www-client/opera-developer/opera-developer-53.0.2906.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	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 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	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/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	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/opera-developer-54.0.2913.0.ebuild b/www-client/opera-developer/opera-developer-54.0.2913.0.ebuild
new file mode 100644
index 000000000000..12a41bce61c8
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-54.0.2913.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	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 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	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/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	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/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 1f38fc5c5dae..cf056330a05a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544de30e69245b50615162aa8b983bb254b3979ee6060d93a1e04de16d4e8b2b0426a7faea471a89644be3d6896206de35affb2158941c0f542 SHA512 60aedeeb8e8443c3177f19b4aa745415138ad9f3fa4f3696ad00d2b93889e145f401c59298454e62462f0a8afa619ff2d07bb481ff5895735b89c3701d270be9
-DIST vivaldi-snapshot-1.15.1132.3_p1-amd64.deb 53852234 BLAKE2B c47890c5242ae6187d4a89a444979b9839f27c4803c15482f737a67c1bf29c98e2f74f1c8048f7f6529975b40ab226413ca97b8fd9ecfe514a5f14429cdab879 SHA512 227bcbf6b96a68d97a84a84a6b65c1e0f93992c2112385eb8b19db1338d0577f520b6a362d95aa8cb5321d0b3fe4a213cffee536fb46b6ea6cbf8f6a9f667c06
-DIST vivaldi-snapshot-1.15.1132.3_p1-armhf.deb 47691780 BLAKE2B 1e55d80f4b2470bc2dcf1b22c938eebf1fc6165f2fed0f59a1a2a140aca81c24e7f20ffb9f5562936683806382b7bb6c80985806af607226aafc45feb709bb0e SHA512 6512853677572138a2e90cefe3620ed135f080861af220ffc961aca2b86d318615f33f4b0959017548231168dd08a4fbe4b435aa06be4818ede2ea44a710380b
-DIST vivaldi-snapshot-1.15.1132.3_p1-i386.deb 53505910 BLAKE2B 58e16657f3ffba1fbcd5ef32797843d0fb0eb5cb59e94b78839f2fca3a741e11bf02bb688f7886bd24b6a3fcd594a482aed444be8eaa445d64fe316114cd8b04 SHA512 f5f4b5b67526f03e833a8e450cf5a4a2262b8f65e97dd9d69132238eb7e77bbaf74c705d7f09b3ef35a39d82adf233941d2e5954e4f48ef0af0030973bb9ba2c
 DIST vivaldi-snapshot-1.15.1137.3_p1-amd64.deb 53884664 BLAKE2B 3523bd11b183857c94168c674d77a02a2d3872e79e0b7f1bb4aef0d6fb9ca59127c7c52bd698266ca40845120d3872f986c5eb6f2c2d43145c5b55eb660045c7 SHA512 61087a917199ba01a9ccbd346230621babb2be8c780746762085371c3552620b172a4ea0ac1a127b0109b63ce054eb39d5830e0071cafd86e21c492c06d32ad9
 DIST vivaldi-snapshot-1.15.1137.3_p1-armhf.deb 47695736 BLAKE2B 45d2f4608eb1fd25df12598d1cad5569842c158426b3138c3bcbd5deb8cbac6dde903574c7dcb441132516832817556629d0d3ce9989d991de069b5907877b6e SHA512 66607bc306803ede1433f8be2a05c553b642971b8c2f33045b34e6da4db2f4054787132293d45dd641f969109d98b61e4427bfca74f9e05cb85f0d9160abbba3
 DIST vivaldi-snapshot-1.15.1137.3_p1-i386.deb 53523790 BLAKE2B 4d76c2cd30aa9184129e3e98593a5fb7e18337ebe098a6548b8d86b26d3b9b3bd5cf5b830a44bf167695c256784098feecaf34ad25fdf322cec1f0c1f03bceda SHA512 00e180fcc4afcb934a702d23ab45489c2c47576d10070538c08b78a1b3109d5f55733a84af91f75178df9816e8d3d69c4253d5140dd01b1b9540a9316b4b10b7
-EBUILD vivaldi-snapshot-1.15.1132.3_p1.ebuild 2611 BLAKE2B 66f58881742bc64250eb72a47e984aad43b391cd03929e45c688aaad63703f1a5a26929609d8f7ad32e17ff8fd374efa0d22540d5e86a15512af5bb69db33b78 SHA512 193303c1384950366ce2192ebf497ca6d15e0fc3145c026b383f07cbb869da0fcf7cb099925c7e42cee488b043d960856640330788397ea413b8ed2d037f3bfe
+DIST vivaldi-snapshot-1.15.1146.5_p1-amd64.deb 53898132 BLAKE2B 13aa11a14e60b4a793b59f6860d34675b47f59de6ccc6393d2cac5ae38150bed776c91a4ca62c0a1020b305449bfad73b925402b3f8fb664d30d9b495bf87fed SHA512 7cb97be022dd0f2345b5e1767b267c6868099cd354693143cae1f0f9c628d2d4c3efdca2e4eec0b59bbae747377c4022ffe5007745029321bcc97e6775bbc6e7
+DIST vivaldi-snapshot-1.15.1146.5_p1-armhf.deb 47677218 BLAKE2B b63d6941e71f61683430860aa1b1474f346083f87530e088335796e2cb8a8c7f7b0e910da4f10807f4c29ce51698184205e20be94d25e5f0594338d46d185e9f SHA512 4434ef3f09d181d721498b51360e1305c560b652812f95262721f77c1620d01facfc08e8e3540e825c3c79982be608b79cefc70ae1c4b37932f1e0e2f14fde01
+DIST vivaldi-snapshot-1.15.1146.5_p1-i386.deb 53518898 BLAKE2B 6a3d1ec6b435db3889e94cbf3f89def9bf4a8a965244599d087764fb6dda56682d6b134c9f922aff57232e8bf5a9144bcf97ef3ede007b6c3e6c100265244953 SHA512 2e48a7e1ea79b2b0cec09e6dc7dc0fd3005cc42e7275d9bd6cb1df5677cc655f38410cbcb2c828a67159627f03c441c48ef7bdef9e684d2ad6ed5527ba7b15b0
 EBUILD vivaldi-snapshot-1.15.1137.3_p1.ebuild 2611 BLAKE2B 66f58881742bc64250eb72a47e984aad43b391cd03929e45c688aaad63703f1a5a26929609d8f7ad32e17ff8fd374efa0d22540d5e86a15512af5bb69db33b78 SHA512 193303c1384950366ce2192ebf497ca6d15e0fc3145c026b383f07cbb869da0fcf7cb099925c7e42cee488b043d960856640330788397ea413b8ed2d037f3bfe
+EBUILD vivaldi-snapshot-1.15.1146.5_p1.ebuild 2611 BLAKE2B 66f58881742bc64250eb72a47e984aad43b391cd03929e45c688aaad63703f1a5a26929609d8f7ad32e17ff8fd374efa0d22540d5e86a15512af5bb69db33b78 SHA512 193303c1384950366ce2192ebf497ca6d15e0fc3145c026b383f07cbb869da0fcf7cb099925c7e42cee488b043d960856640330788397ea413b8ed2d037f3bfe
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1132.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1132.3_p1.ebuild
deleted file mode 100644
index 03b567d27a1f..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1132.3_p1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	>=dev-libs/openssl-1.0.1:0
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1146.5_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1146.5_p1.ebuild
new file mode 100644
index 000000000000..03b567d27a1f
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1146.5_p1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	>=dev-libs/openssl-1.0.1:0
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index aa9119ccc746..07ed7e3e52f1 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,6 +1,8 @@
-AUX w3m-0.5.3-fix-missing-time.patch 308 BLAKE2B a9df10a5d61c43d2f02817588aeba1773a73bffb6993f01a5168fb0b4fd9879157dbaebeff0fc41f8596d788a2384455931ec480d4e2f04d51a24b6c2bba3bb7 SHA512 2a95bca1c2679e1c73c40238f3649a9ef35417d745d33e9c72fa3b6fd945484bd90b13f8fc7351ffd3d63485df380ae10cd6f06a8e29528aebc0230ce58c792d
-AUX w3m-0.5.3-underlinking.patch 790 BLAKE2B 8739298c6773395d1f240ab23a09333922f0a37098a6a23dfddfb4a48ce4d46bf6ae1c8262e0ce4ad395a3d71d5e275b3c78038a284b229b3e8e405607c4983f SHA512 a9848610fbaf124453dc77640617785f5a3b3eb3f3c761cf0e29ea26c9481156339ef6d9efa4977d8dc0b28696bda8b5a2bef87150f86a0f516fa93e4efa2ee8
+AUX w3m-img-fb.patch 292 BLAKE2B 3e292f5607b97d49143be54bb2ef31aaf43e9ab599a4b63069b3aca8567abb6bed6f08f88d43b77710932031303a8fabae07296f6cf176a7f4898653816ff7db SHA512 3b2bdc1c72548ab75f98743c7855bf1a7a40d2bda2252ca1f1475b1eb982b5494a42478f7b544365195d2bf2e3214d697aabe0b7a5d208bd06f26ae379163f18
+AUX w3m-time.patch 249 BLAKE2B 2c27382e48b3a2809f68aca9c8fca6a2dd2f05011134f5a99e330a4fd114ed579a57682a9f88a1dc8bd359bbd99ed55975288f40dc203567a23214668d7c6f14 SHA512 b3e68a99aea3a05f837511dbaae4766a018913d7c89daa62209cc9f0806f150dd9e7b3bc42c8be882c0b1f06b562f48f9cc0064978fc6c954359672c5ddf6d64
 AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da870fde8a5fc0eb8314d9b818399ae502209a2fa4fbdf4bfb07e56e29a275cb2133656da52dfc SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2
+DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228 SHA512 61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
 DIST w3m-0.5.3.git20161120.tar.gz 2177917 BLAKE2B 48e7d9fee00431d65e4ae486d1cf5a376542fb0655215d95455d6f0e3ba63a6dfb243a858e0bb5e745ac75713091b17fa5c5a63c91a3e837c911ef1f576ce497 SHA512 81ecf9e5d9067a82efa5464e5f9396327a6333f9e414458a972b2b7bff138bd17c490b5258e34cb1e338c7a6c0dd6105a1bfd1e0d02edfadead79caa39106a5c
-EBUILD w3m-0.5.3-r9.ebuild 3219 BLAKE2B d7877ab94c11f4011e5a3734b253a12fd259a34c8ab173458236026c10114398eba0fc908d1e6ac6bd3c054213b8433df4d53b72b547de8c7d2c2fb18f3c2f18 SHA512 f159b03a9c50276b4f90bd3655d108cbd49d8f6f67c7445261e1511d14c6c5ac15cd132221fa436fde13c913a15e00a5992933bd378c7a54a01021be692bfd4b
-MISC metadata.xml 439 BLAKE2B 07628d4420012e2d592a6e53a530aba00b8659dcfa5fb440b0ad4ef42013608842d6bf9ef7f7253e4d05da73e1f1390afccf2e7f559bea1a544841b0864b04f4 SHA512 a51eb2e908d9f231b0817f237bb40e42e9e39c0a9f07dc8e7ffbd054ba3ae3a8b6b1a4c443eeef0b28a13008134a20764e6d3234df9215f35f0359fefb8dc67b
+EBUILD w3m-0.5.3-r9.ebuild 3245 BLAKE2B 2676bf8570023cd1799890f669a5f48dc13002391fe2f39164f02528998787c930ecd18cb82680ea63c51d70fc4e3f7f464bee245a97f206663d9257651a5f51 SHA512 da84bf3215255f01edae8a98e5eb76c29c48ee3b021ad219d2d443fa4f6525ba11259fcde39bcc9bdc9ad02a6ef83a1a306eb4898ee992f8fcf6e9c5fec8d3f9
+EBUILD w3m-0.5.3_p20180125.ebuild 3207 BLAKE2B 1caf44026b4b32d4efe4c3ddf3f35764448279cdafe6624f4426c0193903bbbca24ef1613c0253c96e0e51c559b36923b925d5d77ed66eeaa22adcacd2fe6995 SHA512 8f65138b152193179e4bc2f8aacda03bd03aae43dcf30c47618281ca7b032c5ef1eff737acb73c25bae423c49cd39481a7b2ef4217b8968742739ad791ed8761
+MISC metadata.xml 522 BLAKE2B 4f89e2d965f7cc320983d501b67f2dda0134745d63e98b488fb3bdcfd6dfd2ce2e0fe12f8b6fea88818166298906c661db47405ab4de1f27cbbec37ca52fdedc SHA512 1fb6f6e6121f5673e809a626f840ff524b6e58260a9e2ac5b537e1f3d04cf2371b1ff03808da757848931275751a09fdc872f431b9162927fabc0b3e64305317
diff --git a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch b/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
deleted file mode 100644
index 03efd85d6536..000000000000
--- a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/html.h b/html.h
-index c490655..2a9a431 100644
---- a/html.h
-+++ b/html.h
-@@ -8,6 +8,8 @@
- #include <openssl/ssl.h>
- #endif				/* USE_SSL */
- 
-+#include <time.h>
-+
- #define StrUFgets(f) StrISgets((f)->stream)
- #define StrmyUFgets(f) StrmyISgets((f)->stream)
- #define UFgetc(f) ISgetc((f)->stream)
diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
deleted file mode 100644
index 1b034b46cb13..000000000000
--- a/www-client/w3m/files/w3m-0.5.3-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in	2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in	2011-02-06 12:05:40.000000000 +0900
-@@ -199,7 +199,7 @@
- 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
- 
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
- 
- w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
- 	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff --git a/www-client/w3m/files/w3m-img-fb.patch b/www-client/w3m/files/w3m-img-fb.patch
new file mode 100644
index 000000000000..677d89d3bcd1
--- /dev/null
+++ b/www-client/w3m/files/w3m-img-fb.patch
@@ -0,0 +1,10 @@
+--- a/w3mimg/fb/fb_imlib2.c
++++ b/w3mimg/fb/fb_imlib2.c
+@@ -3,7 +3,6 @@
+                 fb_imlib2.c 0.3 Copyright (C) 2002, hito
+  **************************************************************************/
+ 
+-#include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include "fb.h"
+ #include "fb_img.h"
diff --git a/www-client/w3m/files/w3m-time.patch b/www-client/w3m/files/w3m-time.patch
new file mode 100644
index 000000000000..8489eee3fae9
--- /dev/null
+++ b/www-client/w3m/files/w3m-time.patch
@@ -0,0 +1,11 @@
+--- a/html.h
++++ b/html.h
+@@ -8,6 +8,8 @@
+ #include <openssl/ssl.h>
+ #endif				/* USE_SSL */
+ 
++#include <time.h>
++
+ #define StrUFgets(f) StrISgets((f)->stream)
+ #define StrmyUFgets(f) StrmyISgets((f)->stream)
+ #define UFgetc(f) ISgetc((f)->stream)
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index 329c6eb709a0..3a35f0fcc04c 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,6 +6,7 @@
 		<name>Cjk</name>
 	</maintainer>
 	<use>
+		<flag name="gdk-pixbuf">Enable support for <pkg>x11-libs/gdk-pixbuf</pkg></flag>
 		<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
 	</use>
 	<upstream>
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild b/www-client/w3m/w3m-0.5.3-r9.ebuild
index 9fef12101d50..61d0335e9167 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -1,122 +1,132 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils prefix vcs-snapshot
+EAPI="6"
+
+inherit autotools prefix vcs-snapshot
 
 MY_REL="git20161120"
 MY_P="${P}.${MY_REL}"
 
 DESCRIPTION="Text based WWW browser, supports tables and frames"
 HOMEPAGE="https://github.com/tats/w3m"
-SRC_URI="https://github.com/tats/w3m/archive/v${PV}+${MY_REL}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/tats/${PN}/archive/v${PV}+${MY_REL}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="w3m"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="X fbcon gpm gtk imlib libressl lynxkeymap nls nntp ssl unicode xface l10n_ja"
-
-# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
-# allow us to build w/o X, so we have to give up framebuffer w3mimg....
-RDEPEND=">=sys-libs/ncurses-5.2-r3:0=
-	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2:=
-	X? ( x11-libs/libXext x11-libs/libXdmcp )
-	gtk? ( x11-libs/gdk-pixbuf )
-	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) )
-	xface? ( media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
+
+RDEPEND="dev-libs/boehm-gc:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	X? (
+		x11-libs/libXdmcp
+		x11-libs/libXext
+	)
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
+	!gdk-pixbuf? (
+		imlib? ( media-libs/imlib2[X?] )
+	)
+	gpm? ( sys-libs/gpm )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
-	)"
+	)
+	xface? ( media-libs/compface )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
+	fbcon? ( ?? ( gdk-pixbuf imlib ) )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-	"${FILESDIR}/${P}-fix-missing-time.patch"
+	"${FILESDIR}/${PN}-img-fb.patch"
+	"${FILESDIR}/${PN}-time.patch"
 )
 
-S="${WORKDIR}"/${MY_P}
 src_prepare() {
 	default
-	ecvs_clean
-	sed -i -e "/^AR=/s:ar:$(tc-getAR):" {.,w3mimg,libwc}/Makefile.in || die
+	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
 	hprefixify acinclude.m4
 	eautoconf
 }
 
 src_configure() {
-	local myconf imagelibval imageval
+	local myconf=()
+	local image imagelib
 
-	if use gtk ; then
-		imagelibval="gtk2"
-	elif use imlib ; then
-		imagelibval="imlib2"
+	if use gdk-pixbuf; then
+		imagelib="gtk2"
+	elif use imlib; then
+		imagelib="imlib2"
 	fi
-
-	if [ ! -z "${imagelibval}" ] ; then
-		use X && imageval="${imageval}${imageval:+,}x11"
-		use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
+	if [[ -n "${imagelib}" ]]; then
+		use X     && image="${image}${image:+,}x11"
+		use fbcon && image="${image}${image:+,}fb"
 	fi
-
 	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
 	# so we better enable or disable both. Default to enable
 	# m17n and unicode, see bug #47046.
-	if use l10n_ja ; then
-		if use unicode ; then
-			myconf="${myconf} --enable-japanese=U"
-		else
-			myconf="${myconf} --enable-japanese=E"
-		fi
-	elif use unicode ; then
-		myconf="${myconf} --with-charset=UTF-8"
+	if use l10n_ja; then
+		myconf+=( --enable-japanese=$(usex unicode U E) )
 	else
-		myconf="${myconf} --with-charset=US-ASCII"
+		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
 	fi
-
 	# lynxkeymap IUSE flag. bug #49397
-	if use lynxkeymap ; then
-		myconf="${myconf} --enable-keymap=lynx"
-	else
-		myconf="${myconf} --enable-keymap=w3m"
-	fi
+	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
 
 	econf \
-		--with-editor="${EPREFIX}/usr/bin/vi" \
-		--with-mailer="${EPREFIX}/bin/mail" \
-		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
-		--with-termlib=yes \
-		--enable-image=${imageval:-no} \
-		--with-imagelib="${imagelibval:-no}" \
-		--without-migemo \
-		--enable-m17n \
-		--enable-unicode \
 		$(use_enable gpm mouse) \
 		$(use_enable nls) \
 		$(use_enable nntp) \
 		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
 		$(use_enable xface) \
-		${myconf}
+		$(use_with ssl) \
+		--enable-image=${image:-no} \
+		--enable-m17n \
+		--enable-unicode \
+		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
+		--with-editor="${EPREFIX}/usr/bin/vi" \
+		--with-imagelib="${imagelib:-no}" \
+		--with-mailer="${EPREFIX}/bin/mail" \
+		--without-migemo \
+		--with-termlib=yes \
+		"${myconf[@]}"
 }
 
 src_install() {
-
 	emake DESTDIR="${D}" install
+	einstalldocs
 
 	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}.mailcap" mailcap
+	newins "${FILESDIR}"/${PN}.mailcap mailcap
 
 	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
-	if use l10n_ja ; then
-		docinto doc-jp ; dodoc doc-jp/*
+	doins Bonus/{*.{cgi,rb},html*,makeref}
+
+	docinto en
+	dodoc doc/{HISTORY,README,keymap,menu}*
+	newdoc Bonus/README.eng README.Bonus
+	docinto html/en
+	dodoc doc/*.html
+	if use l10n_de; then
+		docinto de
+		dodoc doc-de/README*
+		docinto html/de
+		dodoc doc-de/*.html
+	else
+		rm -rf "${ED}"/usr/share/man/de
+	fi
+	if use l10n_ja; then
+		docinto ja
+		dodoc doc-jp/{HISTORY,README,keymap,menu}*
+		newdoc Bonus/README README.Bonus
+		docinto html/ja
+		dodoc doc-jp/*.html
 	else
-		rm -rf "${ED}"/usr/share/man/ja || die
+		rm -rf "${ED}"/usr/share/man/ja
 	fi
 }
diff --git a/www-client/w3m/w3m-0.5.3_p20180125.ebuild b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
new file mode 100644
index 000000000000..efc1e7d370ee
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools prefix vcs-snapshot
+
+MY_P="${P/_p/+git}"
+MY_PV="${PV/_p/+git}"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://github.com/tats/w3m"
+SRC_URI="https://github.com/tats/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
+
+RDEPEND="dev-libs/boehm-gc:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	X? (
+		x11-libs/libXdmcp
+		x11-libs/libXext
+	)
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
+	!gdk-pixbuf? (
+		imlib? ( media-libs/imlib2[X?] )
+	)
+	gpm? ( sys-libs/gpm )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xface? ( media-libs/compface )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
+	fbcon? ( ?? ( gdk-pixbuf imlib ) )"
+
+PATCHES=( "${FILESDIR}/${PN}-img-fb.patch" )
+
+src_prepare() {
+	default
+	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
+	hprefixify acinclude.m4
+	eautoconf
+}
+
+src_configure() {
+	local myconf=()
+	local image imagelib
+
+	if use gdk-pixbuf; then
+		imagelib="gtk2"
+	elif use imlib; then
+		imagelib="imlib2"
+	fi
+	if [[ -n "${imagelib}" ]]; then
+		use X     && image="${image}${image:+,}x11"
+		use fbcon && image="${image}${image:+,}fb"
+	fi
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use l10n_ja; then
+		myconf+=( --enable-japanese=$(usex unicode U E) )
+	else
+		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
+	fi
+	# lynxkeymap IUSE flag. bug #49397
+	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
+
+	econf \
+		$(use_enable gpm mouse) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable ssl digest-auth) \
+		$(use_enable xface) \
+		$(use_with ssl) \
+		--enable-image=${image:-no} \
+		--enable-m17n \
+		--enable-unicode \
+		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
+		--with-editor="${EPREFIX}/usr/bin/vi" \
+		--with-imagelib="${imagelib:-no}" \
+		--with-mailer="${EPREFIX}/bin/mail" \
+		--without-migemo \
+		--with-termlib=yes \
+		"${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}.mailcap mailcap
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/{*.{cgi,rb},html*,makeref}
+
+	docinto en
+	dodoc doc/{HISTORY,README,keymap,menu}*
+	newdoc Bonus/README.eng README.Bonus
+	docinto html/en
+	dodoc doc/*.html
+	if use l10n_de; then
+		docinto de
+		dodoc doc-de/README*
+		docinto html/de
+		dodoc doc-de/*.html
+	else
+		rm -rf "${ED}"/usr/share/man/de
+	fi
+	if use l10n_ja; then
+		docinto ja
+		dodoc doc-jp/{HISTORY,README,keymap,menu}*
+		newdoc Bonus/README README.Bonus
+		docinto html/ja
+		dodoc doc-jp/*.html
+	else
+		rm -rf "${ED}"/usr/share/man/ja
+	fi
+}
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 59347c74f59a..6a4f1867b8e4 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -7,6 +7,6 @@ AUX w3mmee-time.patch 608 BLAKE2B 1c380c5af1cfba502e5749810456944aa2eb52a3e73ee1
 AUX w3mmee-tinfo.patch 357 BLAKE2B 33ef18109515e789debcfe3a0addc67be0a69853bfda0e732ecde65c4271990dd93582c9f6a1e124679bafd75176c1da318a0c4f8d8e6310a792aea66777fa04 SHA512 ec9bb5936d55d2c2edab7c1ae025f72ddf7734a2b8c2dc152c1cb9eeba42db42c2072232924aed92f40cfd7218eafd9d57bd4bf5b5f8380569b0703a6bc1eb25
 AUX w3mmee-w3mman.patch 631 BLAKE2B b155487da7120b5e106c7b747a7cfc0d3157bdd651da8d324dc262b66ac47c88380e4ab4ed546522199ab3c3b89177b3ec83c5dffba56708ca57de0ba19d7281 SHA512 a883127315a7a5d9354c17a05c1dc4127ab7a72bb46b02592953b83bde54ca4c12f756b1ef44127f9d74517ed1ec1640ef2e187f809b15c906769f1e9e699527
 DIST w3mmee-p24-22.tar.gz 690094 BLAKE2B 9b779122a10f606fab8cfe9e3ffde7473f60ee65591de3a1eca241e563ced7c70260670da7c56c9eaf39010180733933eba039d743e723b0cc8c230ef8a31d81 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761
-EBUILD w3mmee-0.3.2_p24-r10.ebuild 3791 BLAKE2B 473c1e982599c572036cdc985f284d0f672401fa5f90eb950b409db40ba7a5d8ecc45a993711206069e3a9b6581847403ac25762bc60876f64d08794e72ddc15 SHA512 84e9176bf693e0a6ef64d2959b366d299b1221ffa7817f1b01978fde41c6f22567a6b194a17d89d260cd09ad849fe93f2fd70399c9aecf9373b2343b41246894
+EBUILD w3mmee-0.3.2_p24-r10.ebuild 3790 BLAKE2B f2f155a77493e5975201a8d193030f418d2a3e946c57d0885aee798dbd22cecf947d589e2440abcae03983389ed9941f72bc073c60a6d51eaf5e00dccc2dc76b SHA512 2d2283a0d065833092003db12b2760d4b1d14165f925bc1bfe5460ed9c9f02f6954efcaa3b8460ca7c4b22f4dd0646d877b431d7f4227a020dc7166042d38069
 EBUILD w3mmee-0.3.2_p24-r7.ebuild 3790 BLAKE2B ff932be41db06237ad1d7e36d5389c6692ac871eb8548e970308b5bef3b04eb55bc6141dc62abf6d0971f1bfdf29574c6633cbe8b66894ca66cee53938102e96 SHA512 01e418bcd5f58ac70b44a6a5401b2e0117c0eb3fc573d111cfb6d078989106fbd62f0d3737c11978c9ffe2be2cb16ca72ef10bdedab1a2f4bd17b5e125e9544e
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
index d820c40cf569..68def2049ac2 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		-locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)' )
+		-locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)')
 	)
 	local myuse=(
 		display_code=E
-- 
cgit v1.2.3