gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /www-client
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
41 files changed, 368 insertions, 878 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b374b7d7d135..6ad756d10947 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 953b21366a02..5519f2df35fa 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,25 +1,25 @@
 AUX chromium-FORTIFY_SOURCE-r2.patch 1206 BLAKE2B d712ae12229c5765d28385d0b40c9f32fc3580d30f73c52cb836b29d702c03639e677872c28d836ed0a7c376fb3f305d8e9f70f4c7e3a0d1d7a5e4c629f83b74 SHA512 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c
 AUX chromium-angle-r0.patch 3364 BLAKE2B de869d1aea64b426477cba0d1941e3745930bc3ecd785f501401d273e66e1d987ca05eefe11caed9bad3e372fce0889adb129185f1b6cd7bbb508ce9efcc7f46 SHA512 c5fa18dbaa82a0fc089c6c88857089f19c83f6d3ff7c7034e6ca3cde20f1615cd84ac13fde14b55dcfa7d3c85eb0f023fbe337bb96d7d8199b5729b269a5ccc7
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
-AUX chromium-clang-r1.patch 808 BLAKE2B f3f6cfc679b65f214e6667dc29e4241ae9344be02b5cddd1c25a6410c205e3ad1cf182719b4ba795a5b065fc736c0175803fdaad66439ed2989fc27ff9a12758 SHA512 dfb81895fb78983e5adba54351d94e9174aa6a523c5a78738aad8223330cde6739dea6d82328d603f693a2d5810df890eccc4bed202d73875c9c97be506936e5
 AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1feace304c6db309460b74f630dd59c424f152ebf6a1d88025c14b7162d14a38afde6e74a87ca04d3424fd9b6 SHA512 f5edc9b573269a7a6944e17019fa858e7162c548400eceabdabe695d7e10d3179b7593415ec3eaef226defdd1628fd8c9cc66c0b46ebe6ac1afe5035a319c379
+AUX chromium-clang-r3.patch 361 BLAKE2B b0f833153a11a15b498bb5892119e1978573ba250ff10e555a7b7393bad5d00959611702beca58f88453a933eb66a8a456048aaf1e934876af40a601a4f7b2c8 SHA512 ed5ad35dbd43eabe5fdca518975c5c775d1698f2c8d5b2c74e52616532f62c83e60001bffa02cdea536af31f29021db6ada7e037e2c8f92cbdf1dc500090f070
 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005
 AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5
 AUX chromium-gcc-r0.patch 2344 BLAKE2B f7fdff3e72e57c222e02a202fffa6785eeb90408094099b8e04cd8cecfc5cd5006801ffaafaa8561a4402ee5fa4bd8b9f489ac6ac3e34c212a683f5793c21124 SHA512 0e29192c8637b050c4976455c798ce0dc078c1e92ec0ed51da71866c2d35242e720f4ca468a431e8ea696700c8ef003a71e8ec06c573bab5355b96e8388a2844
 AUX chromium-gcc-u2f.patch 1670 BLAKE2B 9d83331ec5e9d4ef3b58e9119c7c152abe61daf8b32e168662de9e734d935c24913b603c631d148ed1cb7b5364e751cbb9bcc7e58e5c34f375958898fc0cf8f5 SHA512 f10486ef46940fa740ca2d7e8225924704a4f89b709ef3dfb7ad128865982c220f8971d169515d9d1be08ee112aef1cac95281f0a5af4615256d9760966545f1
-AUX chromium-gcc5-r4.patch 3648 BLAKE2B 44ad25ba69e100f7df35a2532ad1c8e55acf9dbbdcb1c28000c755748ef62848d325c7e379e06d1a0567dbda0e3f97808755ef90e2b7a197aa74a786d0280ca0 SHA512 6b6d80c8adfbb317003712b94cfdf733af48ee5f32d10b6f6e8599cd08b7a9d8b73e6cec2902ed55eb0a962ba9c9cf14a70299e132ec7bfec29806ed23836791
-AUX chromium-gcc5-r5.patch 568 BLAKE2B 9c4979a0eb540f490844a368173d7bb6a0f101daca5ea4ab5213fbda62e0a615ee2e0d674a550ded59b7a29aa9193782664e71a614e9c7387061b3d347423994 SHA512 f1878f6960f0f6cad723e2f26ffeed7fc6c2c0e468098d5f08d7e305d644375436c5d7c1698d79bc9f3625fd5736793132d088e68f543838a073c2be68fe5882
 AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
+AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
+AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a
 AUX chromium-vulkan-r0.patch 4070 BLAKE2B d4b272fce24bee6a961f58d2f4ef74ddf6a56e8f07382752d7d42b97d970b28a1422773eb297096b61988ebad1daf88a0b36cadb226ee19731e2ad56268c4692 SHA512 d16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77
-DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
 DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
+DIST chromium-65.0.3325.73.tar.xz 570268564 BLAKE2B 8d1a9cf38f12ea3566463f42772671268de68d8c49170d60733be8eee7492850be739f19377365366740dcbad3414538eb00765281c966b6cedb85b74709448f SHA512 96ed3862c3fc21afac8d18f4b43f98d29a086e83dfe25af54b6358e139a8b3c9ec761cc463ce287b04a9082c5e62dbc605d4c97f8ec358599a24c7830c890418
 EBUILD chromium-64.0.3282.167.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
-EBUILD chromium-65.0.3298.3.ebuild 20478 BLAKE2B 6a47301263f82cfbc260e6af2c4234ae70863b904cbdc9a069174ba8e0e195b92331662ff51f412e46a0d622bf9beb70a0900366dbcb54c24170cbdc34d85e13 SHA512 1341dbc98ae59d67db968bea7b41ef9be82e140ff17afbef9d0578cb91bcb82f74f2c411a80c50818dd77a9dd04d792c8a34edd76b485eaab96b9a9354fc6baf
 EBUILD chromium-65.0.3315.3.ebuild 20513 BLAKE2B e32383801314add6f6997a26e0a11c091b38f8cc27e4ba974c8ba96a6a01707c67f9118a37204af993a15d3746755f0e504b17afda7a33be2dc98a9a75f33142 SHA512 27c13ce2174e0f0fff75b54946760fdc58976330e9c5ba2e52ccdf9bf5c3c9c8d4577db3246b6e754447af11d08ce7588f1957953920cee96b0e189540ca1ca3
+EBUILD chromium-65.0.3325.73.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-65.0.3298.3.ebuild b/www-client/chromium/chromium-65.0.3325.73.ebuild
index 33ba5d9ef0ed..ede298f25fde 100644
--- a/www-client/chromium/chromium-65.0.3298.3.ebuild
+++ b/www-client/chromium/chromium-65.0.3325.73.ebuild
@@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
+	>=sys-devel/clang-5
 	virtual/pkgconfig
 	dev-vcs/git
 	$(python_gen_any_dep '
@@ -149,21 +150,24 @@ PATCHES=(
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
 	"${FILESDIR}/chromium-clang-r2.patch"
-	"${FILESDIR}/chromium-gcc-u2f.patch"
+	"${FILESDIR}/chromium-gn-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-clang-r3.patch"
+	"${FILESDIR}/chromium-stdint.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
+	#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"
@@ -262,7 +266,6 @@ src_prepare() {
 		third_party/libXNVCtrl
 		third_party/libaddressinput
 		third_party/libaom
-		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libjingle
 		third_party/libphonenumber
 		third_party/libsecret
@@ -271,6 +274,7 @@ src_prepare() {
 		third_party/libwebm
 		third_party/libxml/chromium
 		third_party/libyuv
+		third_party/llvm
 		third_party/lss
 		third_party/lzma_sdk
 		third_party/markupsafe
@@ -371,6 +375,32 @@ src_configure() {
 
 	local myconf_gn=""
 
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=clang
+		CXX=clang++
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# 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
+
 	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
 	myconf_gn+=" is_debug=false"
 
@@ -431,7 +461,6 @@ src_configure() {
 	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)"
@@ -440,12 +469,6 @@ src_configure() {
 
 	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.
@@ -510,22 +533,8 @@ src_configure() {
 		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)
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
 
 	# Bug 491582.
 	export TMPDIR="${WORKDIR}/temp"
@@ -559,6 +568,8 @@ src_compile() {
 	# Calling this here supports resumption via FEATURES=keepwork
 	python_setup
 
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
 	# Build mksnapshot and pax-mark it.
 	local x
 	for x in mksnapshot v8_context_snapshot_generator; do
diff --git a/www-client/chromium/files/chromium-clang-r1.patch b/www-client/chromium/files/chromium-clang-r1.patch
deleted file mode 100644
index 0fef167566a0..000000000000
--- a/www-client/chromium/files/chromium-clang-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build/config/compiler/BUILD.gn.orig	2017-10-04 08:50:15.014675936 +0000
-+++ b/build/config/compiler/BUILD.gn	2017-10-04 08:50:32.831024327 +0000
-@@ -429,18 +429,6 @@
-     cflags += [ "-fcolor-diagnostics" ]
-   }
- 
--  # TODO(hans): Remove this once Clang generates better optimized debug info by
--  # default. https://crbug.com/765793
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=1",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
diff --git a/www-client/chromium/files/chromium-clang-r3.patch b/www-client/chromium/files/chromium-clang-r3.patch
new file mode 100644
index 000000000000..3905a5f03ffc
--- /dev/null
+++ b/www-client/chromium/files/chromium-clang-r3.patch
@@ -0,0 +1,11 @@
+--- a/device/u2f/u2f_ble_transaction.cc
++++ b/device/u2f/u2f_ble_transaction.cc
+@@ -131,7 +131,7 @@
+ 
+ void U2fBleTransaction::OnError() {
+   request_frame_.reset();
+-  request_cont_fragments_ = {};
++  request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>();
+   response_frame_assembler_.reset();
+   std::move(callback_).Run(base::nullopt);
+ }
diff --git a/www-client/chromium/files/chromium-gcc5-r4.patch b/www-client/chromium/files/chromium-gcc5-r4.patch
deleted file mode 100644
index cb978d58a060..000000000000
--- a/www-client/chromium/files/chromium-gcc5-r4.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig	2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
- 
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
- 
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
-   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
--    return mailbox.name;
-+    return base::make_span(mailbox.name);
-   }
-   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
-   static base::span<const float> matrix(const cc::FilterOperation& operation) {
-     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
-       return base::span<const float>();
--    return operation.matrix();
-+    return base::make_span(operation.matrix());
-   }
- 
-   static base::span<const gfx::Rect> shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
-   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
-     const viz::TextureDrawQuad* quad =
-         viz::TextureDrawQuad::MaterialCast(&input);
--    return quad->vertex_opacity;
-+    return base::make_span(quad->vertex_opacity);
-   }
-
-   static bool y_flipped(const viz::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
diff --git a/www-client/chromium/files/chromium-gcc5-r5.patch b/www-client/chromium/files/chromium-gcc5-r5.patch
deleted file mode 100644
index a07b973d8c05..000000000000
--- a/www-client/chromium/files/chromium-gcc5-r5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/third_party/WebKit/public/web/WebFrameClient.h
-+++ b/third_party/WebKit/public/web/WebFrameClient.h
-@@ -507,7 +507,7 @@
-   // Returns string to be used as a frame id in the devtools protocol.
-   // It is derived from the content's devtools_frame_token, is
-   // defined by the browser and passed into Blink upon frame creation.
--  virtual WebString GetInstrumentationToken() { return ""; }
-+  virtual WebString GetInstrumentationToken() { return WebString(); }
- 
-   // PlzNavigate
-   // Called to abort a navigation that is being handled by the browser process.
diff --git a/www-client/chromium/files/chromium-math.h-r0.patch b/www-client/chromium/files/chromium-math.h-r0.patch
new file mode 100644
index 000000000000..6c7c747053a1
--- /dev/null
+++ b/www-client/chromium/files/chromium-math.h-r0.patch
@@ -0,0 +1,29 @@
+From 9f63f94a11abc34d40ede8b8712fa15b5844a8c0 Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Sat, 27 Jan 2018 20:03:37 +0000
+Subject: [PATCH] Fix build with glibc 2.27
+
+BUG=806340
+TBR=hamelphi@chromium.org
+
+Change-Id: Ib4e5091212d874d9ad88f3e9a1fdfee3ed7e0d5e
+Reviewed-on: https://chromium-review.googlesource.com/890059
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: Philippe Hamel <hamelphi@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#532249}
+---
+
+diff --git a/components/assist_ranker/ranker_example_util.cc b/components/assist_ranker/ranker_example_util.cc
+index 54d4dbd..ceedd8f 100644
+--- a/components/assist_ranker/ranker_example_util.cc
++++ b/components/assist_ranker/ranker_example_util.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <math.h>
++
+ #include "components/assist_ranker/ranker_example_util.h"
+ #include "base/bit_cast.h"
+ #include "base/format_macros.h"
diff --git a/www-client/chromium/files/chromium-stdint.patch b/www-client/chromium/files/chromium-stdint.patch
new file mode 100644
index 000000000000..877443954faa
--- /dev/null
+++ b/www-client/chromium/files/chromium-stdint.patch
@@ -0,0 +1,21 @@
+From 0235c2b657d936f3cdb09053776e5929fc84704b Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tomas.popela@gmail.com>
+Date: Wed, 31 Jan 2018 18:57:07 +0000
+Subject: [PATCH] Add missing stdint include
+
+diff --git a/chrome/browser/vr/sample_queue.cc b/chrome/browser/vr/sample_queue.cc
+index c2ca777ce90c..53cb3aab1576 100644
+--- a/chrome/browser/vr/sample_queue.cc
++++ b/chrome/browser/vr/sample_queue.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <stdint.h>
++
+ #include "chrome/browser/vr/sample_queue.h"
+ 
+ namespace vr {
+-- 
+2.16.2
+
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 23c9218cac69..751472097f77 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,8 +1,6 @@
 AUX conkeror.desktop 353 BLAKE2B c99cf942bcf97bbdc1567a60d0d15252ae378c91eeac57c066763007270eff39ffc39dd0ba5654b3e674fa33a2750327af2c313ed9f4b8ed212860f5074beb93 SHA512 ea48c755c800d2df417d5461e07a41305545de4086e22bf741804c60bb6d7f002685481eb505593c02f5948887026f5b9f15f853794c0c85c9aba7c060cf0f64
 AUX conkeror.sh 342 BLAKE2B 40b2f866d78ef29498ea68afbe020fb62d317a33138d5f94eac095afeee671e31463cbdba8a1b5bd822e3add57748c86d72f7f652db0b17dcf19098502f31829 SHA512 e7a79a442b157e73b759e1afab554128ea6cde4631ddeedcea6d93f8fda15f443903924127818c3753f22ca7d8b41010b337eca31f86edd36f3a6d67be840b71
 DIST conkeror-1.0.4.tar.xz 243876 BLAKE2B 112a05a8601f67f1a360f8fa947c0d325aac8276f72f02a6162fd3ec886d8b912e75991c94e4ec5bb9ebb44c6762bcbcb7f5a18c89410ba7d2294c38f66aba84 SHA512 4d6f3391b3ddcaedf532b9108cecfea2378c15307a669a46dcdd98ed39bdf25f6facf741aba66be4f683afe951e1c25ca011a94440d98bb0621d9b2cb10adeca
-DIST conkeror-1.0_pre20140212.tar.gz 310931 BLAKE2B 19d558317789d2c26990bce2ae86e4c9c3a9b91e7e59bb57a59f4338b3a9f9ff2352cfdd93860c3f927cad26ddecad7adaec3454a9ec4096836fb068311724d5 SHA512 08174a50b5aca69a76ee1686c460cd62bc51d75030c067202be5acb947e6ebfb209adf5797be0096256eef913e688c401cdccd5afa1e738390458b244378c41e
 DIST conkeror.png 5105 BLAKE2B 7d8d455e76987d0db00748ea6d5319793685b2e0061539f9378411245644f46a8e40eadfb59a5d543c17d058e2dc5f85c1cc3d2deabe5b988adb9dd689fa2bcd SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f
-EBUILD conkeror-1.0.4.ebuild 1549 BLAKE2B 80721b7f3aa1c859416d3c64776300dfee85e57517fbf5855720f799978391390eadfde9299a9d658e0bec686c0667e1b77f340d610c5db28ffee3439c5a3fd5 SHA512 b5cc4f661235380cba8a5923a5cee2f91a5c4327868ccdc561a73ed37077ca39a41c5b6e05282c351277bd2127861efef113312f837762c5281bd6c256ad6f74
-EBUILD conkeror-1.0_pre20140212.ebuild 1548 BLAKE2B acbe24f6f0f4b5779ae992344f5358113f93a5c82136ab3d78983f11289e802b56ef82e47d1b22228efd0f5cce4dcd72cd1277a6d735013a4748c8525e84a309 SHA512 049702fe656a95e80447075a861cb442c4f56ccfbc264a7a71da761b6f38b40be4a1b79d99217ddb6ad6668bbaf64062052ee426ab17cec8487a081209686686
+EBUILD conkeror-1.0.4.ebuild 1548 BLAKE2B 6c54f1dafe878504e773c4b93caa59703478cce9db17bfbe2e326d852427c0b540645df54fe53fa582f14fec337c2b59e2f9ba45074f0924bccb4806f77bc84f SHA512 c2b950fa533ea1d4fc8d7154a62bca46e2b41c9e2aa7934f1c851dd368486d5225877ce270af2bbabb2668a2c4b5018264e776608618867d81c22c8ba9bd7f1b
 MISC metadata.xml 702 BLAKE2B 9768c0d3e10cb9898b5e80075926dfb4b8a3c6ce8ddf694c72989077c27d1dec0acc3cf3e522452b9281f21a2719011293eefa4bcb44b26a793c3348745dc1c0 SHA512 ef47f81c9122a73eb93dd60fc60cd414ce12f1f1c48413cdf7d7e3d3c47e4865dbe24927385b7fae27aebd2508acfccae1bd84cf7fef19a506aec9315f454c18
diff --git a/www-client/conkeror/conkeror-1.0.4.ebuild b/www-client/conkeror/conkeror-1.0.4.ebuild
index da0f8a16c9e9..7ad54c59d1c9 100644
--- a/www-client/conkeror/conkeror-1.0.4.ebuild
+++ b/www-client/conkeror/conkeror-1.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 # CC-BY-SA-3.0 for conkeror.png
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 )
 	( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
diff --git a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
deleted file mode 100644
index a212377519f2..000000000000
--- a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
-HOMEPAGE="http://conkeror.org/"
-# snapshot from http://repo.or.cz/w/conkeror.git
-# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${PN}.png"
-
-# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57
-	>=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cp "${DISTDIR}/${PN}.png" . || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests
-	doins application.ini *.manifest Info.plist
-
-	exeinto /usr/libexec/${PN}
-	doexe conkeror-spawn-helper
-	dosym ../../libexec/${PN}/conkeror-spawn-helper \
-		/usr/share/${PN}/conkeror-spawn-helper
-
-	newbin "${FILESDIR}/conkeror.sh" conkeror
-	domenu "${FILESDIR}/conkeror.desktop"
-	doicon "${WORKDIR}/conkeror.png"
-
-	doman contrib/man/conkeror.1
-	dodoc CREDITS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 065ca64b4a3c..ed579e1f5085 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -11,7 +11,6 @@ DIST elinks-0.10.4.conf.bz2 5370 BLAKE2B a8058021060c3e0ca1bd040dd34a3155fa17bcf
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c
 DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f
 EBUILD elinks-0.12_pre6-r1.ebuild 6169 BLAKE2B c78a14bc5e9baf75cb1cc1ebbe0694ebbc3044fbe6ecf26438d10c293e4b7f971ead2e48fb82f4570a1c8f0f86057f1010b0c761d332acc5082ceb0cde8bef46 SHA512 55fdeff2c895755867af2b8955f2c998c0f4630a42bf6b42cd04fc06375319711cd9d16148e4c3522f3aee01fc815afc66f8d7985c861aec93edf662c76dd8b5
-EBUILD elinks-0.12_pre6-r2.ebuild 6343 BLAKE2B 9437d9c1725e21aaa525dddbd987865a71b867223b4e070046be1ceca71c6d1ab0790e8347474e3f2e7d6fdb521225d91c91c35b61d48a61e31ab02685f78044 SHA512 f5d57136d9cc2d395bf9557e582a117d45836b81434c5ca35674217930be584587da53d5210e014ecf7b21f3e1ae07a63161f94f85631d85665ff4bd68d6b7ec
-EBUILD elinks-0.12_pre6-r3.ebuild 5421 BLAKE2B d9f27998c8bc27f99051df71db7396739a3e4a5b1612865f2455c2b7b8d780732b82d7ab747b30a939cedf8b1e751801ed734b6e16cf8d3a8580fd8ab07de047 SHA512 3d0c1fac9d74b4031412fd80be8cda2754ac6b4ba207d44f0c5e0c1bd354f5808fd0d70b8ee72c51588dc82617e9089b01813655109b45d41a0773b15776d8dd
-EBUILD elinks-9999.ebuild 4574 BLAKE2B 6a6a4613bdef3f70150f66635581deb777a9a838e8c59cc163ef2535a43cdcc8500cba9ef537786f0bbf2aab8b398722cfcdb02ed8de5e4df75de27db3c1f907 SHA512 83afd5e717271d062906b5da0c2a3f47af91c725d20f8f5cd183067c69b108bd036fbf5fdc851049f75902af5cbbba131f96bb05c1df2db7fa65d49756dfd713
+EBUILD elinks-0.12_pre6-r4.ebuild 4907 BLAKE2B 9d33b7fe010204ea0f18116fd8badd0e61e4238bbf91f8e16601b98b9477c26979428afab333496606b2bb1091331a1caede56a13197b4bc016f5d1665d88df9 SHA512 aa5e83d35cecefc25b563db261648ca7b8b2d6ee77c1885a3817d77662a10be73317c3f1bc6b07007c9a410ee529a04f6e41e36906bc8df839584ccba5e54ebf
+EBUILD elinks-9999.ebuild 3847 BLAKE2B 5f02f015804da0b2594ecfb12b005e408af854750a27fe09573947ff347985dd92fe224ec316d5715ca3300c4cd69882b41365658e3e284f044c334d6055038b SHA512 51c54fa114f1306701d97f52572ae4b088661205db1cc44445edce98880f2f5c9d46cb852d944b31d7181ee489da2a89d926a194d839a7efa2fbf277e7410c40
 MISC metadata.xml 989 BLAKE2B 4b2f65d67e922e7e9cce74761cebca030866842af469ef4776d7cf2f8e685a52f9cbdfee25fb6a29546543e71127f48f93f78593745f6ab151e49250fe1b0259 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
deleted file mode 100644
index e9e8625888a0..000000000000
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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 ~arm ~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 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 )
-	javascript? ( dev-lang/spidermonkey:0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
-	mv "${PN}-0.10.4.conf" "${PN}.conf"
-	if ! use ftp ; then
-		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
-	fi
-	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
-	cd "${S}"
-
-	if use lua && has_version ">=dev-lang/lua-5.1"; then
-		epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
-	fi
-
-	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
-			if has_version ">=dev-lang/spidermonkey-1.8.5"; then
-				epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
-				epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
-				epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
-				epatch "${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
-#				if has_version ">=dev-lang/spidermonkey-1.8.7"; then
-#					# fix lib order in configure check and add mozjs187
-#					# (these seds are necessary so that @preserved-libs copies are not used)
-#					sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs187 mozjs185 mozjs js smjs; do:' \
-#						configure.in || die
-#				else
-					# 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
-#				fi
-			else
-				# fix lib order in configure check
-				# (these seds are necessary so that @preserved-libs copies are not used)
-				epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch
-				sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs js smjs; do:' \
-					configure.in || die
-			fi
-		fi
-	fi
-	epatch "${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
-	# Regenerate acinclude.m4 - based on autogen.sh.
-	cat > acinclude.m4 <<- _EOF
-		dnl Automatically generated from config/m4/ files.
-		dnl Do not modify!
-	_EOF
-	cat config/m4/*.m4 >> acinclude.m4
-
-	sed -i -e 's/-Werror//' configure*
-
-	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
-		myconf="--enable-debug"
-	else
-		myconf="--enable-fastmem"
-	fi
-
-	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_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
-
-	insopts -m 644 ; 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
-
-	# 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
-}
-
-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."
-	echo
-}
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
index 045c7b755e8a..8578fc6b794b 100644
--- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
@@ -8,7 +8,6 @@ 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"
@@ -21,22 +20,22 @@ 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 )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
+	lua? ( >=dev-lang/lua-5:0= )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	tre? ( dev-libs/tre )
-	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	xml? ( >=dev-libs/expat-1.95.4 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -56,15 +55,6 @@ PATCHES=(
 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:' \
@@ -105,27 +95,27 @@ src_configure() {
 		--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 gpm) \
 		$(use_with guile) \
-		$(use_with perl) \
-		$(use_with ruby) \
 		$(use_with idn) \
 		$(use_with javascript spidermonkey) \
+		$(use_with lua) \
+		$(use_with perl) \
+		$(use_with ruby) \
 		$(use_with tre) \
+		$(use_with X x) \
+		$(use_with zlib) \
 		$(use_enable bittorrent) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
+		$(use_enable finger) \
 		$(use_enable ftp) \
 		$(use_enable gopher) \
+		$(use_enable ipv6) \
+		$(use_enable mouse) \
+		$(use_enable nls) \
 		$(use_enable nntp) \
-		$(use_enable finger) \
 		$(use_enable samba smb) \
-		$(use_enable mouse) \
 		$(use_enable xml xbel) \
 		${myconf}
 }
@@ -138,7 +128,6 @@ 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
 
@@ -154,9 +143,6 @@ src_install() {
 }
 
 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"
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index f608a19718e3..871ec4ab5abb 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -6,12 +6,11 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit autotools git-r3 python-any-r1
 
-EGIT_REPO_URI="git://repo.or.cz/elinks.git"
+EGIT_REPO_URI="https://github.com/rkd77/felinks"
 
 MY_P="${P/_/}"
 DESCRIPTION="Advanced and well-established text-mode web browser"
 HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,22 +23,22 @@ DEPEND="
 	${PYTHON_DEPS}
 	brotli? ( app-arch/brotli )
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	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 )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
+	lua? ( >=dev-lang/lua-5:0= )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	tre? ( dev-libs/tre )
-	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	xml? ( >=dev-libs/expat-1.95.4 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -54,21 +53,6 @@ src_unpack() {
 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
-
-	# 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
@@ -100,26 +84,26 @@ src_configure() {
 		--enable-true-color \
 		--enable-html-highlight \
 		$(use_with gpm) \
-		$(use_with zlib) \
 		$(use_with brotli) \
 		$(use_with bzip2 bzlib) \
-		$(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 lua) \
+		$(use_with perl) \
+		$(use_with ruby) \
 		$(use_with tre) \
+		$(use_with X x) \
+		$(use_with zlib) \
 		$(use_enable bittorrent) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
+		$(use_enable finger) \
 		$(use_enable ftp) \
 		$(use_enable gopher) \
+		$(use_enable ipv6) \
+		$(use_enable mouse) \
+		$(use_enable nls) \
 		$(use_enable nntp) \
-		$(use_enable finger) \
 		$(use_enable samba smb) \
-		$(use_enable mouse) \
 		$(use_enable xml xbel) \
 		${myconf}
 }
@@ -132,7 +116,6 @@ 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
 
@@ -148,9 +131,6 @@ src_install() {
 }
 
 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"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index a0856e693aa8..da8de9b41f0c 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_65.0.3325.51-1_amd64.deb 53278244 BLAKE2B 54159122dc7550f6fc62a75b8bf5ad325b0d835692de660810e7bf6b4b26d87959b8d987ace8f6e8a12f0aae5f0cf79bb33058d9240446ffedfb22c269228a8b SHA512 0ffc62319bba7964137d0d512b47d4f29e951fb122a099fff1dc60b94c4cf31f9554933f773f92296a312bc7d418566f5e94beeba09ac5554d649f3729a50d66
-EBUILD google-chrome-beta-65.0.3325.51.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
+DIST google-chrome-beta_65.0.3325.88-1_amd64.deb 53239320 BLAKE2B de87c35a99b0e6d1aaec32fd3d92c2af4c1b944aeb91da3d4c9ef5d01c7d2cbfcc30d73eb409c951826eba1b842f703e8a8617cadb0ac2900119dc8e7d448009 SHA512 550a9af3a4ef3cd5ac32103835d1cafc9a522fa392f3e384f90872c30b80ba11a1985867a01e6cbbf018e9f146695e790cb84f46778ffe01d94e696f8f8c6bd3
+EBUILD google-chrome-beta-65.0.3325.88.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.51.ebuild b/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.88.ebuild
index 500479b752d3..500479b752d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.51.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.88.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 44ff0b1d2044..a2ccd379cdc6 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_66.0.3343.3-1_amd64.deb 53156634 BLAKE2B 5bb22366c989619411fb3d1c758b02397e98a9710d3a2f59eb8394d00a80c9119be4e2958532070d2adca69905bb1ed893bd7802f6ddc35ae8894e99cb929103 SHA512 274b819faeaf19782be2042f1aba51076b95b2692ddf48f0b32a12cf9f9cc63182e499e0d59f9fa25fbe1c2fcf27bcfb637688b56b715e68998a8686cb46c818
-EBUILD google-chrome-unstable-66.0.3343.3.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
+DIST google-chrome-unstable_66.0.3346.8-1_amd64.deb 53240758 BLAKE2B 049aba2587fcdec63beee14a91b6b38e2326c68013156960793428b2b6b501d513a57cbf0efa0ad8904b5e96759420d5ab269644c8e158263e04a208642d208b SHA512 67be40fcb54ae956a1af837e5860cee8eaa536645dd943ec7a5dff4882bfc3141d73ab91a27b53cc8fd702f105e6f998345276857d904bca7ed470f33e68b17c
+EBUILD google-chrome-unstable-66.0.3346.8.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3343.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3346.8.ebuild
index 43d5352b4dd5..43d5352b4dd5 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3343.3.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3346.8.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index df491ee33f1a..8967f7f468f5 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_64.0.3282.167-1_amd64.deb 51801914 BLAKE2B cb069aecc58cdc343450be4f592207139d2fea7d00a0ef7546cbb1ae4caa64bd9b1bb8ca3195c2d1ec89cd37d19e8772ddcb222669b607cd87bda1debbd9eca6 SHA512 d672f201b347f6de8cca159fbd46e8bd0233afd03735b2b785ed1f300cef66b9275372b057c678cc832b7485b74782c6bf0f75f6e31aefc4a5e12a1adf67b074
-EBUILD google-chrome-64.0.3282.167.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74
+DIST google-chrome-stable_64.0.3282.186-1_amd64.deb 51474250 BLAKE2B 829618cfc4cffe66970daa860983eb0c2154239e019491f4c4321ef448e6971041da27a60db51a4d3b2be14feed7032834d896a02477d1d2d7ca1c5de4d7b75c SHA512 02a2d5eec7e85d99078478b11938f3071f59c033374725cb234a8939156e7b910e0ef2dd147b0b55238a41ff6a02be049187f70735cacd82907d8193ed00a6c8
+EBUILD google-chrome-64.0.3282.186.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-64.0.3282.167.ebuild b/www-client/google-chrome/google-chrome-64.0.3282.186.ebuild
index 38dbe68c340a..38dbe68c340a 100644
--- a/www-client/google-chrome/google-chrome-64.0.3282.167.ebuild
+++ b/www-client/google-chrome/google-chrome-64.0.3282.186.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 346a331abc15..8a14c6b3d7ba 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,5 +1,5 @@
 DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575
 DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e
-EBUILD links-2.14-r1.ebuild 3272 BLAKE2B 6a52691bfb6a332be0f79579115750833584fe151227518b4e03a16ef3574a0bd605e062325c7d0da6a716063f4b7a8ca9edcd91c230ce67e6a1cce68f7b6c3c SHA512 c0183b8943c59df3b252d8df07753b66640c9b8c9a77c6fccc8db6eb10d43de7ceb9696cf9a94c38683bab08bf140ae788675c9eaa0654a855598f3246ea82ea
+EBUILD links-2.14-r1.ebuild 3270 BLAKE2B cfcde6fe6a267d4a40eee410c7d7b440c892202e0e2da2877640ec055ef824b86b1ecfec43ed417652de59af6996033501adc83db41db35a34cebd569a961f35 SHA512 2320ef4accaa8486446a9c9f371def6155ab200037d171140eeb4bea33d626cc623371cf83b6390fd8f27b7ccf8456a8533e700a9bccac161df0980e2c29cecd
 EBUILD links-2.14.ebuild 3332 BLAKE2B e1aa4ff36c8765869b25a374ee8a854a8f34fa5235a29c2b1a6f18f212df87b82cc5906b71d378c60cd9f18ad1bfd584b99908bbbdfb238f246c9b8ce03218de SHA512 b2f55df94ffda2db4bcab87115ae8caa92da6e993cc05e903b5675eef2ec6dfba711b3fd899f945a57800226c4fd479ed548c296a4d10d3640abc740970e02ba
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild
index 7e7df3664596..b95ba2965930 100644
--- a/www-client/links/links-2.14-r1.ebuild
+++ b/www-client/links/links-2.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index a827bb6a422f..93c52ddbd0c5 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_51.0.2830.16_amd64.deb 52419724 BLAKE2B 69e7e607492f3bfde8a1f3a97adc6ede37b40ea9acaef7e2aeec3c5897a3265ce51556c9349bacce86c1dc432522460a226cab99f7c94b8d87f42a5f4bf4be4a SHA512 d7e485f9024be77d084ce01008a1c914a68343c5994e5de83f20db9f89120ea3da6182bd82592b152e531095a742592bc19d3e4153cbd75ce28f5e3e0b48bc90
 DIST opera-beta_51.0.2830.23_amd64.deb 52635002 BLAKE2B 79a2ca80798f9c904f2915c93ae3b9537b58c54db87880017c60c72439b554218fbd18252c1fd73b33842d5793f6e85fe7e6b1384c43c9e80ea2fcd34ec65f40 SHA512 8271fdec291a767698e497fc0fbf3ad0bc40d78b43ff468b3e1974ef235f88b7104521fa8b752b19b54b6e45bdfc581a25fe7c8bc963d83f16f51805254fa13d
-EBUILD opera-beta-51.0.2830.16.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+DIST opera-beta_52.0.2871.3_amd64.deb 54132430 BLAKE2B 385d1249a6e90a31f21bc75fc505e95f16833b591536ba154526414a1738bf873717b1d89935ee0c8d892c42ec34d4351fd007e106744128f09d5984ffcb1fbe SHA512 8d4187e575c927078eb39b9972620ff3c164adf34f7f79935a2472d4cbf888bba606bf18fd18210423dd3d96157066e54d270cfdd75f45932773d29ef9f08355
 EBUILD opera-beta-51.0.2830.23.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+EBUILD opera-beta-52.0.2871.3.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-51.0.2830.16.ebuild b/www-client/opera-beta/opera-beta-52.0.2871.3.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-51.0.2830.16.ebuild
+++ b/www-client/opera-beta/opera-beta-52.0.2871.3.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 06e9ad81d524..f0fa654b7a3d 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,3 @@
-DIST opera-developer_52.0.2857.0_amd64.deb 53543592 BLAKE2B c6808f382d1927b926797867dd5c36f23644a4fa576f81570cc4dc9ce43914a2ebb2192154dacc95e3d8e2f4aea60dad035f22a29b0a3f7ddd75eb42958ba3b6 SHA512 1002a0295dbf5741baa06d3631899766cf3e69d1deb23c6161a0055e04a7b38e14a22b0be51b68215ab80bac7eeeb6c0a1981bab53a0466fa1cc05de50d18dcf
-DIST opera-developer_52.0.2864.0_amd64.deb 53915986 BLAKE2B 05770bd42406359afa5c23c4dc1f92fc88d76e3a4634921054c9fe1fc5a2352ed08c5c79c5192b22a026575d1e38bfc59bc572c45a294618b55edd5b0fcf712e SHA512 92f97e8da4034bea1f04136dbe5715c6628c9cfaa910b6207db748a2184e855bca7de7dedb1f564e3d39a4b07ce8a931122ee3932daaaa984511efcaf0f083a3
-EBUILD opera-developer-52.0.2857.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
-EBUILD opera-developer-52.0.2864.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_52.0.2871.0_amd64.deb 53851070 BLAKE2B 0422fab31f792640e46c5e0105c3cd4d6cbcaa514946c2617ad37b2f0dc0cfad5a3716a9fb027157c294f664c96c1cda5b879577a9f2e92e784b3abd6e1a0d92 SHA512 cb1c1edfdf25d3a0bdfe016b1b6932970c43bd41046d5ba725e66a5d925e929ac8c0e976fc0bcb52cb513b94dd6764bbb98af74fde0cd5dc38d6d2884025b58b
+EBUILD opera-developer-52.0.2871.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-52.0.2864.0.ebuild b/www-client/opera-developer/opera-developer-52.0.2864.0.ebuild
deleted file mode 100644
index 12a41bce61c8..000000000000
--- a/www-client/opera-developer/opera-developer-52.0.2864.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-52.0.2857.0.ebuild b/www-client/opera-developer/opera-developer-52.0.2871.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-52.0.2857.0.ebuild
+++ b/www-client/opera-developer/opera-developer-52.0.2871.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index bbdac09bcdc6..faa06c7ef373 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_51.0.2830.26_amd64.deb 52162180 BLAKE2B 49a2e96d31ccc322638b388c1f4cb4d96fbfde72edab0c3bc9b535d24246ef07b04a94c164fca9109941c706d376036361f22b5d665e1322eb34e435411765f6 SHA512 907bddae177df54fc1ca6124ffa5ace63adffaaac67ee9c19ac674d4c28813db6c7c1368f626d74f15dfafa89ce906eea3306829fa4b664fdf1751c71ebdd685
 DIST opera-stable_51.0.2830.34_amd64.deb 52624046 BLAKE2B f358ca1048644c876d76729e88cb5c306e51b3cb1a671900f33a1ba49c532355c58e0f7349071974cd1ccf20524ad9474c067eb0afa2eb3349cdb202a3d56006 SHA512 102e3a8f09b920b937f9b6aa5ddca773009433522d4869cf39a7281a80f90914b4107fb0e33e7ca4d37a96a22f719d371f6cf2b19ba3f099ba4f95c2e76262b1
+DIST opera-stable_51.0.2830.40_amd64.deb 52928950 BLAKE2B 13a4140d45e2e3de4244e626e0374bc38c18ac9c45633f8222d7c880223bcf1ec6d58461cf32ed7a723fd18dcd3938b18dc674d6f6c62b706291dcde3097d978 SHA512 08b52d825d49b65863f6ccb8b6ab4a8dede54d8c547151ec6d06005fbc6d6a38f52dc66c7e43a35270b0ac6e099b3119b7d7895454a6678fb58777017070af62
 EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-51.0.2830.26.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 EBUILD opera-51.0.2830.34.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-51.0.2830.40.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-51.0.2830.26.ebuild b/www-client/opera/opera-51.0.2830.40.ebuild
index 139f6afa7c77..139f6afa7c77 100644
--- a/www-client/opera/opera-51.0.2830.26.ebuild
+++ b/www-client/opera/opera-51.0.2830.40.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index c6d0f5353d5e..3b704cab2fa6 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 1271 BLAKE2B 51c020903f801608f2515df7f9efb125353d42b61e2126c8858d22237eccf21dcc1571b46be74dc65546544cb985b0d4f2e023ea23dd18ef336f5b3ea0f03eea SHA512 1fb9e60240ec5bdf8d422290c9676b3fd3c7dacd88a26b0bd5f19cd160e3ef63d46fd5697ed0798ed3fab9db79da76d9068d36f2760681b53dad89775e12aad4
-DIST vivaldi-snapshot-1.15.1094.3_p1-amd64.deb 53493344 BLAKE2B 9461a42a8c124cffca67eef511d571ec42bfda7a4b28a6fadca71b2ffe51027ce231fba103efc7a9883a6250dd9b00c0dc39cbe35c39722c90002538bb1d8eb2 SHA512 59f000ded4b7b38a1709975380d1ba53a2a419223559b5e0f9820197b275e11db142c9c9539576b40650ca8f4068cec66c879877c2700b23caf5b5e7bb37402e
-DIST vivaldi-snapshot-1.15.1094.3_p1-armhf.deb 47288992 BLAKE2B b4f43ff658ecdfa0e0f2d36fb3dea43f03e7b3f6cfced22dd4081031124df451cdb51c85818051b15b878b5a4c43c0fa2b020bb0a328fb0311e448d812150e93 SHA512 6f2c9a09a92459fd26d97a605a4b39af9f190162113164feb47028cf7176e0a3244613982b4e734513e1fce79707b47a99c6bed23cc45d8c7e2ceb7ea4834d98
-DIST vivaldi-snapshot-1.15.1094.3_p1-i386.deb 53039128 BLAKE2B 0a07cc1e97d9f76fe41ca7a73b6c7ee3e358b73ba54337f14166d2c61cf7de6eb4a6599b61b107ab063e005a3f91adc0e9df145d5aa0c6b1293f8c0e2c11a6d0 SHA512 93cdfe9c8359cc779c32c167a5453d46ecab3333cb33a2a2992fd4636cf4722b3cc58342180a6d782acd1eb25fa3bbe36895e941c2e5f8ee2dfd17b1090920f5
+AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 603 BLAKE2B a4b048e605d70544de30e69245b50615162aa8b983bb254b3979ee6060d93a1e04de16d4e8b2b0426a7faea471a89644be3d6896206de35affb2158941c0f542 SHA512 60aedeeb8e8443c3177f19b4aa745415138ad9f3fa4f3696ad00d2b93889e145f401c59298454e62462f0a8afa619ff2d07bb481ff5895735b89c3701d270be9
 DIST vivaldi-snapshot-1.15.1099.3_p1-amd64.deb 53496850 BLAKE2B 7b3d11970055876707729779511a05d58fc838247e392f9275c24a54a1a9fc781f38c11df57a60f59e5614e579565993a8e973d1a602e41221f85d1aac9dd683 SHA512 04c172ce69fc3ea293164c72acfb0fe8497773fc952ed4dcd305586a88aae06064d0c7e8e89ddeeecbcc20fe368c64486ded3cd2f1e714a4e78cf0d154d78db2
 DIST vivaldi-snapshot-1.15.1099.3_p1-armhf.deb 47287988 BLAKE2B 2aa23c15d0700c92aac6333400ea62b77647038e40a22141369735908be5b9c1478d5f66855c8130a553890b55e15db4cd3566183ac1ec064a4f4a6af1bce26a SHA512 6869c105ea623e08b9d68480dba03e94807cb0848e0d69c3432f61f7a9fd069de3553a5d26be49fd8286fea88b26b102079a75a6e9d1a0f37697286b4fb83c0b
 DIST vivaldi-snapshot-1.15.1099.3_p1-i386.deb 53044498 BLAKE2B 975bd2608dcb2a15c8963a4a6a333727fa9f57becc98ebbcbacf3ddee66439462947b70660c318727a99fb852013c00c6e61f54ea70a903ac9303e653dac182d SHA512 a39ec548b9fe5526df8140a8c724b52b34a38e4d02b32ed0f14cf1cef429392a39f244d978336c3cf7596be3db96bff421deb22adcc1c4e7e09b82f9839e2c4c
-EBUILD vivaldi-snapshot-1.15.1094.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
+DIST vivaldi-snapshot-1.15.1104.3_p1-amd64.deb 53518054 BLAKE2B 7227273bbbd7022c16ca53e24bd3515d89a2628cb048188b768dc6153831d553f89c884f4bbfed711427a3b0296f98247ac93f9dcfc6f1ea720b795374a07c32 SHA512 af45edc856c5124891c716a95187dbd7b94204cc1e0ee45808b1da4d62a1ef7c335c3d96c013835d32990bb0af78e606bbddb5e023d7ff319d738d2b989622b5
+DIST vivaldi-snapshot-1.15.1104.3_p1-armhf.deb 47345008 BLAKE2B e5ef619baf89ca05d3abfb2e832a93227901b251ec9433f290c21f9a8444f6e7228f8e9a071de638a73a9631ad83b9bed7e3a3f6669cd6cdb52ec193954790b7 SHA512 e6765bca96d9fd6d03032dcaf8d3b489ff9794514d8daca07174438e4d9e6eb54a52b7f0574b39f4aceee8dc7d5db1f0e1208bd7f02083d7fa7666fee8c6c386
+DIST vivaldi-snapshot-1.15.1104.3_p1-i386.deb 53092768 BLAKE2B 1675a34bcdd1ab5c47f2c143d8a9867de4dbb121d9e2a08fd64a2ea3df92030f9afa9267275a535be762c082aa5dc6806dc4f5dec426cded9073b1aa8f891430 SHA512 4f0287bbf94e8ed5ada018811cfd203ff3bafe6644d252c84a1bfb2695e0745d7ae4e9edf485ec3744d0381c0a2f977a56f888eb0fbfabd984a02dabe3a90eb9
 EBUILD vivaldi-snapshot-1.15.1099.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
+EBUILD vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
index 9d086427fd75..bd64493c404a 100644
--- a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
+++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
@@ -1,22 +1,5 @@
 --- a/opt/vivaldi-snapshot/vivaldi-snapshot
 +++ b/opt/vivaldi-snapshot/vivaldi-snapshot
-@@ -32,14 +32,14 @@
-       # Chromium's FFMpeg version N-89284-gba4dfad 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 "89284" ]; then
-+#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; 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.
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1094.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild
index ee9ad44cb619..ee9ad44cb619 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1094.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild
diff --git a/www-client/weboob/Manifest b/www-client/weboob/Manifest
index f1c771c215e2..e31bf808df82 100644
--- a/www-client/weboob/Manifest
+++ b/www-client/weboob/Manifest
@@ -1,7 +1,5 @@
-DIST weboob-0.g.tar.gz 1465176 BLAKE2B 8b6efeb14e2233957844319de55c3f78665f89f95e88017bbbec983d1dc9525035a5d83fe5465d817d75267b1a8e5abcda5f0bc2c8c687100194f5c1d49ec03b SHA512 802b0f4cb10d1c2a13dc183d59aa642a9642b3b8f9417ce7bf66835a5f7028bc3fde9a8f3048b01cd5601585d37e6c95fa277b768723d05ab1b8eb4cb74a40bc
-DIST weboob-0.h.tar.gz 1700259 BLAKE2B e6971c8b498dd0478177334c42a39e871ee79c0171e33e7e7c8401cebfe7ea38dd7ca013b6eaa705ba5e422cf55292b8db8bc5deddce007827b3ef3af3ec7c0f SHA512 9ec34d184f965ec9124e7cb7e40e9337f781e2d79171fdc2f48b20d68bc21b8cabb349b56229b97f86257edb1d9f24886cbe3576a0fc80ed4440168119ea7e2b
-EBUILD weboob-0g.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
-EBUILD weboob-0h.ebuild 2008 BLAKE2B 46989e6bba0a571a6af057e2cf2fc1763003861351971bd7978c84f104a0a4fa274a685ed91182c7d1f4de4613928e43130aa430d06c798d4098711be6587b48 SHA512 957e543dbe2e32c9a5cc91428c07b1fc7f349bc898f9cdbd07d822b8d4440a6b21f5ee4d8768af1b60347f46d675a5217166ff440e1f431d242d16922f4e4b3d
-EBUILD weboob-9998.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
-EBUILD weboob-9999.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
-MISC metadata.xml 370 BLAKE2B 78add6f45e7d9326a94833c4c34e55c09ed2d5a5afe6be2ccfb6b1e5cd705066fd115f38c5bd22a4729582e7217ccd17884fe639960384e1c6bc4c14c6d5de07 SHA512 a5e4d8c198fdc5d5267f57d2c5817f499d7e27ed724057e4c6af8e48da319dcc346e32c56cd79c8729b6deab09ff619608a5b6620967c9c68f843fd189800a3a
+DIST weboob-1.3.tar.gz 2688899 BLAKE2B a75a854137b117fd228959a6c5d19e93c5a0520a8e88227e2d6e8bf13795b2d3ba51173307563b5704be68fe680dd3573fc3b7308e29d422bc9ee6e3d4adaaa7 SHA512 c56704b9fc0d21c5d2b4d297f677f01d25d523c3d45acf7ed0b241fccd4b2477ddb60e58d2dd68886858dc8a50faa43d533c808b106546180552babf9c07543c
+EBUILD weboob-1.3.ebuild 2427 BLAKE2B e78de6a2c0d0a9e204c173597cd87233d1ab1fafa7a5daf42cb69a56580f049cf5e75709ec405b8b0186515bfe18d965b32138c56e856faf95f98877b8f72ad5 SHA512 1d05935e5cf8585932554ba2ddae2aa4fd5c93ab6bdbee313cdbcc7d2dbbc2748fd7eb60e2813fd2d89b984a479cb55d457b614cfa39e329a22cc2ef5e4eee90
+EBUILD weboob-9998.ebuild 2427 BLAKE2B e78de6a2c0d0a9e204c173597cd87233d1ab1fafa7a5daf42cb69a56580f049cf5e75709ec405b8b0186515bfe18d965b32138c56e856faf95f98877b8f72ad5 SHA512 1d05935e5cf8585932554ba2ddae2aa4fd5c93ab6bdbee313cdbcc7d2dbbc2748fd7eb60e2813fd2d89b984a479cb55d457b614cfa39e329a22cc2ef5e4eee90
+EBUILD weboob-9999.ebuild 2427 BLAKE2B e78de6a2c0d0a9e204c173597cd87233d1ab1fafa7a5daf42cb69a56580f049cf5e75709ec405b8b0186515bfe18d965b32138c56e856faf95f98877b8f72ad5 SHA512 1d05935e5cf8585932554ba2ddae2aa4fd5c93ab6bdbee313cdbcc7d2dbbc2748fd7eb60e2813fd2d89b984a479cb55d457b614cfa39e329a22cc2ef5e4eee90
+MISC metadata.xml 505 BLAKE2B 0ead93ab79e15e2a34f6f46d6cfedbea661f04addbd2ae5ec4125cc4e9503c9d46fdec7f6880f1a329f2db0472ab67032fe2beaa28a10ff11d9a246b8f5cfbc8 SHA512 09332ad143bb8398627d42f3266dc99d73de9072f8c01747dafca12f1bba6e7b0d1cf5dc8860a1d988d9feb1a333e98f92ee1b65ace821b00d599d53eb63ca9a
diff --git a/www-client/weboob/metadata.xml b/www-client/weboob/metadata.xml
index 906331ef879f..3c664215f38c 100644
--- a/www-client/weboob/metadata.xml
+++ b/www-client/weboob/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<use>
-		<flag name="secure-updates">Enable secure updates</flag>
+		<flag name="deprecated">Enable <pkg>dev-python/mechanize</pkg> support (deprecated in favor of <pkg>dev-python/requests</pkg></flag>
 		<flag name="fast-libs">Enable fast libs</flag>
+		<flag name="secure-updates">Enable secure updates</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
deleted file mode 100644
index 8cc40ca6189f..000000000000
--- a/www-client/weboob/weboob-0g.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils versionator
-
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/229/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
-HOMEPAGE="http://weboob.org/"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="X +secure-updates fast-libs"
-
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
-	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
-	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex X '--qt' '--no-qt')
-		$(usex X '--xdg' '--no-xdg')
-	)
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${PN}/
-	doins -r contrib/*
-}
-
-pkg_preinst() {
-	use X && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use X && gnome2_icon_cache_update
-	elog 'You should now run "weboob-config update" (as your login user).'
-}
-
-pkg_postrm() {
-	use X && gnome2_icon_cache_update
-}
diff --git a/www-client/weboob/weboob-0h.ebuild b/www-client/weboob/weboob-0h.ebuild
deleted file mode 100644
index d3f6230fa0ec..000000000000
--- a/www-client/weboob/weboob-0h.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils versionator
-
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/235/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
-HOMEPAGE="http://weboob.org/"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="X +secure-updates fast-libs"
-
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
-	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
-	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex X '--qt' '--no-qt')
-		$(usex X '--xdg' '--no-xdg')
-	)
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${PN}/
-	doins -r contrib/*
-}
-
-pkg_preinst() {
-	use X && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use X && gnome2_icon_cache_update
-	elog 'You should now run "weboob-config update" (as your login user).'
-}
-
-pkg_postrm() {
-	use X && gnome2_icon_cache_update
-}
diff --git a/www-client/weboob/weboob-1.3.ebuild b/www-client/weboob/weboob-1.3.ebuild
new file mode 100644
index 000000000000..13f4e208d435
--- /dev/null
+++ b/www-client/weboob/weboob-1.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2010-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+EGIT_BASE="devel"
+if [[ ${PV} == *999* ]]; then
+	[[ ${PV} == 9998 ]] && EGIT_BASE="stable"
+	GIT_SCM=git-r3
+	SRC_URI=""
+else
+	REDMINE_ID="356"
+	SRC_URI="https://symlink.me/attachments/download/${REDMINE_ID}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+EGIT_REPO_URI="https://git.weboob.org/${PN}/${EGIT_BASE}.git"
+inherit distutils-r1 gnome2-utils ${GIT_SCM}
+unset EGIT_BASE GIT_SCM
+
+DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
+HOMEPAGE="http://weboob.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="+deprecated fast-libs +secure-updates X"
+
+COMMON_DEPEND="
+	X? ( dev-python/PyQt5[multimedia,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/html2text[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP},ssl]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	deprecated? ( dev-python/mechanize[${PYTHON_USEDEP}] )
+	fast-libs? (
+		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+	secure-updates? ( app-crypt/gnupg )
+	X? ( dev-python/google-api-python-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	if [[ -L contrib/webextension-session-importer/logo.png ]]; then
+		cp -L contrib/webextension-session-importer/logo.png logo.tmp.png || die
+		rm contrib/webextension-session-importer/logo.png || die
+		mv logo.tmp.png contrib/webextension-session-importer/logo.png || die
+	fi
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(usex X '--qt' '--no-qt')
+		$(usex X '--xdg' '--no-xdg')
+	)
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${PN}/
+	doins -r contrib
+}
+
+pkg_preinst() {
+	use X && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use X && gnome2_icon_cache_update
+	elog 'You should now run "weboob-config update" (as your login user).'
+}
+
+pkg_postrm() {
+	use X && gnome2_icon_cache_update
+}
diff --git a/www-client/weboob/weboob-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
index 8cc40ca6189f..13f4e208d435 100644
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -1,56 +1,71 @@
-# Copyright 2010-2015 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit distutils-r1 gnome2-utils versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
 
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
+EGIT_BASE="devel"
+if [[ ${PV} == *999* ]]; then
+	[[ ${PV} == 9998 ]] && EGIT_BASE="stable"
+	GIT_SCM=git-r3
 	SRC_URI=""
 else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/229/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
+	REDMINE_ID="356"
+	SRC_URI="https://symlink.me/attachments/download/${REDMINE_ID}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
+EGIT_REPO_URI="https://git.weboob.org/${PN}/${EGIT_BASE}.git"
+inherit distutils-r1 gnome2-utils ${GIT_SCM}
+unset EGIT_BASE GIT_SCM
+
 DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="X +secure-updates fast-libs"
+IUSE="+deprecated fast-libs +secure-updates X"
 
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
+COMMON_DEPEND="
+	X? ( dev-python/PyQt5[multimedia,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP},ssl]
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	deprecated? ( dev-python/mechanize[${PYTHON_USEDEP}] )
 	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
 	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
+	secure-updates? ( app-crypt/gnupg )
+	X? ( dev-python/google-api-python-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
 
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
+src_prepare() {
+	default
+
+	if [[ -L contrib/webextension-session-importer/logo.png ]]; then
+		cp -L contrib/webextension-session-importer/logo.png logo.tmp.png || die
+		rm contrib/webextension-session-importer/logo.png || die
+		mv logo.tmp.png contrib/webextension-session-importer/logo.png || die
+	fi
+}
 
 python_configure_all() {
 	mydistutilsargs=(
@@ -62,7 +77,7 @@ python_configure_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 	insinto /usr/share/${PN}/
-	doins -r contrib/*
+	doins -r contrib
 }
 
 pkg_preinst() {
diff --git a/www-client/weboob/weboob-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
index 8cc40ca6189f..13f4e208d435 100644
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -1,56 +1,71 @@
-# Copyright 2010-2015 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit distutils-r1 gnome2-utils versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
 
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
+EGIT_BASE="devel"
+if [[ ${PV} == *999* ]]; then
+	[[ ${PV} == 9998 ]] && EGIT_BASE="stable"
+	GIT_SCM=git-r3
 	SRC_URI=""
 else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/229/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
+	REDMINE_ID="356"
+	SRC_URI="https://symlink.me/attachments/download/${REDMINE_ID}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
+EGIT_REPO_URI="https://git.weboob.org/${PN}/${EGIT_BASE}.git"
+inherit distutils-r1 gnome2-utils ${GIT_SCM}
+unset EGIT_BASE GIT_SCM
+
 DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="X +secure-updates fast-libs"
+IUSE="+deprecated fast-libs +secure-updates X"
 
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
+COMMON_DEPEND="
+	X? ( dev-python/PyQt5[multimedia,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP},ssl]
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	deprecated? ( dev-python/mechanize[${PYTHON_USEDEP}] )
 	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
 	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
+	secure-updates? ( app-crypt/gnupg )
+	X? ( dev-python/google-api-python-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
 
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
+src_prepare() {
+	default
+
+	if [[ -L contrib/webextension-session-importer/logo.png ]]; then
+		cp -L contrib/webextension-session-importer/logo.png logo.tmp.png || die
+		rm contrib/webextension-session-importer/logo.png || die
+		mv logo.tmp.png contrib/webextension-session-importer/logo.png || die
+	fi
+}
 
 python_configure_all() {
 	mydistutilsargs=(
@@ -62,7 +77,7 @@ python_configure_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 	insinto /usr/share/${PN}/
-	doins -r contrib/*
+	doins -r contrib
 }
 
 pkg_preinst() {
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /www-client
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)