proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

311 files changed, 20043 insertions, 0 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
new file mode 100644
index 000000000000..f405e5078669
--- /dev/null
+++ b/www-client/chromium/Manifest
@@ -0,0 +1,4 @@
+DIST chromium-44.0.2403.89.tar.xz 292891880 SHA256 badd9aa979487b55bbcce4f54ec16926c6fa7eb46ec2536866200a5e68853a98 SHA512 786923a45c6baaf309ac2fe43309d8b73e5fa7e97f918ec42449b6fefdf52bd9d544e77bc1332abdce0df645d9d564a58781619de4e67f7b0fc9afae37c141e0 WHIRLPOOL 4d31a80a1dfdd3b733199412e1429ce36eeb4f1e60f31401e9e8bb2163d9d4b24b700ce26ec53f82f6b0f4bbca023737ca92e4e494397d55ab6fa20793078caf
+DIST chromium-45.0.2454.15-lite.tar.xz 240663492 SHA256 acb19ec9b6ce608e5ad9dfda9dea01e8b11993cb6490eecc28ffc7ea7460f48f SHA512 d1d46ec5ea0a3d316187ad02d4e2f819e91720b5a6586a463888e9d853642346dcca3802a84a91b084b412cc1920eac53a90dfca8e5fc02ce23ad2b2da02c226 WHIRLPOOL aa9615e781abf973a531208f7791835a83ba407305f24f089f64c5a0f54de43e4198876f33b6231f9eb4aa8e8ec8b7765a472e1c78bbe8c57795dd1ec642e2cd
+DIST chromium-45.0.2454.6-lite.tar.xz 240548584 SHA256 ec207ec6183b6096127e59a4bde5ee280ba73ecb37c7c42c7f9d7b8be625c098 SHA512 8f02efa0e71324737d1ee6cbce97feac937d7ccc1c5183fea9f41b4d2bba25ec5eb417e119a8aa26df3dbb59192aa1601a52377f8d94ed1d97904039e013cc0d WHIRLPOOL d82ebb4e05a4f9f1c79b28fe097bf1926775eb37457967fa19cf071a4914ec44faab77990a4018eb61ffd49b5e04e6acbe75c9d3d1b5e366749d3e277db127cf
+DIST chromium-46.0.2467.2-lite.tar.xz 240777744 SHA256 f4466e68b8cb25c975e0cddf33870990ece91d63e23e37197703526a41542dc2 SHA512 6c2b646198a926ec36400403d3b09ab064eca159f2accd912b8bf3f2a0cbab261e539222c9aa5f9cfcf8b60f79b161ac7f748f4caf443abb2bcb16ecdd220a6a WHIRLPOOL 75c757c25f08d42cbf74fa7bc66dfa53986c85be0e4805dc2975bafc63e64d79c4734b412b1b6c467e95b2383b8a87e8f1ab9d0f8e45d8697e2a74c616516a6d
diff --git a/www-client/chromium/chromium-44.0.2403.89.ebuild b/www-client/chromium/chromium-44.0.2403.89.ebuild
new file mode 100644
index 000000000000..4eff10bce996
--- /dev/null
+++ b/www-client/chromium/chromium-44.0.2403.89.ebuild
@@ -0,0 +1,626 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	>=media-libs/libvpx-1.4.0:=[postproc]
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/icu' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libxml/chromium' \
+		'third_party/libXNVCtrl' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/trace-viewer' \
+		'third_party/trace-viewer/third_party/components/polymer' \
+		'third_party/trace-viewer/third_party/d3' \
+		'third_party/trace-viewer/third_party/gl-matrix' \
+		'third_party/trace-viewer/third_party/jszip' \
+		'third_party/trace-viewer/third_party/tvcm' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/rcssmin' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/rjsmin' \
+		'third_party/undoview' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/kernel' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_icu (needs http://bugs.icu-project.org/trac/ticket/11358)
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libvpx=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-45.0.2454.15-r1.ebuild b/www-client/chromium/chromium-45.0.2454.15-r1.ebuild
new file mode 100644
index 000000000000..d521ed9cc0f4
--- /dev/null
+++ b/www-client/chromium/chromium-45.0.2454.15-r1.ebuild
@@ -0,0 +1,630 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/trace-viewer' \
+		'third_party/trace-viewer/tracing/third_party/components/polymer' \
+		'third_party/trace-viewer/tracing/third_party/d3' \
+		'third_party/trace-viewer/tracing/third_party/gl-matrix' \
+		'third_party/trace-viewer/tracing/third_party/jszip' \
+		'third_party/trace-viewer/tracing/third_party/tvcm' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-45.0.2454.15.ebuild b/www-client/chromium/chromium-45.0.2454.15.ebuild
new file mode 100644
index 000000000000..73f4fa60dd5e
--- /dev/null
+++ b/www-client/chromium/chromium-45.0.2454.15.ebuild
@@ -0,0 +1,630 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	net-libs/libsrtp:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/trace-viewer' \
+		'third_party/trace-viewer/tracing/third_party/components/polymer' \
+		'third_party/trace-viewer/tracing/third_party/d3' \
+		'third_party/trace-viewer/tracing/third_party/gl-matrix' \
+		'third_party/trace-viewer/tracing/third_party/jszip' \
+		'third_party/trace-viewer/tracing/third_party/tvcm' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libsrtp=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-45.0.2454.6.ebuild b/www-client/chromium/chromium-45.0.2454.6.ebuild
new file mode 100644
index 000000000000..73f4fa60dd5e
--- /dev/null
+++ b/www-client/chromium/chromium-45.0.2454.6.ebuild
@@ -0,0 +1,630 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	net-libs/libsrtp:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/trace-viewer' \
+		'third_party/trace-viewer/tracing/third_party/components/polymer' \
+		'third_party/trace-viewer/tracing/third_party/d3' \
+		'third_party/trace-viewer/tracing/third_party/gl-matrix' \
+		'third_party/trace-viewer/tracing/third_party/jszip' \
+		'third_party/trace-viewer/tracing/third_party/tvcm' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libsrtp=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-46.0.2467.2.ebuild b/www-client/chromium/chromium-46.0.2467.2.ebuild
new file mode 100644
index 000000000000..170e8475a551
--- /dev/null
+++ b/www-client/chromium/chromium-46.0.2467.2.ebuild
@@ -0,0 +1,645 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/icu-55.1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/trace-viewer' \
+		'third_party/trace-viewer/tracing/third_party/components/polymer' \
+		'third_party/trace-viewer/tracing/third_party/d3' \
+		'third_party/trace-viewer/tracing/third_party/gl-matrix' \
+		'third_party/trace-viewer/tracing/third_party/jszip' \
+		'third_party/trace-viewer/tracing/third_party/tvcm' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf+=" -Dclang=1"
+	else
+		myconf+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	cat <<EOF >chrome/test/data/webui_test_resources.grd || die
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+	<outputs>
+		<output filename="chrome/test/data/grit/webui_test_resources.h" type="rc_header">
+			<emit emit_type='prepend'></emit>
+		</output>
+		<output filename="webui_test_resources.pak" type="data_package" />
+	</outputs>
+	<release seq="1">
+	</release>
+</grit>
+EOF
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-browser.xml b/www-client/chromium/files/chromium-browser.xml
new file mode 100644
index 000000000000..2c95a5584b33
--- /dev/null
+++ b/www-client/chromium/files/chromium-browser.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
+<default-apps>
+  <web-browsers>
+    <web-browser>
+      <name>Chromium</name>
+      <executable>chromium-browser</executable>
+      <command>chromium-browser %s</command>
+      <icon-name>chromium-browser</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+    </web-browser>
+  </web-browsers>
+</default-apps>
diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
new file mode 100644
index 000000000000..c6c500732fa3
--- /dev/null
+++ b/www-client/chromium/files/chromium-cups-r0.patch
@@ -0,0 +1,70 @@
+Index: printing/backend/print_backend.h
+diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
+index e03ef42e37cf0785ba735f4a241310f70125a6e7..a8123325a613f527ba4e91a412ba09cd3225c8ec 100644
+--- a/printing/backend/print_backend.h
++++ b/printing/backend/print_backend.h
+@@ -111,7 +111,6 @@ class PRINTING_EXPORT PrintBackend
+ 
+   // Allocate a print backend. If |print_backend_settings| is NULL, default
+   // settings will be used.
+-  // Return NULL if no print backend available.
+   static scoped_refptr<PrintBackend> CreateInstance(
+       const base::DictionaryValue* print_backend_settings);
+ 
+Index: printing/backend/print_backend_dummy.cc
+diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
+index c73e5370720eda7a2f989401f37dc62c5e438e24..db269a75920d3c44381c87d67b91d923f0bfd8dc 100644
+--- a/printing/backend/print_backend_dummy.cc
++++ b/printing/backend/print_backend_dummy.cc
+@@ -13,10 +13,49 @@
+ 
+ namespace printing {
+ 
++class DummyPrintBackend : public PrintBackend {
++ public:
++  DummyPrintBackend() {
++  }
++
++  bool EnumeratePrinters(PrinterList* printer_list) override {
++    return false;
++  }
++
++  std::string GetDefaultPrinterName() override {
++    return std::string();
++  }
++
++  bool GetPrinterSemanticCapsAndDefaults(
++      const std::string& printer_name,
++      PrinterSemanticCapsAndDefaults* printer_info) override {
++    return false;
++  }
++
++  bool GetPrinterCapsAndDefaults(
++      const std::string& printer_name,
++      PrinterCapsAndDefaults* printer_info) override {
++    return false;
++  }
++
++  std::string GetPrinterDriverInfo(
++      const std::string& printer_name) override {
++    return std::string();
++  }
++
++  bool IsValidPrinter(const std::string& printer_name) override {
++    return false;
++  }
++
++ private:
++  ~DummyPrintBackend() {}
++
++  DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
++};
++
+ scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
+     const base::DictionaryValue* print_backend_settings) {
+-  NOTREACHED();
+-  return NULL;
++  return new DummyPrintBackend();
+ }
+ 
+ }  // namespace printing
diff --git a/www-client/chromium/files/chromium-gcc-4.7-r0.patch b/www-client/chromium/files/chromium-gcc-4.7-r0.patch
new file mode 100644
index 000000000000..35e0bec4bbdf
--- /dev/null
+++ b/www-client/chromium/files/chromium-gcc-4.7-r0.patch
@@ -0,0 +1,12 @@
+--- mojo/public/c/system/macros.h.orig	2014-09-03 14:48:42.963665035 +0000
++++ mojo/public/c/system/macros.h	2014-09-03 14:49:12.180255593 +0000
+@@ -76,7 +76,8 @@
+ // Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
+ // type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
+ // non-C++11 MSVS version).
+-#if __cplusplus >= 201103L
++#if __cplusplus >= 201103L && \
++	(defined(__clang__) || (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 >= 40800))
+ #define MOJO_ALIGNAS(alignment) alignas(alignment)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
diff --git a/www-client/chromium/files/chromium-gnome-r0.patch b/www-client/chromium/files/chromium-gnome-r0.patch
new file mode 100644
index 000000000000..7a8c0a9a57bb
--- /dev/null
+++ b/www-client/chromium/files/chromium-gnome-r0.patch
@@ -0,0 +1,40 @@
+Index: ui/accessibility/platform/atk_util_auralinux.cc
+diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc
+index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644
+--- a/ui/accessibility/platform/atk_util_auralinux.cc
++++ b/ui/accessibility/platform/atk_util_auralinux.cc
+@@ -3,7 +3,9 @@
+ // found in the LICENSE file.
+ 
+ #include <atk/atk.h>
++#if defined(USE_GCONF)
+ #include <gconf/gconf-client.h>
++#endif
+ #include <glib-2.0/gmodule.h>
+ 
+ #include "base/files/file_path.h"
+@@ -14,6 +16,8 @@
+ 
+ namespace {
+ 
++#if defined(USE_GCONF)
++
+ const char kGnomeAccessibilityEnabledKey[] =
+     "/desktop/gnome/interface/accessibility";
+ 
+@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() {
+   return value;
+ }
+ 
++#else  // !defined(USE_GCONF)
++
++bool ShouldEnableAccessibility() {
++  // TODO(k.czech): implement this for non-GNOME desktops.
++  return false;
++}
++
++#endif  // defined(USE_GCONF)
++
+ }  // namespace
+ 
+ G_BEGIN_DECLS
diff --git a/www-client/chromium/files/chromium-hotwording-2403.patch b/www-client/chromium/files/chromium-hotwording-2403.patch
new file mode 100644
index 000000000000..a3904ad03061
--- /dev/null
+++ b/www-client/chromium/files/chromium-hotwording-2403.patch
@@ -0,0 +1,147 @@
+From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001
+From: amistry <amistry@chromium.org>
+Date: Tue, 9 Jun 2015 12:18:39 -0700
+Subject: [PATCH] Add build flag to disable hotwording.
+
+Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time.
+
+BUG=491435
+
+Review URL: https://codereview.chromium.org/1160243004
+
+Cr-Commit-Position: refs/heads/master@{#333548}
+
+Conflicts:
+	chrome/browser/search/hotword_service.cc
+---
+ build/common.gypi                                 | 4 ++++
+ chrome/browser/BUILD.gn                           | 9 +++++++++
+ chrome/browser/search/hotword_service.cc          | 4 ++++
+ chrome/browser/search/hotword_service_unittest.cc | 4 ++++
+ chrome/chrome_browser.gypi                        | 3 +++
+ 5 files changed, 24 insertions(+)
+
+diff --git a/build/common.gypi b/build/common.gypi
+index 339cc75..ddb075c 100644
+--- a/build/common.gypi
++++ b/build/common.gypi
+@@ -381,6 +381,9 @@
+       # Web speech is enabled by default. Set to 0 to disable.
+       'enable_web_speech%': 1,
+ 
++      # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
++      'enable_hotwording%': 1,
++
+       # Notifications are compiled in by default. Set to 0 to disable.
+       'notifications%' : 1,
+ 
+@@ -1134,6 +1137,7 @@
+     'configuration_policy%': '<(configuration_policy)',
+     'safe_browsing%': '<(safe_browsing)',
+     'enable_web_speech%': '<(enable_web_speech)',
++    'enable_hotwording%': '<(enable_hotwording)',
+     'notifications%': '<(notifications)',
+     'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
+     'mac_want_real_dsym%': '<(mac_want_real_dsym)',
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+index 5152d83..6ccb079 100644
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -18,6 +18,11 @@ if (is_desktop_linux) {
+   import("//build/config/linux/pkg_config.gni")
+ }
+ 
++declare_args() {
++  # 'Ok Google' hotwording is enabled.
++  enable_hotwording = true
++}
++
+ about_credits_file = "$target_gen_dir/about_credits.html"
+ additional_modules_list_file =
+     "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
+@@ -455,6 +460,10 @@ source_set("browser") {
+     }
+   }
+ 
++  if (enable_hotwording) {
++    defines += [ "ENABLE_HOTWORDING" ]
++  }
++
+   if (is_linux) {
+     deps += [
+       "//device/media_transfer_protocol",
+diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
+index 0cf3c60..e93789b 100644
+--- a/chrome/browser/search/hotword_service.cc
++++ b/chrome/browser/search/hotword_service.cc
+@@ -642,6 +642,7 @@ bool HotwordService::IsServiceAvailable() {
+ }
+ 
+ bool HotwordService::IsHotwordAllowed() {
++#if defined(ENABLE_HOTWORDING)
+   std::string group = base::FieldTrialList::FindFullName(
+       hotword_internal::kHotwordFieldTrialName);
+   // Allow hotwording by default, and only disable if the field trial has been
+@@ -650,6 +651,9 @@ bool HotwordService::IsHotwordAllowed() {
+     return false;
+ 
+   return DoesHotwordSupportLanguage(profile_);
++#else
++  return false;
++#endif
+ }
+ 
+ bool HotwordService::IsOptedIntoAudioLogging() {
+diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
+index a3aef47..b0b5927 100644
+--- a/chrome/browser/search/hotword_service_unittest.cc
++++ b/chrome/browser/search/hotword_service_unittest.cc
+@@ -216,6 +216,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
+ }
+ 
+ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
++#if defined(ENABLE_HOTWORDING)
+   TestingProfile::Builder profile_builder;
+   scoped_ptr<TestingProfile> profile = profile_builder.Build();
+ 
+@@ -246,6 +247,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
+   Profile* otr_profile = profile->GetOffTheRecordProfile();
+   SetApplicationLocale(otr_profile, "en");
+   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
++#endif  // defined(ENABLE_HOTWORDING)
+ }
+ 
+ TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
+@@ -302,6 +304,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
+ }
+ 
+ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
++#if defined(ENABLE_HOTWORDING)
+   InitializeEmptyExtensionService();
+   service_->Init();
+ 
+@@ -372,6 +375,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
+   EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
+   EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
+   EXPECT_EQ(1, hotword_service->uninstall_count());  // no change
++#endif  // defined(ENABLE_HOTWORDING)
+ }
+ 
+ TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
+diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
+index 6d323eb..1aaedba 100644
+--- a/chrome/chrome_browser.gypi
++++ b/chrome/chrome_browser.gypi
+@@ -3529,6 +3529,9 @@
+         ['enable_session_service==1', {
+           'sources': [ '<@(chrome_browser_session_service_sources)' ],
+         }],
++        ['enable_hotwording==1', {
++          'defines': [ 'ENABLE_HOTWORDING' ],
++        }],
+         ['OS!="android" and OS!="ios" and chromeos==0', {
+           'sources': [ '<@(chrome_browser_desktop_sources)' ],
+         }],
+-- 
+2.4.4
+
diff --git a/www-client/chromium/files/chromium-launcher-r2.sh b/www-client/chromium/files/chromium-launcher-r2.sh
new file mode 100644
index 000000000000..e20bcea98bad
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r2.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Allow the user to override command-line flags, bug #357629.
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+if [ -f /etc/chromium/default ] ; then
+	. /etc/chromium/default
+fi
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER="`readlink -f "$0"`"
+
+PROGDIR="`dirname "$CHROME_WRAPPER"`"
+
+case ":$PATH:" in
+  *:$PROGDIR:*)
+    # $PATH already contains $PROGDIR
+    ;;
+  *)
+    # Append $PROGDIR to $PATH
+    export PATH="$PATH:$PROGDIR"
+    ;;
+esac
+
+# Set the .desktop file name
+export CHROME_DESKTOP="chromium-browser-chromium.desktop"
+
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/files/chromium-launcher-r3.sh b/www-client/chromium/files/chromium-launcher-r3.sh
new file mode 100644
index 000000000000..a4fc1a95394a
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r3.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Allow the user to override command-line flags, bug #357629.
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+for f in /etc/chromium/*; do
+    [[ -f ${f} ]] && source "${f}"
+done
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER=$(readlink -f "$0")
+
+PROGDIR=${CHROME_WRAPPER%/*}
+
+case ":$PATH:" in
+  *:$PROGDIR:*)
+    # $PATH already contains $PROGDIR
+    ;;
+  *)
+    # Append $PROGDIR to $PATH
+    export PATH="$PATH:$PROGDIR"
+    ;;
+esac
+
+if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
+	# Running as root with HOME owned by root.
+	# Pass --user-data-dir to work around upstream failsafe.
+	CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
+		${CHROMIUM_FLAGS}"
+fi
+
+# Set the .desktop file name
+export CHROME_DESKTOP="chromium-browser-chromium.desktop"
+
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/files/chromium-libsecret-r0.patch b/www-client/chromium/files/chromium-libsecret-r0.patch
new file mode 100644
index 000000000000..e55b0f725643
--- /dev/null
+++ b/www-client/chromium/files/chromium-libsecret-r0.patch
@@ -0,0 +1,14 @@
+diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
+index af7c775..e32fd13 100644
+--- a/chrome/chrome_browser.gypi
++++ b/chrome/chrome_browser.gypi
+@@ -3246,6 +3246,9 @@
+           'defines': [
+             'USE_LIBSECRET',
+           ],
++          'cflags': [
++            '<!@(pkg-config --cflags libsecret-1)',
++          ],
+         }],
+         ['use_aura==1', {
+           'sources': [ '<@(chrome_browser_aura_sources)' ],
diff --git a/www-client/chromium/files/chromium-system-jinja-r6.patch b/www-client/chromium/files/chromium-system-jinja-r6.patch
new file mode 100644
index 000000000000..6a3ae46b7697
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r6.patch
@@ -0,0 +1,55 @@
+--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
+@@ -54,7 +54,6 @@
+     'actions': [{
+       'action_name': 'cache_jinja_templates',
+       'inputs': [
+-        '<@(jinja_module_files)',
+         'code_generator_v8.py',
+         '<@(code_generator_template_files)',
+       ],
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
+@@ -2,10 +2,6 @@
+ {
+     'variables': {
+         'scripts_for_in_files': [
+-            # jinja2/__init__.py contains version string, so sufficient as
+-            # dependency for whole jinja2 package
+-            '<(DEPTH)/third_party/jinja2/__init__.py',
+-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+             'hasher.py',
+             'in_file.py',
+             'in_generator.py',
+--- third_party/WebKit/Source/bindings/core/v8/generated.gyp.orig	2014-08-19 10:15:53.874850750 +0000
++++ third_party/WebKit/Source/bindings/core/v8/generated.gyp	2014-08-19 10:16:04.163050746 +0000
+@@ -80,7 +80,6 @@
+       # Update that regex if command line changes (other than changing flags)
+       'action': [
+         'python',
+-        '-S',  # skip 'import site' to speed up startup
+         '<(bindings_scripts_dir)/idl_compiler.py',
+         '--cache-dir',
+         '<(bindings_scripts_output_dir)',
+--- third_party/WebKit/Source/bindings/modules/v8/generated.gyp.orig	2014-08-19 10:17:07.340279760 +0000
++++ third_party/WebKit/Source/bindings/modules/v8/generated.gyp	2014-08-19 10:17:13.556400768 +0000
+@@ -68,7 +68,6 @@
+       # Update that regex if command line changes (other than changing flags)
+       'action': [
+         'python',
+-        '-S',  # skip 'import site' to speed up startup
+         '<(bindings_scripts_dir)/idl_compiler.py',
+         '--cache-dir',
+         '<(bindings_scripts_output_dir)',
+--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
+@@ -12,9 +12,6 @@
+       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+     ],
+     'idl_lexer_parser_files': [
+-      # PLY (Python Lex-Yacc)
+-      '<(DEPTH)/third_party/ply/lex.py',
+-      '<(DEPTH)/third_party/ply/yacc.py',
+       # Web IDL lexer/parser (base parser)
+       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+       '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r7.patch b/www-client/chromium/files/chromium-system-jinja-r7.patch
new file mode 100644
index 000000000000..fe28e12c333c
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r7.patch
@@ -0,0 +1,35 @@
+--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
+@@ -54,7 +54,6 @@
+     'actions': [{
+       'action_name': 'cache_jinja_templates',
+       'inputs': [
+-        '<@(jinja_module_files)',
+         'code_generator_v8.py',
+         '<@(code_generator_template_files)',
+       ],
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
+@@ -2,10 +2,6 @@
+ {
+     'variables': {
+         'scripts_for_in_files': [
+-            # jinja2/__init__.py contains version string, so sufficient as
+-            # dependency for whole jinja2 package
+-            '<(DEPTH)/third_party/jinja2/__init__.py',
+-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+             'hasher.py',
+             'in_file.py',
+             'in_generator.py',
+--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
+@@ -12,9 +12,6 @@
+       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+     ],
+     'idl_lexer_parser_files': [
+-      # PLY (Python Lex-Yacc)
+-      '<(DEPTH)/third_party/ply/lex.py',
+-      '<(DEPTH)/third_party/ply/yacc.py',
+       # Web IDL lexer/parser (base parser)
+       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+       '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/www-client/chromium/files/chromium-system-libvpx-r0.patch b/www-client/chromium/files/chromium-system-libvpx-r0.patch
new file mode 100644
index 000000000000..d9a3425508e2
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-libvpx-r0.patch
@@ -0,0 +1,10 @@
+--- build/linux/unbundle/libvpx.gyp.orig	2015-04-08 09:25:29.605925761 +0000
++++ build/linux/unbundle/libvpx.gyp	2015-04-08 09:27:19.932142216 +0000
+@@ -24,6 +24,7 @@
+           'vpx/vpx_integer.h',
+           'vpx/vp8dx.h',
+           'vpx/vpx_encoder.h',
++          'vpx/vpx_frame_buffer.h',
+         ],
+       },
+       'includes': [
diff --git a/www-client/chromium/files/chromium-widevine.patch b/www-client/chromium/files/chromium-widevine.patch
new file mode 100644
index 000000000000..04e560e6f4a9
--- /dev/null
+++ b/www-client/chromium/files/chromium-widevine.patch
@@ -0,0 +1,31 @@
+--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig	2014-12-10 05:36:13.000000000 +0100
++++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h	2014-12-28 20:47:39.080795240 +0100
+@@ -14,4 +14,8 @@
+ //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ //    as a string, e.g., "1.0.123.456").
+ 
++#include "third_party/widevine/cdm/widevine_cdm_common.h"
++#define WIDEVINE_CDM_AVAILABLE
++#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
++
+ #endif  // WIDEVINE_CDM_VERSION_H_
+--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig	2014-12-10 05:54:35.000000000 +0100
++++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp	2014-12-28 20:50:48.163269989 +0100
+@@ -7,7 +7,7 @@
+     'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
+     'widevine_cdm_binary_files%': [],
+     'conditions': [
+-      [ 'branding == "Chrome"', {
++      [ 'branding == "Chromium"', {
+         'conditions': [
+           [ 'chromeos == 1', {
+             'widevine_cdm_version_h_file%':
+@@ -54,7 +54,7 @@
+       'target_name': 'widevinecdmadapter',
+       'type': 'none',
+       'conditions': [
+-        [ 'branding == "Chrome" and enable_pepper_cdms==1', {
++        [ 'branding == "Chromium" and enable_pepper_cdms==1', {
+           'dependencies': [
+             '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+             '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
diff --git a/www-client/chromium/files/chromium.default b/www-client/chromium/files/chromium.default
new file mode 100644
index 000000000000..c140cdeb5666
--- /dev/null
+++ b/www-client/chromium/files/chromium.default
@@ -0,0 +1,5 @@
+# Default settings for chromium. This file is sourced by /bin/bash from
+# the chromium launcher.
+
+# Options to pass to chromium.
+#CHROMIUM_FLAGS=""
diff --git a/www-client/chromium/files/dot-gclient b/www-client/chromium/files/dot-gclient
new file mode 100644
index 000000000000..ef19b4016c28
--- /dev/null
+++ b/www-client/chromium/files/dot-gclient
@@ -0,0 +1,6 @@
+solutions = [
+  { "name"        : "src",
+    "url"         : "https://src.chromium.org/svn/trunk/src",
+    "safesync_url": "https://chromium-status.appspot.com/lkgr",
+  },
+]
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
new file mode 100644
index 000000000000..1022e5d5f2bf
--- /dev/null
+++ b/www-client/chromium/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>chromium</herd>
+	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
+	<use>
+		<flag name="hidpi">Enable support for high-resolution screens (high dots per inch)</flag>
+		<flag name="hotwording">Enable voice-recognition support (Ok Google)</flag>
+		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
+		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
+		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/ck4up/Manifest b/www-client/ck4up/Manifest
new file mode 100644
index 000000000000..60ffd556d1e1
--- /dev/null
+++ b/www-client/ck4up/Manifest
@@ -0,0 +1 @@
+DIST ck4up-1.2.tar.gz 7291 RMD160 ae376bb30efeb0c8474ddd520e6a0e630e0b9be0 SHA1 e7d29e9dbaa6e7180e5e4b79c7328e8377e6dc7e SHA256 90ac117f9392b0b1e8b5decc9592ff96015fa74b43df1fbae2ddcff3b181cc7e
diff --git a/www-client/ck4up/ck4up-1.2.ebuild b/www-client/ck4up/ck4up-1.2.ebuild
new file mode 100644
index 000000000000..f8aa9a925d1c
--- /dev/null
+++ b/www-client/ck4up/ck4up-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Check for Updates on HTTP pages"
+HOMEPAGE="http://jue.li/crux/ck4up/"
+SRC_URI="http://jue.li/crux/ck4up/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/ruby"
+
+src_compile() {
+	return
+}
+
+src_install() {
+	doman ck4up.1
+	newbin ck4up.rb ck4up
+	dodoc ChangeLog || die
+}
diff --git a/www-client/ck4up/metadata.xml b/www-client/ck4up/metadata.xml
new file mode 100644
index 000000000000..9aa04d5f0e9a
--- /dev/null
+++ b/www-client/ck4up/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+ck4up is a small command-line utility, writen in ruby, to watch http and ftp 
+sites for updates. ck4up scans through a configuration file, fetches the 
+listed URLs from the web, computes the md5sum of the page, and compares the 
+value with one stored in a gdbm database. If both differ a message will be 
+written to the standard output.
+
+To improve performance, ck4up is multi-threaded. Regular expressions can be
+applied to each page in the event that ck4up produces repetitive diff
+messages. For example, if daily snapshots and a web counter are on the same
+page. To simplify maintenance of the configuration file, a kind of
+macro-expansion can be used. 
+	</longdescription>
+</pkgmetadata>
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
new file mode 100644
index 000000000000..753c2b22bb88
--- /dev/null
+++ b/www-client/conkeror/Manifest
@@ -0,0 +1,5 @@
+DIST conkeror-1.0_pre20140212.tar.gz 310931 SHA256 ecc434ed3c7703fe78c3413402ebb8b0ad7453d3ac65345a5ece329f615b0d32 SHA512 08174a50b5aca69a76ee1686c460cd62bc51d75030c067202be5acb947e6ebfb209adf5797be0096256eef913e688c401cdccd5afa1e738390458b244378c41e WHIRLPOOL 25c6eeb676d3e4238d27884b13bc298dd263811bbc19df3afbf833c5359283bb40a15e63725dbc2d7f9b990963fde4c1e070c1f44a06132b99ca2d6d951bb0cb
+DIST conkeror-1.0_pre20141005.tar.gz 313907 SHA256 46bd153cd98381ab2f073af984a00aa0b2b612b587136b092efa3909e2bb5f28 SHA512 229c21e3001dd54a7e5c23db0458052c2c559ee45e851fff1d7db61b1fd7893d7c0ec53159b333a7908c356f025a8e9e01f9ef608cffd7b3dd0c01c07eac754d WHIRLPOOL 20d6198441c1ca03419ada61611f08711ffcd6cfc13f39c7bda889396643713bfc31937aa85ca60399b6dadc944e13fc7c662fce68b7fd6507dec93b536dad88
+DIST conkeror-1.0_pre20150227.tar.gz 314449 SHA256 b0da5b9215d730fe997156cdbd010fe8a738fd5c9bbe8facf7e33e2abd3229da SHA512 01f10f1b2c26b7f6a1cd6871c103d977e9df5a57a447e778e55491e420183f1c6522792515e4e6ea05f3bf9db4612af4fa67c4c07152aa71f8704fda9c595485 WHIRLPOOL a11e56eba16f8ac40e0d0f598f87169445513d2309fb1125cafc8e37ca3b4111c0f4fb532a331a57e6d071c6126efc6e69ff228f2af766e57984c73508b0b523
+DIST conkeror-1.0_pre20150519.tar.xz 242676 SHA256 8fdbb65acf44ea71b98449ec6540bd58ba90e4ab052fa43c07209a0e318819ce SHA512 49a3758baeb38c238aca253df0938cf308f6403d4237013dc23e9255affa23d516d1edb6fed31b0f705173e6441294d6602d575cfaeb3bb947ae7d0ac1cbaee9 WHIRLPOOL cc759843951c531d4899dba35dee5cec4acb504dd442e8fd0550d8f98bb526eb383ed889c889339a965071db64a5687d11b6b8a9e2167c06f4959db5dcbfc352
+DIST conkeror.png 5105 SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667 SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f WHIRLPOOL 3fe3ea1f7f1caaa737ed3777b6b8cb6e10f971b5853a0a89de65c78e75323e8f01f01ea46d01fbff47dd97452e7a114b353322b4d8764a4d2bacf755c8fa3c66
diff --git a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
new file mode 100644
index 000000000000..605449331610
--- /dev/null
+++ b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
+	http://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-bin-23.0 )"
+
+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-r2.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/conkeror/conkeror-1.0_pre20141005.ebuild b/www-client/conkeror/conkeror-1.0_pre20141005.ebuild
new file mode 100644
index 000000000000..e5e7087506c9
--- /dev/null
+++ b/www-client/conkeror/conkeror-1.0_pre20141005.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
+	http://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-bin-23.0 )"
+
+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-r2.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/conkeror/conkeror-1.0_pre20150227.ebuild b/www-client/conkeror/conkeror-1.0_pre20150227.ebuild
new file mode 100644
index 000000000000..a371bc663b9e
--- /dev/null
+++ b/www-client/conkeror/conkeror-1.0_pre20150227.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
+	http://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-bin-23.0 )"
+
+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-r2.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/conkeror/conkeror-1.0_pre20150519.ebuild b/www-client/conkeror/conkeror-1.0_pre20150519.ebuild
new file mode 100644
index 000000000000..da6b4a0c26a4
--- /dev/null
+++ b/www-client/conkeror/conkeror-1.0_pre20150519.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 git://repo.or.cz/conkeror.git
+# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
+	http://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-bin-23.0 )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${P}.tar.xz
+	cp "${DISTDIR}/${PN}.png" . || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r branding chrome components content defaults help locale modules \
+		search-engines style tests
+	doins application.ini *.manifest Info.plist
+
+	exeinto /usr/libexec/${PN}
+	doexe conkeror-spawn-helper
+	dosym ../../libexec/${PN}/conkeror-spawn-helper \
+		/usr/share/${PN}/conkeror-spawn-helper
+
+	newbin "${FILESDIR}/conkeror-r2.sh" conkeror
+	domenu "${FILESDIR}/conkeror.desktop"
+	doicon "${WORKDIR}/conkeror.png"
+
+	doman contrib/man/conkeror.1
+	dodoc CREDITS README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/conkeror/files/conkeror-r2.sh b/www-client/conkeror/files/conkeror-r2.sh
new file mode 100644
index 000000000000..9b46d5bb0c07
--- /dev/null
+++ b/www-client/conkeror/files/conkeror-r2.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Wrapper script for conkeror
+
+for cmd in firefox firefox-bin; do
+    xr=$(type -p ${cmd})
+    if [[ -n ${xr} ]]; then
+	: ${MOZ_PLUGIN_PATH:=/usr/lib/nsbrowser/plugins} #497070
+	export MOZ_PLUGIN_PATH
+ 	exec "${xr}" -app /usr/share/conkeror/application.ini "$@"
+    fi
+done
+
+echo "$0: firefox required, but not found." >&2
+exit 1
diff --git a/www-client/conkeror/files/conkeror.desktop b/www-client/conkeror/files/conkeror.desktop
new file mode 100644
index 000000000000..fcf6123c9d44
--- /dev/null
+++ b/www-client/conkeror/files/conkeror.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Conkeror
+GenericName=Web Browser
+Comment=Conkeror is a Mozilla-based web browser whose design is inspired by GNU Emacs
+Icon=conkeror
+TryExec=/usr/bin/conkeror
+Exec=/usr/bin/conkeror %u
+Terminal=false
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;
+StartupNotify=true
+StartupWMClass=Conkeror
diff --git a/www-client/conkeror/metadata.xml b/www-client/conkeror/metadata.xml
new file mode 100644
index 000000000000..f8e5d58cda13
--- /dev/null
+++ b/www-client/conkeror/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>fauli@gentoo.org</email>
+  <name>Christian Faulhammer</name>
+</maintainer>
+<maintainer>
+  <email>ulm@gentoo.org</email>
+  <name>Ulrich Müller</name>
+</maintainer>
+<longdescription>
+  Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
+  web browser based on Mozilla XULRunner, written mainly in JavaScript, and
+  inspired by exceptional software such as Emacs and vi. Conkeror features a
+  sophisticated keyboard system, allowing users to run commands and interact
+  with content in powerful and novel ways, and it is self-documenting,
+  featuring a powerful interactive help system.
+</longdescription>
+</pkgmetadata>
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
new file mode 100644
index 000000000000..c9f7224966f7
--- /dev/null
+++ b/www-client/dillo/Manifest
@@ -0,0 +1,4 @@
+DIST dillo-3.0.4.1.tar.bz2 744101 SHA256 ed97c48029ad1fe62c8a505f81c6ea127532697374153e652065fc6ced098647 SHA512 a0737a416fe12f2bc2d329dfd86dabcf911404600f255260b596468632731838076158ae1eae98ff17505aa6addf6a7579ff45ffbd1c86d4b2f3bb74e66460e0 WHIRLPOOL 98b06ed03a97dad15e24842a9db25e3c63356c8903dc3e454c5872d7c0f5ed9ec719753a58181b56bdeec8b752964e530643017d951a5c4bfebad1f3bab359ad
+DIST dillo-3.0.4.tar.bz2 738826 SHA256 ee2bab25010dd27b18ba80259df6eb8f6b549f5af596539c08eed0b70322df39 SHA512 57513342026288255f3a2a783f206a24b9b29a03f4721d34f6e43111d61b248c56e1212abdb51adcc826c4ca081f9fa5157247c00eda95d9b5287556fe9da175 WHIRLPOOL ac3c248960db329c24c0b138126bc4164c88d7844401f7d28fde3d16b656fb2cbc6ed2e8f43a3d42ecec268a9b9269f96a72b4ce2de1c33b777ca54b1d18e608
+DIST dillo-3.0.5.tar.bz2 734472 SHA256 db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155 WHIRLPOOL 71498131f6c568b31f6b9690c719fb7eee25480f7be96c7f88d1f7726a3bf91cb1aad9892bd64cde6cf334118bd977f318d3634ee9c4beeacc50ef4c41a71a09
+DIST dillo.png 6135 SHA256 de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833 WHIRLPOOL 13c584d7186f2c9f158ae9cf5921f75040c6c58a5eec2f0a04e6251b9c7057246308be2f0726cbf9d83ec1d07a9538251f159e05cc610bf05adcbb4f8c1e3b09
diff --git a/www-client/dillo/dillo-3.0.4.1.ebuild b/www-client/dillo/dillo-3.0.4.1.ebuild
new file mode 100644
index 000000000000..ca353c208740
--- /dev/null
+++ b/www-client/dillo/dillo-3.0.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="http://www.dillo.org/"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? ( dev-libs/openssl:0 )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}2-inbuf.patch
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl) \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dodir /etc
+	default
+
+	use doc && dohtml html/*
+	dodoc AUTHORS ChangeLog README NEWS
+	dodoc doc/*.txt doc/README
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
+
+pkg_postinst() {
+	elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
+	elog "You can copy this to ~/.dillo/ and customize it"
+}
diff --git a/www-client/dillo/dillo-3.0.4.ebuild b/www-client/dillo/dillo-3.0.4.ebuild
new file mode 100644
index 000000000000..92e4cffede75
--- /dev/null
+++ b/www-client/dillo/dillo-3.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="http://www.dillo.org/"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? ( dev-libs/openssl:0 )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}2-inbuf.patch
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl) \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dodir /etc
+	default
+
+	use doc && dohtml html/*
+	dodoc AUTHORS ChangeLog README NEWS
+	dodoc doc/*.txt doc/README
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
+
+pkg_postinst() {
+	elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
+	elog "You can copy this to ~/.dillo/ and customize it"
+}
diff --git a/www-client/dillo/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild
new file mode 100644
index 000000000000..fb2356033e81
--- /dev/null
+++ b/www-client/dillo/dillo-3.0.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="http://www.dillo.org/"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? ( dev-libs/openssl:0 )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}2-inbuf.patch
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl) \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dodir /etc
+	default
+
+	use doc && dohtml html/*
+	dodoc AUTHORS ChangeLog README NEWS
+	dodoc doc/*.txt doc/README
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
+
+pkg_postinst() {
+	elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
+	elog "You can copy this to ~/.dillo/ and customize it"
+}
diff --git a/www-client/dillo/files/dillo2-inbuf.patch b/www-client/dillo/files/dillo2-inbuf.patch
new file mode 100644
index 000000000000..bc351c252fe6
--- /dev/null
+++ b/www-client/dillo/files/dillo2-inbuf.patch
@@ -0,0 +1,15 @@
+--- a/src/form.cc
++++ b/src/form.cc
+@@ -1240,8 +1240,9 @@
+    int rc = 0;
+    Dstr *output;
+    const int bufsize = 128;
+-   inbuf_t *inPtr;
+-   char *buffer, *outPtr;
++   //inbuf_t *inPtr;
++   //char *buffer, *outPtr;
++   char *buffer, *outPtr, *inPtr;
+    size_t inLeft, outRoom;
+    bool bad_chars = false;
+ 
+
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/www-client/dillo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/www-client/dwb/Manifest b/www-client/dwb/Manifest
new file mode 100644
index 000000000000..fd8929d10e4a
--- /dev/null
+++ b/www-client/dwb/Manifest
@@ -0,0 +1,2 @@
+DIST dwb-2013.03.30.tar.gz 410020 SHA256 bb12964be76d991f7b71d6c917eeecc3b356784b4a74194ffbf5f643d6cf2312 SHA512 2e9fa8cb18cadd8a27783851a825011ba5662a9e1b8ae3109e354b30f2f9e439fafd6034888a2d4d8195c8ff10b9ea70651981ea00938efb48d01256130cf9a6 WHIRLPOOL 3bb598b132a70029f1bbed4b794ba97efce1849e7fd77ea11531f14f1dc978f81aee34f1afcdedaca50153eb980278080cac48219c0bc8d5e4fd8779a5dddc0b
+DIST dwb-2014.03.07.tar.gz 474179 SHA256 bfbe3e366b27c969876f9ee7954f138b1d49a270aa84a14ce43e01591ab69b62 SHA512 7d3eb353ab7f7aa50bd678c75d72d1bbab0e5831991a1f4a1b2c4a8e134ccc90ab699932f5fd64efba157049c4863f258e329738529b7e03e2a56da737ca03a1 WHIRLPOOL 1864778d89d7fade7bf1fbeea4c5adf99cb11d63a56d255706fb3d15f19c9b0ce77ec124ad406b01b7fde8d39764ebda1f4fa70ee106731dea8f796b4e38a3ce
diff --git a/www-client/dwb/dwb-2013.03.30.ebuild b/www-client/dwb/dwb-2013.03.30.ebuild
new file mode 100644
index 000000000000..08c43f7f9078
--- /dev/null
+++ b/www-client/dwb/dwb-2013.03.30.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
+HOMEPAGE="http://portix.bitbucket.org/dwb/"
+SRC_URI="https://www.bitbucket.org/portix/dwb/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples gtk3"
+
+RDEPEND=">=net-libs/libsoup-2.32:2.4
+	dev-libs/json-c
+	net-libs/gnutls
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:3
+		x11-libs/gtk+:3
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-verbose-build.patch
+	epatch "${FILESDIR}"/${P}-json-c.patch
+
+	sed -i '/^CFLAGS += -\(pipe\|g\|O2\)/d' config.mk || die
+}
+
+src_compile() {
+	local myconf
+	use gtk3 && myconf+=" GTK=3"
+
+	# uclibc and other systems don't have execinfo.h (bug #465170)
+	if ! (echo '#include <execinfo.h>' | $(tc-getCC) -E - &>/dev/null) ; then
+		myconf+=" WITHOUT_EXECINFO=1"
+	fi
+
+	emake CC="$(tc-getCC)" ${myconf}
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/www-client/dwb/dwb-2014.03.07-r1.ebuild b/www-client/dwb/dwb-2014.03.07-r1.ebuild
new file mode 100644
index 000000000000..0d96e6959035
--- /dev/null
+++ b/www-client/dwb/dwb-2014.03.07-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
+HOMEPAGE="http://portix.bitbucket.org/dwb/"
+SRC_URI="https://www.bitbucket.org/portix/dwb/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples gtk3"
+
+RDEPEND=">=net-libs/libsoup-2.32:2.4
+	dev-libs/json-c
+	net-libs/gnutls
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:3
+		x11-libs/gtk+:3
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	local myconf
+	use gtk3 && myconf+=" GTK=3"
+
+	emake CC="$(tc-getCC)" ${myconf}
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/www-client/dwb/dwb-2014.03.07.ebuild b/www-client/dwb/dwb-2014.03.07.ebuild
new file mode 100644
index 000000000000..47ad78a03dcf
--- /dev/null
+++ b/www-client/dwb/dwb-2014.03.07.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
+HOMEPAGE="http://portix.bitbucket.org/dwb/"
+SRC_URI="https://www.bitbucket.org/portix/dwb/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples gtk3"
+
+RDEPEND=">=net-libs/libsoup-2.32:2.4
+	dev-libs/json-c
+	net-libs/gnutls
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:3
+		x11-libs/gtk+:3
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-verbose-build.patch
+
+	sed -i '/^CFLAGS += -\(pipe\|g\|O2\)/d' config.mk || die
+}
+
+src_compile() {
+	local myconf
+	use gtk3 && myconf+=" GTK=3"
+
+	emake CC="$(tc-getCC)" ${myconf}
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/www-client/dwb/dwb-9999.ebuild b/www-client/dwb/dwb-9999.ebuild
new file mode 100644
index 000000000000..fcbf9152eb0f
--- /dev/null
+++ b/www-client/dwb/dwb-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-r3 toolchain-funcs
+
+EGIT_REPO_URI="https://bitbucket.org/portix/dwb.git"
+
+DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
+HOMEPAGE="http://portix.bitbucket.org/dwb/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples gtk3 libsecret"
+
+RDEPEND="
+	>=net-libs/libsoup-2.38:2.4
+	dev-libs/json-c
+	net-libs/gnutls
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		>=net-libs/webkit-gtk-1.8.0:3
+		x11-libs/gtk+:3
+	)
+	libsecret? ( app-crypt/libsecret )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/^CFLAGS += -\(pipe\|g\|O2\)/d" config.mk || die
+}
+
+src_compile() {
+	local myconf
+	use gtk3 && myconf+=" GTK=3"
+	! use libsecret && myconf+=" USE_LIB_SECRET=0"
+
+	emake CC="$(tc-getCC)" ${myconf}
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/www-client/dwb/files/dwb-2013.03.30-json-c.patch b/www-client/dwb/files/dwb-2013.03.30-json-c.patch
new file mode 100644
index 000000000000..fbd3b55de0d0
--- /dev/null
+++ b/www-client/dwb/files/dwb-2013.03.30-json-c.patch
@@ -0,0 +1,33 @@
+--- dwb-2013.03.30/config.mk
++++ dwb-2013.03.30/config.mk
+@@ -105,8 +105,18 @@
+ $(error Cannot find $(GNUTLS))
+ endif
+ 
++# >=json-c-0.11 renamed its library, pc file, and include dir
++# first check for >=0.11, if it doesn't exist check for <0.11
++ifeq ($(shell pkg-config --exists json-c && echo 1), 1)
++JSONC=json-c
++else
+ ifeq ($(shell pkg-config --exists json && echo 1), 1)
+-LIBS+=$(GNUTLS)
++JSONC=json
++endif
++endif
++
++ifdef JSONC
++LIBS+=$(JSONC)
+ else
+ $(error Cannot find json-c)
+ endif
+--- dwb-2013.03.30/src/util/Makefile
++++ dwb-2013.03.30/src/util/Makefile
+@@ -13,7 +13,7 @@
+ TRANSPORT_SECURITY_JSON=transport_security_state_static.json
+ TRANSPORT_SECURITY_CERTS=transport_security_state_static.certs
+ 
+-LIBS=glib-2.0 gnutls json
++LIBS=glib-2.0 gnutls $(JSONC)
+ CFLAGS+=$(shell pkg-config --cflags $(LIBS))
+ LDFLAGS=$(shell pkg-config --libs $(LIBS))
+ 
diff --git a/www-client/dwb/files/dwb-2013.03.30-verbose-build.patch b/www-client/dwb/files/dwb-2013.03.30-verbose-build.patch
new file mode 100644
index 000000000000..f986bc1b8ad3
--- /dev/null
+++ b/www-client/dwb/files/dwb-2013.03.30-verbose-build.patch
@@ -0,0 +1,99 @@
+--- dwb-2013.03.30/Makefile
++++ dwb-2013.03.30/Makefile
+@@ -14,17 +14,17 @@
+ $(TARGET): $(SUBDIRS:%=%.subdir-make)
+ 
+ %.subdir-make: $(SUBDIR_BUILD_FIRST:%=%.subdir-buildfirst)
+-	@$(MAKE) $(MFLAGS) -C $*
++	$(MAKE) $(MFLAGS) -C $*
+ 
+ #$(SRCDIR)/%: $(SUBDIR_BUILD_FIRST:%=%.subdir-buildfirst)
+ 
+ %.subdir-buildfirst:
+-	@$(MAKE) $(MFLAGS) -C $*
++	$(MAKE) $(MFLAGS) -C $*
+ 
+ clean:  $(SUBDIRS:%=%.subdir-clean) $(SUBDIR_BUILD_FIRST:%=%.subdir-cleanfirst)
+ 
+ %.subdir-clean %.subdir-cleanfirst:
+-	@$(MAKE) $(MFLAGS) clean -C $*
++	$(MAKE) $(MFLAGS) clean -C $*
+ 
+ 
+ install: $(TARGET) install-man install-data
+--- dwb-2013.03.30/src/Makefile
++++ dwb-2013.03.30/src/Makefile
+@@ -10,30 +10,25 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJ) 
+-	@echo "$(CC) $@"
+-	@$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS) 
++	$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS) 
+ 
+ -include $(OBJ:.o=.d)
+ -include $(DOBJ:.do=.dd)
+ 
+ %.o: %.c %.h config.h dwb.h
+-	@echo "${CC} $<"
+-	@$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) 
++	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) 
+ 
+ debug: $(DTARGET)
+ 
+ deps.d: %.c %.h
+-	@echo "$(CC) -MM $@"
+-	@$(CC) $(CFLAGS) -MM $< -o $@
++	$(CC) $(CFLAGS) -MM $< -o $@
+ 
+ 
+ %.do: %.c %.h config.h
+-	@echo "${CC} $<"
+-	@$(CC) -c -o $@ $< $(DCFLAGS) 
++	$(CC) -c -o $@ $< $(DCFLAGS) 
+ 
+ $(DTARGET): $(DOBJ) 
+-	@echo "$(CC) $@"
+-	@$(CC) $(DOBJ) -o $(DTARGET) $(LDFLAGS) 
++	$(CC) $(DOBJ) -o $(DTARGET) $(LDFLAGS) 
+ 
+ dependencies: $(DEPS)
+ 
+--- dwb-2013.03.30/src/util/Makefile
++++ dwb-2013.03.30/src/util/Makefile
+@@ -27,16 +27,14 @@
+ 	@./$(MKTLDS) < $(TLDS_IN) > $@
+ 
+ $(MKTLDS): $(MKTLDS_SRC)
+-	@echo "${CC} $<"
+-	@$(CC) -o $@ $< $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
++	$(CC) -o $@ $< $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ $(HSTS_PRELOAD): $(HSTS) $(TRANSPORT_SECURITY_CERTS) $(TRANSPORT_SECURITY_JSON)
+ 	@echo gen $(notdir $@)
+ 	@./$(HSTS) > $@
+ 
+ $(HSTS): $(HSTS).c
+-	@echo "${CC} $<"
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $(HSTS) $(HSTS).c $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(HSTS) $(HSTS).c $(LDFLAGS)
+ 
+ clean: 
+ 	$(RM) $(OUTFILES) $(GEN_TOOLS)
+--- dwb-2013.03.30/tools/Makefile
++++ dwb-2013.03.30/tools/Makefile
+@@ -22,12 +22,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJ)
+-	@echo $(CC) $@
+-	@$(CC) $< -o $@ $(LDFLAGS)
++	$(CC) $< -o $@ $(LDFLAGS)
+ 
+ %.o: %.c
+-	@echo $(CC) $<
+-	@$(CC) $(CFLAGS) -c $< -o $@ $(CPPFLAGS)
++	$(CC) $(CFLAGS) -c $< -o $@ $(CPPFLAGS)
+ 
+ clean: 
+ 	rm -f $(TARGET) $(OBJ)
diff --git a/www-client/dwb/files/dwb-2014.03.07-makefile.patch b/www-client/dwb/files/dwb-2014.03.07-makefile.patch
new file mode 100644
index 000000000000..2221c31fd335
--- /dev/null
+++ b/www-client/dwb/files/dwb-2014.03.07-makefile.patch
@@ -0,0 +1,200 @@
+--- dwb-2014.03.07/config.mk
++++ dwb-2014.03.07/config.mk
+@@ -146,12 +146,9 @@
+ CFLAGS := $(CFLAGS)
+ CFLAGS += -Wall 
+ CFLAGS += -Werror=format-security 
+-CFLAGS += -pipe
+ CFLAGS += --ansi
+ CFLAGS += -std=c99
+ CFLAGS += -D_POSIX_C_SOURCE='200112L'
+-CFLAGS += -O2
+-CFLAGS += -g
+ CFLAGS += -D_BSD_SOURCE
+ CFLAGS += -D_NETBSD_SOURCE
+ CFLAGS += -D__BSD_VISIBLE
+--- dwb-2014.03.07/dwbem/Makefile
++++ dwb-2014.03.07/dwbem/Makefile
+@@ -15,7 +15,7 @@
+ 
+ CFLAGS := $(CFLAGS)
+ CFLAGS += -std=c99 
+-CFLAGS += -Wall -O2 -pedantic
++CFLAGS += -Wall -pedantic
+ CFLAGS += -Wextra -Werror=format-security 
+ CFLAGS += $(shell pkg-config --cflags $(LIBS))
+ CFLAGS += -DSYSTEM_EXTENSION_DIR=\"$(SYSTEM_EXTENSION_DIR)\"
+@@ -27,12 +27,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJ)
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $@ $(LDFLAGS)
++	$(CC) $(OBJ) -o $@ $(LDFLAGS)
+ 
+ %.o: %.c
+-	@echo $(CC) $< 
+-	@$(CC) $(CFLAGS) -c $< -o $@ $(CPPFLAGS)
++	$(CC) $(CFLAGS) -c $< -o $@ $(CPPFLAGS)
+ 
+ clean: 
+ 	rm -f $(TARGET) $(OBJ)
+--- dwb-2014.03.07/dwbremote/Makefile
++++ dwb-2014.03.07/dwbremote/Makefile
+@@ -7,7 +7,7 @@
+ include $(BASE_DIR)/version.mk
+ 
+ 
+-CFLAGS += -Wall -pedantic -Werror -Wextra -std=c99 -Os
++CFLAGS += -Wall -pedantic -Wextra -std=c99
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -DNAME=\"$(NAME)\"
+ CFLAGS += -DCOPYRIGHT=\"$(COPYRIGHT)\"
+@@ -27,12 +27,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(SHARED_OBJ) main.o
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
++	$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ %.o: %.c 
+-	@echo $(CC) $< 
+-	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
++	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
+ debug: 
+ 	make CFLAGS="$(DCFLAGS)"
+--- dwb-2014.03.07/exar/Makefile
++++ dwb-2014.03.07/exar/Makefile
+@@ -1,6 +1,6 @@
+ ORIG_CFLAGS := $(CFLAGS)
+ 
+-CFLAGS := -Wall -pedantic -Werror -Wextra -std=c99 -O2
++CFLAGS := -Wall -pedantic -Wextra -std=c99
+ CFLAGS += $(ORIG_CFLAGS)
+ 
+ DCFLAGS += -g -O0 -Wall -pedantic -Werror -Wextra -std=c99 
+@@ -14,12 +14,10 @@
+ all: $(SHARED_OBJ)
+ 
+ $(TARGET): $(OBJ)
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS)
++	$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
+ %.o: %.c 
+-	@echo $(CC) $< 
+-	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
++	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
+ debug: 
+ 	make CFLAGS="$(DCFLAGS)"
+--- dwb-2014.03.07/Makefile
++++ dwb-2014.03.07/Makefile
+@@ -14,18 +14,18 @@
+ $(TARGET): $(SUBDIRS:%=%.subdir-make)
+ 
+ %.subdir-make: $(SUBDIR_BUILD_FIRST:%=%.subdir-buildfirst)
+-	@$(MAKE) $(MFLAGS) -C $*
++	$(MAKE) $(MFLAGS) -C $*
+ 
+ #$(SRCDIR)/%: $(SUBDIR_BUILD_FIRST:%=%.subdir-buildfirst)
+ 
+ %.subdir-buildfirst: 
+-	@$(MAKE) $(MFLAGS) -C $*
++	$(MAKE) $(MFLAGS) -C $*
+ 
+ clean:  $(SUBDIRS:%=%.subdir-clean) $(SUBDIR_BUILD_FIRST:%=%.subdir-cleanfirst) $(SUBDIR_BUILD_LIB:%=%.subdir-cleanlib)
+ 	-$(RM) -r sandbox
+ 
+ %.subdir-clean %.subdir-cleanfirst %.subdir-cleanlib:
+-	@$(MAKE) $(MFLAGS) clean -C $*
++	$(MAKE) $(MFLAGS) clean -C $*
+ 
+ 
+ install: $(TARGET) install-man install-data
+--- dwb-2014.03.07/scripts/lib/Makefile
++++ dwb-2014.03.07/scripts/lib/Makefile
+@@ -1,6 +1,6 @@
+ # See COPYING for copyright and license details
+ TARGETS := $(patsubst %.js.in, %.js, $(wildcard *.js.in)) 
+-CFLAGS := -std=c99 -Wall -Wextra -pedantic -Werror -O2
++CFLAGS += -std=c99 -Wall -Wextra -pedantic
+ 
+ all: $(TARGETS)
+ 
+@@ -9,7 +9,7 @@
+ 	@./minify $< $@
+ 
+ minify: minify.c
+-	$(CC) $< -o $@ ${CFLAGS} ${CPPFLAGS}
++	$(CC) $< -o $@ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+ 
+ clean:  
+ 	$(RM) $(TARGETS)
+--- dwb-2014.03.07/src/Makefile
++++ dwb-2014.03.07/src/Makefile
+@@ -26,30 +26,25 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJ) 
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS) 
++	$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS) 
+ 
+ -include $(OBJ:.o=.d)
+ -include $(DOBJ:.do=.dd)
+ 
+ %.o: %.c %.h config.h dwb.h
+-	@echo $(CC) $<
+-	@$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) 
++	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) 
+ 
+ debug: $(DTARGET)
+ 
+ deps.d: %.c %.h
+-	@echo "$(CC) -MM $@"
+-	@$(CC) $(CFLAGS) -MM $< -o $@
++	$(CC) $(CFLAGS) -MM $< -o $@
+ 
+ 
+ %.do: %.c %.h config.h
+-	@echo "${CC} $<"
+-	@$(CC) -c -o $@ $< $(DCFLAGS) 
++	$(CC) -c -o $@ $< $(DCFLAGS) 
+ 
+ $(DTARGET): $(DOBJ) ../exar/exar.o ../dwbremote/dwbremote.o
+-	@echo "$(CC) $@"
+-	@$(CC) $(DOBJ) ../exar/exar.o ../dwbremote/dwbremote.o -o $(DTARGET) $(LDFLAGS) 
++	$(CC) $(DOBJ) ../exar/exar.o ../dwbremote/dwbremote.o -o $(DTARGET) $(LDFLAGS) 
+ 
+ dependencies: $(DEPS)
+ 
+--- dwb-2014.03.07/src/util/Makefile
++++ dwb-2014.03.07/src/util/Makefile
+@@ -30,20 +30,16 @@
+ all: $(OUTFILES)
+ 
+ $(TLDS_H): $(TLDS_IN) $(MKTLDS)
+-	@echo gen $(notdir $@)
+-	@./$(MKTLDS) < $(TLDS_IN) > $@
++	./$(MKTLDS) < $(TLDS_IN) > $@
+ 
+ $(MKTLDS): $(MKTLDS_SRC)
+-	@echo $(CC) $< 
+-	@$(CC) -o $@ $< $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
++	$(CC) -o $@ $< $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ $(HSTS_PRELOAD): $(HSTS) $(TRANSPORT_SECURITY_CERTS) $(TRANSPORT_SECURITY_JSON)
+-	@echo gen $(notdir $@)
+-	@./$(HSTS) > $@
++	./$(HSTS) > $@
+ 
+ $(HSTS): $(HSTS).c
+-	@echo $(CC) $< 
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $(HSTS) $(HSTS).c $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(HSTS) $(HSTS).c $(LDFLAGS)
+ 
+ clean: 
+ 	$(RM) $(OUTFILES) $(GEN_TOOLS)
diff --git a/www-client/dwb/files/dwb-2014.03.07-verbose-build.patch b/www-client/dwb/files/dwb-2014.03.07-verbose-build.patch
new file mode 100644
index 000000000000..5d16a683ad36
--- /dev/null
+++ b/www-client/dwb/files/dwb-2014.03.07-verbose-build.patch
@@ -0,0 +1,159 @@
+--- dwb-2014.03.07/dwbem/Makefile
++++ dwb-2014.03.07/dwbem/Makefile
+@@ -27,12 +27,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJ)
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $@ $(LDFLAGS)
++	$(CC) $(OBJ) -o $@ $(LDFLAGS)
+ 
+ %.o: %.c
+-	@echo $(CC) $< 
+-	@$(CC) $(CFLAGS) -c $< -o $@ $(CPPFLAGS)
++	$(CC) $(CFLAGS) -c $< -o $@ $(CPPFLAGS)
+ 
+ clean: 
+ 	rm -f $(TARGET) $(OBJ)
+--- dwb-2014.03.07/dwbremote/Makefile
++++ dwb-2014.03.07/dwbremote/Makefile
+@@ -27,12 +27,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(SHARED_OBJ) main.o
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
++	$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ %.o: %.c 
+-	@echo $(CC) $< 
+-	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
++	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
+ debug: 
+ 	make CFLAGS="$(DCFLAGS)"
+--- dwb-2014.03.07/exar/Makefile
++++ dwb-2014.03.07/exar/Makefile
+@@ -14,12 +14,10 @@
+ all: $(SHARED_OBJ)
+ 
+ $(TARGET): $(OBJ)
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS)
++	$(CC) $(OBJ) -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
+ %.o: %.c 
+-	@echo $(CC) $< 
+-	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
++	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
+ debug: 
+ 	make CFLAGS="$(DCFLAGS)"
+--- dwb-2014.03.07/Makefile
++++ dwb-2014.03.07/Makefile
+@@ -14,18 +14,18 @@
+ $(TARGET): $(SUBDIRS:%=%.subdir-make)
+ 
+ %.subdir-make: $(SUBDIR_BUILD_FIRST:%=%.subdir-buildfirst)
+-	@$(MAKE) $(MFLAGS) -C $*
++	$(MAKE) $(MFLAGS) -C $*
+ 
+ #$(SRCDIR)/%: $(SUBDIR_BUILD_FIRST:%=%.subdir-buildfirst)
+ 
+ %.subdir-buildfirst: 
+-	@$(MAKE) $(MFLAGS) -C $*
++	$(MAKE) $(MFLAGS) -C $*
+ 
+ clean:  $(SUBDIRS:%=%.subdir-clean) $(SUBDIR_BUILD_FIRST:%=%.subdir-cleanfirst) $(SUBDIR_BUILD_LIB:%=%.subdir-cleanlib)
+ 	-$(RM) -r sandbox
+ 
+ %.subdir-clean %.subdir-cleanfirst %.subdir-cleanlib:
+-	@$(MAKE) $(MFLAGS) clean -C $*
++	$(MAKE) $(MFLAGS) clean -C $*
+ 
+ 
+ install: $(TARGET) install-man install-data
+--- dwb-2014.03.07/scripts/lib/Makefile
++++ dwb-2014.03.07/scripts/lib/Makefile
+@@ -1,6 +1,6 @@
+ # See COPYING for copyright and license details
+ TARGETS := $(patsubst %.js.in, %.js, $(wildcard *.js.in)) 
+-CFLAGS := -std=c99 -Wall -Wextra -pedantic -Werror -O2
++CFLAGS += -std=c99 -Wall -Wextra -pedantic
+ 
+ all: $(TARGETS)
+ 
+@@ -9,7 +9,7 @@
+ 	@./minify $< $@
+ 
+ minify: minify.c
+-	$(CC) $< -o $@ ${CFLAGS} ${CPPFLAGS}
++	$(CC) $< -o $@ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+ 
+ clean:  
+ 	$(RM) $(TARGETS)
+--- dwb-2014.03.07/src/Makefile
++++ dwb-2014.03.07/src/Makefile
+@@ -26,30 +26,25 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJ) 
+-	@echo $(CC) -o $@
+-	@$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS) 
++	$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS) 
+ 
+ -include $(OBJ:.o=.d)
+ -include $(DOBJ:.do=.dd)
+ 
+ %.o: %.c %.h config.h dwb.h
+-	@echo $(CC) $<
+-	@$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) 
++	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) 
+ 
+ debug: $(DTARGET)
+ 
+ deps.d: %.c %.h
+-	@echo "$(CC) -MM $@"
+-	@$(CC) $(CFLAGS) -MM $< -o $@
++	$(CC) $(CFLAGS) -MM $< -o $@
+ 
+ 
+ %.do: %.c %.h config.h
+-	@echo "${CC} $<"
+-	@$(CC) -c -o $@ $< $(DCFLAGS) 
++	$(CC) -c -o $@ $< $(DCFLAGS) 
+ 
+ $(DTARGET): $(DOBJ) ../exar/exar.o ../dwbremote/dwbremote.o
+-	@echo "$(CC) $@"
+-	@$(CC) $(DOBJ) ../exar/exar.o ../dwbremote/dwbremote.o -o $(DTARGET) $(LDFLAGS) 
++	$(CC) $(DOBJ) ../exar/exar.o ../dwbremote/dwbremote.o -o $(DTARGET) $(LDFLAGS) 
+ 
+ dependencies: $(DEPS)
+ 
+--- dwb-2014.03.07/src/util/Makefile
++++ dwb-2014.03.07/src/util/Makefile
+@@ -30,20 +30,16 @@
+ all: $(OUTFILES)
+ 
+ $(TLDS_H): $(TLDS_IN) $(MKTLDS)
+-	@echo gen $(notdir $@)
+-	@./$(MKTLDS) < $(TLDS_IN) > $@
++	./$(MKTLDS) < $(TLDS_IN) > $@
+ 
+ $(MKTLDS): $(MKTLDS_SRC)
+-	@echo $(CC) $< 
+-	@$(CC) -o $@ $< $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
++	$(CC) -o $@ $< $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ $(HSTS_PRELOAD): $(HSTS) $(TRANSPORT_SECURITY_CERTS) $(TRANSPORT_SECURITY_JSON)
+-	@echo gen $(notdir $@)
+-	@./$(HSTS) > $@
++	./$(HSTS) > $@
+ 
+ $(HSTS): $(HSTS).c
+-	@echo $(CC) $< 
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $(HSTS) $(HSTS).c $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(HSTS) $(HSTS).c $(LDFLAGS)
+ 
+ clean: 
+ 	$(RM) $(OUTFILES) $(GEN_TOOLS)
diff --git a/www-client/dwb/metadata.xml b/www-client/dwb/metadata.xml
new file mode 100644
index 000000000000..b7bf3a2e321f
--- /dev/null
+++ b/www-client/dwb/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of
+			<pkg>x11-libs/gtk+:2</pkg></flag>
+		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
new file mode 100644
index 000000000000..d2359cfb4c1a
--- /dev/null
+++ b/www-client/elinks/Manifest
@@ -0,0 +1,3 @@
+DIST elinks-0.10.4.conf.bz2 5370 SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209 SHA512 defdc743d78f9620eac60f4cfc1c07ecc6d18d1d771899b6eec184bea818d612ef110219127284a5b7c53ca07746fc90fbeb97344b3aef7f1f894ed839443296 WHIRLPOOL c6dd65a281a0f48461ddac18e9981c029acd4906a294a02cfcf40429a18b443dee92a7c3317e704dc61fb519df3fa80da14c49a3f138640e223b64372669aa3a
+DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c WHIRLPOOL e6f7746407cd6654c19d4bc71dc4d0fd63070a78f7bc7c43f11f6e388268de963748597b0a2fd03cd22632651800b990ec0819d54799be9bfc4589332e11dbdd
+DIST elinks-0.12pre6.tar.bz2 2854500 SHA256 383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f WHIRLPOOL 2501e7ed557dfcc5ca4175bda3452d8c1dc42c2db2f18a0263373b6f28966619e3b3c75b0ed3d9cb4e04d177bd5d88ecdedda541531adfcd35b6ef4fe4920ed1
diff --git a/www-client/elinks/elinks-0.12_pre6.ebuild b/www-client/elinks/elinks-0.12_pre6.ebuild
new file mode 100644
index 000000000000..f2bfa697e3fd
--- /dev/null
+++ b/www-client/elinks/elinks-0.12_pre6.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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
+	http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
+	http://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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
+	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+RESTRICT="test"
+
+DEPEND="dev-libs/boehm-gc
+	>=dev-libs/expat-1.95.4
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5 )
+	gpm? ( >=sys-libs/ncurses-5.2 >=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
+
+	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 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) \
+		${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-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
new file mode 100644
index 000000000000..df0bd820cabe
--- /dev/null
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils git-r3 flag-o-matic python-any-r1
+
+EGIT_REPO_URI="git://repo.or.cz/elinks.git"
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
+	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+RESTRICT="test"
+
+DEPEND="dev-libs/boehm-gc
+	>=dev-libs/expat-1.95.4
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5 )
+	gpm? ( >=sys-libs/ncurses-5.2 >=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-1.8.5:0= )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	epatch_user
+
+	# 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 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) \
+		${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/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
new file mode 100644
index 000000000000..dc64712b29a8
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -0,0 +1,79 @@
+--- elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
++++ elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
+@@ -12,8 +12,6 @@
+   # obsolete config.saving_style. You shouldn't touch it.
+   set config.saving_style_w = 1
+ 
+-    ## terminal.linux.charset <codepage>
+-    set terminal.linux.charset = "us-ascii"
+     ## terminal.linux.transparency [0|1]
+     set terminal.linux.transparency = 1
+     ## terminal.linux.colors [0|1]
+@@ -29,8 +27,6 @@
+     ## terminal.linux.type <num>
+     set terminal.linux.type = 2
+ 
+-    ## terminal.vt100.charset <codepage>
+-    set terminal.vt100.charset = "us-ascii"
+     ## terminal.vt100.transparency [0|1]
+     set terminal.vt100.transparency = 1
+     ## terminal.vt100.colors [0|1]
+@@ -46,8 +42,6 @@
+     ## terminal.vt100.type <num>
+     set terminal.vt100.type = 1
+ 
+-    ## terminal.vt110.charset <codepage>
+-    set terminal.vt110.charset = "us-ascii"
+     ## terminal.vt110.transparency [0|1]
+     set terminal.vt110.transparency = 1
+     ## terminal.vt110.colors [0|1]
+@@ -63,8 +57,6 @@
+     ## terminal.vt110.type <num>
+     set terminal.vt110.type = 1
+ 
+-    ## terminal.xterm.charset <codepage>
+-    set terminal.xterm.charset = "us-ascii"
+     ## terminal.xterm.transparency [0|1]
+     set terminal.xterm.transparency = 1
+     ## terminal.xterm.colors [0|1]
+@@ -80,8 +72,6 @@
+     ## terminal.xterm.type <num>
+     set terminal.xterm.type = 1
+ 
+-    ## terminal.xterm-color.charset <codepage>
+-    set terminal.xterm-color.charset = "us-ascii"
+     ## terminal.xterm-color.transparency [0|1]
+     set terminal.xterm-color.transparency = 1
+     ## terminal.xterm-color.colors [0|1]
+@@ -96,8 +86,7 @@
+     set terminal.xterm-color.m11_hack = 0
+     ## terminal.xterm-color.type <num>
+     set terminal.xterm-color.type = 1
+-    ## terminal.screen.charset <codepage>
+-    set terminal.screen.charset = "us-ascii"
++
+     ## terminal.screen.transparency [0|1]
+     set terminal.screen.transparency = 1
+     ## terminal.screen.colors [0|1]
+@@ -270,10 +259,6 @@
+ 
+ 
+ 
+-    ## document.codepage.assume <codepage>
+-    # Default document codepage.
+-    set document.codepage.assume = "ISO-8859-1"
+-
+     ## document.codepage.force_assumed [0|1]
+     # Ignore charset info sent by server.
+     set document.codepage.force_assumed = 0
+@@ -343,10 +328,6 @@
+ 
+ 
+ 
+-    ## document.dump.codepage <codepage>
+-    # Codepage used in dump output.
+-    set document.dump.codepage = "us-ascii"
+-
+     ## document.dump.width <num>
+     # Width of screen in characters when dumping a HTML document.
+     set document.dump.width = 80
diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
new file mode 100644
index 000000000000..20db8a484598
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
@@ -0,0 +1,16 @@
+diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c
+--- elinks-0.11.2/src/scripting/lua/core.c	2006-11-19 14:46:37.000000000 +0100
++++ elinks-0.11.2-lua/src/scripting/lua/core.c	2007-03-10 15:34:47.000000000 +0100
+@@ -646,11 +646,7 @@ init_lua(struct module *module)
+ {
+ 	L = lua_open();
+ 
+-	luaopen_base(L);
+-	luaopen_table(L);
+-	luaopen_io(L);
+-	luaopen_string(L);
+-	luaopen_math(L);
++	luaL_openlibs(L);
+ 
+ 	lua_register(L, LUA_ALERT, l_alert);
+ 	lua_register(L, "current_url", l_current_url);
diff --git a/www-client/elinks/files/elinks-0.11.5-makefile.patch b/www-client/elinks/files/elinks-0.11.5-makefile.patch
new file mode 100644
index 000000000000..beab9a93493a
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.5-makefile.patch
@@ -0,0 +1,30 @@
+diff -Naurp elinks-0.11.5-orig/Makefile.lib elinks-0.11.5/Makefile.lib
+--- elinks-0.11.5-orig/Makefile.lib	2008-11-30 13:30:08.000000000 +0100
++++ elinks-0.11.5/Makefile.lib	2008-11-30 19:50:46.000000000 +0100
+@@ -95,9 +95,14 @@ endif
+ 
+ # All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o.
+ # Sort them to filter out duplicated and get uniform order.
++SUBDIR_LIB_O_DEPS = \
++ $(foreach subdir,$(sort $(SUBDIRS)),$(subdir)/$(LIB_O_NAME))
++
+ LIB_O_DEPS = \
+- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
+- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
++ $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) $(SUBDIR_LIB_O_DEPS)
++
++$(SUBDIR_LIB_O_DEPS):
++	@$(call ncmd,recmake,$(subst /$(LIB_O_NAME),,$@),all) || exit 1;
+ 
+ $(LIB_O_NAME): $(LIB_O_DEPS)
+ 	$(call cmd,ld_objs)
+@@ -222,7 +227,8 @@ $(RULES_LOCAL):
+ 
+ # Default deps
+ rule_deps = $(1)-recursive $(1)-default $(1)-local
+-all:	  $(call rule_deps,all)
++all:	  all-default all-local
++	@$(MAKE) all-recursive
+ install:  $(call rule_deps,install)
+ clean:	  $(call rule_deps,clean)
+ cleanall: $(call rule_deps,cleanall)
diff --git a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
new file mode 100644
index 000000000000..dee09a67eb45
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
@@ -0,0 +1,12 @@
+diff -Naurp elinks-0.12pre5-orig//src/intl/charsets.c elinks-0.12pre5/src/intl/charsets.c
+--- elinks-0.12pre5-orig//src/intl/charsets.c	2010-04-04 12:19:02.000000000 +0200
++++ elinks-0.12pre5/src/intl/charsets.c	2010-04-04 12:19:20.000000000 +0200
+@@ -821,7 +821,7 @@ free_utf_table(void)
+ 
+ 	/* Cast away const.  */
+ 	for (i = 128; i < 256; i++)
+-		mem_free((unsigned char *) utf_table[i].u.str);
++		mem_free(utf_table[i].u.str);
+ }
+ 
+ static struct conv_table *
diff --git a/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch b/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch
new file mode 100644
index 000000000000..1e07bcde190a
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch
@@ -0,0 +1,187 @@
+diff -urp a/config/m4/ruby.m4 b/config/m4/ruby.m4
+--- a/config/m4/ruby.m4	2009-07-07 13:23:17.000000000 +0100
++++ b/config/m4/ruby.m4	2012-09-10 18:23:09.000000000 +0100
+@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
+ 	if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
+ 
+ 		AC_MSG_CHECKING(Ruby version)
+-		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
++		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
+ 			ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
+ 			AC_MSG_RESULT($ruby_version)
+ 
+ 			AC_MSG_CHECKING(for Ruby header files)
+-			rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
++			rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
+ 
+ 			if test "X$rubyhdrdir" != "X"; then
+ 				AC_MSG_RESULT($rubyhdrdir)
+ 				RUBY_CFLAGS="-I$rubyhdrdir"
+-				rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
++				rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
++				if test -d "$rubyhdrdir/$rubyarch"; then
++					RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
++				fi
++				rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'`
+ 
+ 				if test "X$rubylibs" != "X"; then
+ 					RUBY_LIBS="$rubylibs"
+ 				fi
+ 
+-				librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
++				librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
+ 
+ 				if test -f "$rubyhdrdir/$librubyarg"; then
+ 					librubyarg="$rubyhdrdir/$librubyarg"
+ 
+ 				else
+-					rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
++					rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
+ 					if test -f "$rubylibdir/$librubyarg"; then
+ 						librubyarg="$rubylibdir/$librubyarg"
+ 					elif test "$librubyarg" = "libruby.a"; then
+ 						dnl required on Mac OS 10.3 where libruby.a doesn't exist
+ 						librubyarg="-lruby"
+ 					else
+-						librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
++						librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
+ 					fi
+ 				fi
+ 
+@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
+ 					RUBY_LIBS="$librubyarg $RUBY_LIBS"
+ 				fi
+ 
+-				rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
++				rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'`
+ 				if test "X$rubyldflags" != "X"; then
+ 					LDFLAGS="$rubyldflags $LDFLAGS"
+ 				fi
+@@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
+ 			AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
+ 		fi
+ 	fi
++	if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
++		AC_MSG_CHECKING([for rb_errinfo])
++		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no")
++		AC_MSG_RESULT($have_rb_errinfo)
++		if test "$have_rb_errinfo" = "yes"; then
++			AC_DEFINE([HAVE_RB_ERRINFO], [1],
++				[Define to 1 if you have the `rb_errinfo' function.])
++		fi
++	fi
+ fi
+ 
+ EL_RESTORE_FLAGS
+diff -urp a/src/scripting/ruby/core.c b/src/scripting/ruby/core.c
+--- a/src/scripting/ruby/core.c	2009-07-07 13:23:17.000000000 +0100
++++ b/src/scripting/ruby/core.c	2012-09-10 18:27:05.000000000 +0100
+@@ -76,10 +76,10 @@ erb_report_error(struct session *ses, in
+ 		break;
+ 	case TAG_RAISE:
+ 	case TAG_FATAL:
+-		eclass = CLASS_OF(ruby_errinfo);
+-		einfo = rb_obj_as_string(ruby_errinfo);
++		eclass = CLASS_OF(RB_ERRINFO);
++		einfo = rb_obj_as_string(RB_ERRINFO);
+ 
+-		if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
++		if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
+ 			msg = "unhandled exception";
+ 
+ 		} else {
+@@ -88,7 +88,7 @@ erb_report_error(struct session *ses, in
+ 
+ 			epath = rb_class_path(eclass);
+ 			snprintf(buff, MAX_STR_LEN, "%s: %s",
+-				RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
++				RSTRING_PTR(epath), RSTRING_PTR(einfo));
+ 
+ 			p = strchr(buff, '\n');
+ 			if (p) *p = '\0';
+@@ -115,7 +115,7 @@ erb_module_message(VALUE self, VALUE str
+ 	unsigned char *message, *line_end;
+ 
+ 	str = rb_obj_as_string(str);
+-	message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);
++	message = memacpy(RSTRING_PTR(str), RSTRING_LEN(str));
+ 	if (!message) return Qnil;
+ 
+ 	line_end = strchr(message, '\n');
+@@ -162,8 +162,8 @@ erb_stdout_p(int argc, VALUE *argv, VALU
+ 		 * the inspect() method, which adds quotes to the strings, so
+ 		 * gently ignore them. */
+ 
+-		ptr = RSTRING(substr)->ptr;
+-		len = RSTRING(substr)->len;
++		ptr = RSTRING_PTR(substr);
++		len = RSTRING_LEN(substr);
+ 
+ 		if (*ptr == '"')
+ 			ptr++, len--;
+diff -urp a/src/scripting/ruby/core.h b/src/scripting/ruby/core.h
+--- a/src/scripting/ruby/core.h	2009-07-07 13:23:17.000000000 +0100
++++ b/src/scripting/ruby/core.h	2012-09-10 18:26:25.000000000 +0100
+@@ -7,6 +7,20 @@ struct session;
+ 
+ #include <ruby.h>	/* for VALUE */
+ 
++#ifndef RSTRING_LEN
++#define RSTRING_LEN(string) (RSTRING(string)->len)
++#endif
++
++#ifndef RSTRING_PTR
++#define RSTRING_PTR(string) (RSTRING(string)->ptr)
++#endif
++
++#ifdef HAVE_RB_ERRINFO
++#define RB_ERRINFO (rb_errinfo())
++#else
++#define RB_ERRINFO (ruby_errinfo)
++#endif
++
+ VALUE erb_module;
+ 
+ void alert_ruby_error(struct session *ses, unsigned char *msg);
+diff -urp a/src/scripting/ruby/hooks.c b/src/scripting/ruby/hooks.c
+--- a/src/scripting/ruby/hooks.c	2009-07-07 13:23:17.000000000 +0100
++++ b/src/scripting/ruby/hooks.c	2012-09-10 17:53:48.000000000 +0100
+@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *d
+ 	{
+ 		unsigned char *new_url;
+ 
+-		new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
++		new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
+ 		if (new_url) {
+ 			mem_free_set(url, new_url);
+ 		}
+@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void
+ 	{
+ 		unsigned char *new_url;
+ 
+-		new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
++		new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
+ 		if (new_url) {
+ 			mem_free_set(url, new_url);
+ 		}
+@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap,
+ 	switch (rb_type(result)) {
+ 	case T_STRING:
+ 	{
+-		int len = RSTRING(result)->len;
++		int len = RSTRING_LEN(result);
+ 
+-		add_fragment(cached, 0, RSTRING(result)->ptr, len);
++		add_fragment(cached, 0, RSTRING_PTR(result), len);
+ 		normalize_cache_entry(cached, len);
+ 
+ 		break;
+@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void *
+ 	{
+ 		unsigned char *proxy;
+ 
+-		proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
++		proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
+ 		if (proxy) {
+ 			mem_free_set(new_proxy_url, proxy);
+ 		}
diff --git a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
new file mode 100644
index 000000000000..ee2e5e8d633f
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
@@ -0,0 +1,124 @@
+--- a/src/scripting/smjs/action_object.c	2012-06-28 11:46:58.000000000 -0400
++++ b/src/scripting/smjs/action_object.c	2012-06-28 11:52:42.000000000 -0400
+@@ -50,7 +50,7 @@
+ 	assert(smjs_ctx);
+ 	if_assert_failed return JS_FALSE;
+ 
+-	value = JS_FALSE;
++	value = JSVAL_FALSE;
+ 
+ 	if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) {
+ 		JS_SET_RVAL(ctx, rval, value);
+@@ -76,7 +76,7 @@
+ 
+ 	do_action(hop->ses, hop->action_id, 1);
+ 
+-	value = JS_TRUE;
++	value = JSVAL_TRUE;
+ 	JS_SET_RVAL(ctx, rval, value);
+ 
+ 	return JS_TRUE;
+--- a/src/scripting/smjs/bookmarks.c	2012-06-28 11:57:40.000000000 -0400
++++ b/src/scripting/smjs/bookmarks.c	2012-06-28 12:08:20.000000000 -0400
+@@ -250,11 +250,20 @@
+ 
+ /* @bookmark_folder_class.getProperty */
+ static JSBool
++#if JS_VERSION >= 185
++bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
+ bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#endif
+ {
+ 	struct bookmark *bookmark;
+ 	struct bookmark *folder;
+ 	unsigned char *title = NULL;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
+--- a/src/scripting/smjs/elinks_object.c	2012-06-28 12:11:15.000000000 -0400
++++ b/src/scripting/smjs/elinks_object.c	2012-06-28 12:14:50.000000000 -0400
+@@ -185,7 +185,7 @@
+ 	                               method, rval))
+ 		return JS_FALSE;
+ 
+-	if (JSVAL_VOID == *rval)
++	if (JSVAL_IS_VOID(*rval))
+ 		return JS_FALSE;
+ 
+ 	return JS_CallFunctionValue(smjs_ctx, smjs_elinks_object,
+--- a/src/scripting/smjs/globhist.c	2012-06-28 12:20:25.000000000 -0400
++++ b/src/scripting/smjs/globhist.c	2012-06-28 12:20:15.000000000 -0400
+@@ -201,11 +201,20 @@
+ 
+ /* @smjs_globhist_class.getProperty */
+ static JSBool
+-smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#if JS_VERSION >= 185
++smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
++smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
++#endif
+ {
+ 	JSObject *jsobj;
+ 	unsigned char *uri_string;
+ 	struct global_history_item *history_item;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	uri_string = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
+ 	if (!uri_string) goto ret_null;
+--- a/src/scripting/smjs/keybinding.c	2012-06-28 12:21:39.000000000 -0400
++++ b/src/scripting/smjs/keybinding.c.new	2012-06-28 12:48:00.000000000 -0400
+@@ -17,11 +17,20 @@
+ 
+ /* @keymap_class.getProperty */
+ static JSBool
+-keymap_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#if JS_VERSION >= 185
++keymap_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
++keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
++#endif
+ {
+ 	unsigned char *action_str;
+ 	const unsigned char *keystroke_str;
+ 	int *data;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
+@@ -70,11 +79,20 @@
+ 
+ /* @keymap_class.setProperty */
+ static JSBool
+-keymap_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
++#if JS_VERSION >= 185
++keymap_set_property(JSContext *ctx, JSObject *obj, jsid iid, JSBool strict, jsval *vp)
++#else
++keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, JSBool strict, jsval *vp)
++#endif
+ {
+ 	int *data;
+ 	unsigned char *keymap_str;
+ 	const unsigned char *keystroke_str;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
diff --git a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
new file mode 100644
index 000000000000..b48ddaeecc47
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
@@ -0,0 +1,12 @@
+diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c elinks-0.12pre5/src/ecmascript/spidermonkey.c
+--- elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c	2011-06-12 01:03:02.427000686 +0200
++++ elinks-0.12pre5/src/ecmascript/spidermonkey.c	2011-06-12 01:03:31.368000736 +0200
+@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp
+                 JSContext *ctx)
+ {
+ 	interpreter->exec_start = time(NULL);
+-	JS_SetBranchCallback(ctx, safeguard);
++	JS_SetOperationCallback(ctx, safeguard);
+ }
+ 
+ 
diff --git a/www-client/elinks/files/elinks-9999-parallel-make.patch b/www-client/elinks/files/elinks-9999-parallel-make.patch
new file mode 100644
index 000000000000..86aea5588a2f
--- /dev/null
+++ b/www-client/elinks/files/elinks-9999-parallel-make.patch
@@ -0,0 +1,51 @@
+--- a/Makefile.lib	2014-05-30 13:45:11.756422117 -0400
++++ b/Makefile.lib	2014-05-30 13:47:22.626423230 -0400
+@@ -117,7 +117,7 @@
+  $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
+  $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
+ 
+-$(LIB_O_NAME): $(LIB_O_DEPS)
++$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
+ 	$(call cmd,ld_objs)
+ 
+ DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
+@@ -260,21 +260,36 @@
+ # remaining subdirectories, but return an error at the end.
+ $(RULES_REC):
+ ifneq (,$(findstring k,$(MAKEFLAGS)))
+-	@suberr=0; \
++	@+suberr=0; \
+ 	$(foreach subdir,$(sort $(SUBDIRS)), \
+ 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
+ 	exit $$suberr
+ else
+-	@$(foreach subdir,$(sort $(SUBDIRS)), \
++	@+$(foreach subdir,$(sort $(SUBDIRS)), \
+ 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
+ endif
+ 
++all-recursive.built:
++ifneq (,$(findstring k,$(MAKEFLAGS)))
++	@+suberr=0; \
++	$(foreach subdir,$(sort $(SUBDIRS)), \
++		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
++	[ $$suberr == 0 ] && touch $@; \
++	exit $$suberr
++else
++	@+$(foreach subdir,$(sort $(SUBDIRS)), \
++		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
++	touch $@
++endif
++
++CLEAN += all-recursive.built
++
+ # Dummy -local rules
+ $(RULES_LOCAL):
+ 
+ # Default deps
+ rule_deps = $(1)-recursive $(1)-default $(1)-local
+-all:	  $(call rule_deps,all)
++all:	  $(subst recursive,recursive.built,$(call rule_deps,all))
+ install:  $(call rule_deps,install)
+ clean:	  $(call rule_deps,clean)
+ cleanall: $(call rule_deps,cleanall)
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
new file mode 100644
index 000000000000..88787459505e
--- /dev/null
+++ b/www-client/elinks/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>kondor6c@toshers.org</email>
+		<name>Kevin Faulkner</name>
+	</maintainer>
+	<use>
+		<flag name='bittorrent'>Enable support for the BitTorrent protocol</flag>
+		<flag name='finger'>Enable support for the finger protocol</flag>
+		<flag name='gopher'>Enable support for the gopher protocol</flag>
+		<flag name='mouse'>Make elinks to grab all mouse events</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
new file mode 100644
index 000000000000..a85b05ccb59a
--- /dev/null
+++ b/www-client/epiphany/Manifest
@@ -0,0 +1,3 @@
+DIST epiphany-3.14.2.tar.xz 3063764 SHA256 cc69403b3b7addf30dd6eb703265a77102b8ab3c6194678ad0d2433f251492d0 SHA512 895f70768c4c765fdc221b2d44bfbb6e7599b0231b0af1a7a8a869fd461db6a09cbdd7a0120bda5dfd583d1d667391c574f18caf1aef5971b474d34911581dc7 WHIRLPOOL 0e235b3190b0ef42a9caa241258060dd5db1e8db07275102ec50b5223931badc56b6ad0c7ec32ccf27d74308845d4d9aef736775bbf6e5290a5d9275bd5c669a
+DIST epiphany-3.16.2.tar.xz 3084952 SHA256 a621b5f443bc168980d12452f1a031e0a50d99ffc825989a38b14d398def73e6 SHA512 424408e24bf69f8ad62e4c384d916890e128d164c8ab0c2932fa143f2989f017eb56d0b4a9c5e77518124c1e6d233df152ab6b85e3a1f26f28ddc97200c5aa83 WHIRLPOOL 2c970e2b22742193f7c2e9fd17a55f528132eb77dea0b3c8f83faf3c3f7d530343ccc26de51871a98fb92ab185b691b1d5dab49853b8415852c7b8b8518e6635
+DIST epiphany-3.16.3.tar.xz 3082680 SHA256 d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 SHA512 68f4dc0e299b929f244818d93a9af14f48ef2c3a93813fe5457c11d37ddb5a5e2b5ae3f93f0d41e8095590f87d8679d2cee5b6298c128475a9ad9eb6aa3c8bae WHIRLPOOL c82ff5051ac3c1ac2480b846f77893f39f52517f0aa0f7a6084e8b24e98f490264a6adecd89671d89719da835ca84f0613019e281280380bb20d980c2294afe9
diff --git a/www-client/epiphany/epiphany-3.14.2.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
new file mode 100644
index 000000000000..154e4c3c6933
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.14.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 pax-utils versionator virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+# TODO: coverage
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+jit +nss test"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
+	>=app-text/iso-codes-0.35
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.5.90:4[jit?]
+	>=net-libs/libsoup-2.48:2.4
+	>=x11-libs/gtk+-3.13:3
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
+
+	dev-db/sqlite:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+
+	nss? ( dev-libs/nss )
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
+DEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-common-3.6
+	>=dev-util/intltool-0.50
+	sys-apps/paxctl
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix missing symbol in webextension.so, bug #728972
+	epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
+
+	# Fix unittests
+	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-*.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DISPLAY
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	gnome2_src_install
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
+}
diff --git a/www-client/epiphany/epiphany-3.16.2.ebuild b/www-client/epiphany/epiphany-3.16.2.ebuild
new file mode 100644
index 000000000000..eee9b2f4b35e
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.16.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+#inherit autotools eutils gnome2 pax-utils versionator virtualx
+inherit eutils gnome2 pax-utils versionator virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+# TODO: coverage
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+jit +nss test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
+	>=app-text/iso-codes-0.35
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.7.4:4[jit?]
+	>=net-libs/libsoup-2.48:2.4
+	>=x11-libs/gtk+-3.13:3
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
+
+	dev-db/sqlite:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+
+	nss? ( dev-libs/nss )
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
+DEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-common-3.6
+	>=dev-util/intltool-0.50
+	sys-apps/paxctl
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix missing symbol in webextension.so, https://bugzilla.gnome.org/show_bug.cgi?id=728972
+	# FIXME: More information needed per https://bugzilla.gnome.org/show_bug.cgi?id=728972#c5
+	# If you are able to reproduce the failure, please provide it. Thanks
+#	epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
+
+	# Fix unittests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+
+#	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DISPLAY
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	gnome2_src_install
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
+}
diff --git a/www-client/epiphany/epiphany-3.16.3.ebuild b/www-client/epiphany/epiphany-3.16.3.ebuild
new file mode 100644
index 000000000000..e24049c10606
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.16.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 pax-utils versionator virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+# TODO: coverage
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+jit +nss test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
+	>=app-text/iso-codes-0.35
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.7.4:4[jit?]
+	>=net-libs/libsoup-2.48:2.4
+	>=x11-libs/gtk+-3.13:3
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
+
+	dev-db/sqlite:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+
+	nss? ( dev-libs/nss )
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
+DEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-common-3.6
+	>=dev-util/intltool-0.50
+	sys-apps/paxctl
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix unittests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DISPLAY
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	gnome2_src_install
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
+}
diff --git a/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
new file mode 100644
index 000000000000..6f2d8350ec23
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.12.0-missing-symbol.patch
@@ -0,0 +1,39 @@
+From 267ec3e2d7ca0f1881cb76d702ac673727f7507a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 22 Apr 2014 21:15:42 +0200
+Subject: [PATCH] Add missing files to webextension library
+
+Otherwise, results in:
+
+avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
+'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
+/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
+undefined symbol: ephy_profile_utils_set_migration_version
+---
+ embed/web-extension/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
+index 5bdb174..be4b08f 100644
+--- a/embed/web-extension/Makefile.am
++++ b/embed/web-extension/Makefile.am
+@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
+ 	$(top_srcdir)/lib/ephy-file-helpers.h \
+ 	$(top_srcdir)/lib/ephy-form-auth-data.c \
+ 	$(top_srcdir)/lib/ephy-form-auth-data.h \
++	$(top_srcdir)/lib/ephy-profile-utils.c \
++	$(top_srcdir)/lib/ephy-profile-utils.h \
+ 	$(top_srcdir)/lib/ephy-settings.c \
+ 	$(top_srcdir)/lib/ephy-settings.h \
+ 	$(top_srcdir)/lib/ephy-string.c \
+@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
+ libephywebextension_la_CFLAGS = \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+ 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
++	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
+ 	$(WEB_EXTENSION_CFLAGS)
+ 
+ libephywebextension_la_LIBADD = \
+-- 
+1.9.0
+
diff --git a/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch b/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch
new file mode 100644
index 000000000000..ede1a5d8407a
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.14.0-missing-symbol.patch
@@ -0,0 +1,39 @@
+From 46540674cec3fe63f1d560591720f946770159da Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 22 Apr 2014 21:15:42 +0200
+Subject: [PATCH 1/3] Add missing files to webextension library
+
+Otherwise, results in:
+
+avril 22 21:09:36 kanae epiphany.desktop[32013]: Error loading module
+'/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so':
+/usr/lib64/epiphany/3.12/web-extensions/libephywebextension.so:
+undefined symbol: ephy_profile_utils_set_migration_version
+---
+ embed/web-extension/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
+index 86b48b7..a755c89 100644
+--- a/embed/web-extension/Makefile.am
++++ b/embed/web-extension/Makefile.am
+@@ -22,6 +22,8 @@ libephywebextension_la_SOURCES = \
+ 	$(top_srcdir)/lib/ephy-file-helpers.h \
+ 	$(top_srcdir)/lib/ephy-form-auth-data.c \
+ 	$(top_srcdir)/lib/ephy-form-auth-data.h \
++	$(top_srcdir)/lib/ephy-profile-utils.c \
++	$(top_srcdir)/lib/ephy-profile-utils.h \
+ 	$(top_srcdir)/lib/ephy-settings.c \
+ 	$(top_srcdir)/lib/ephy-settings.h \
+ 	$(top_srcdir)/lib/ephy-string.c \
+@@ -39,6 +41,7 @@ libephywebextension_la_CPPFLAGS = \
+ libephywebextension_la_CFLAGS = \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+ 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
++	-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
+ 	$(AM_CFLAGS) \
+ 	$(WEB_EXTENSION_CFLAGS)
+ 
+-- 
+2.1.2
+
diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
new file mode 100644
index 000000000000..3b948a5ae686
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.14.0-unittest-1.patch
@@ -0,0 +1,30 @@
+From ddf0dea8e4eb5fe263ddc85d661ce58e55dd554f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 23:03:02 +0200
+Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
+ guaranteed to be /tmp
+
+---
+ tests/ephy-file-helpers-test.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
+index c33c1da..bdf7455 100644
+--- a/tests/ephy-file-helpers-test.c
++++ b/tests/ephy-file-helpers-test.c
+@@ -92,12 +92,7 @@ test_ephy_file_helpers_init (void)
+       GFile *file;
+ 
+       file = g_file_new_for_path (tmp_dir);
+-      /* As a safety measure, only try recursive delete on paths
+-       * prefixed with /tmp. */
+-      if (g_str_has_prefix (tmp_dir, "/tmp"))
+         g_assert (ephy_file_delete_dir_recursively (file, NULL));
+-      else
+-        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
+ 
+       g_object_unref (file);
+     }
+-- 
+2.1.2
+
diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch
new file mode 100644
index 000000000000..36dcb30ce3bd
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch
@@ -0,0 +1,45 @@
+From 3d2ca8dfb33f9dd658293d14d6b75983d1d2f57d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 23:06:29 +0200
+Subject: [PATCH 3/3] Disable broken tests
+
+Not the first time these are failing even though issue was reported
+upstream.
+---
+ tests/ephy-file-helpers-test.c | 4 ++--
+ tests/ephy-migration-test.c    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
+index bdf7455..718fa29 100644
+--- a/tests/ephy-file-helpers-test.c
++++ b/tests/ephy-file-helpers-test.c
+@@ -341,8 +341,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/lib/ephy-file-helpers/get_downloads_dir",
+                    test_ephy_file_get_downloads_dir);
+ 
+-  g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
+-                   test_ephy_file_create_delete_dir);
++  /*g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
++                   test_ephy_file_create_delete_dir);*/
+ 
+   g_test_add_func ("/lib/ephy-file-helpers/desktop_dir",
+                    test_ephy_file_desktop_dir);
+diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c
+index fab9ee7..64cdd65 100644
+--- a/tests/ephy-migration-test.c
++++ b/tests/ephy-migration-test.c
+@@ -65,8 +65,8 @@ main (int argc, char *argv[])
+ 
+   g_test_add_func ("/lib/ephy-profile-utils/do_migration_simple",
+                    test_do_migration_simple);
+-  g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid",
+-                   test_do_migration_invalid);
++  /*g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid",
++                   test_do_migration_invalid);*/
+ 
+   return g_test_run ();
+ }
+-- 
+2.1.2
+
diff --git a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
new file mode 100644
index 000000000000..baa8a421da13
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
@@ -0,0 +1,30 @@
+From 7ed4a68e2106480f0984703f70b7c25734803161 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 10 May 2015 17:35:57 +0200
+Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
+ guaranteed to be /tmp
+
+---
+ tests/ephy-file-helpers-test.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
+index 43d0009..0fcb585 100644
+--- a/tests/ephy-file-helpers-test.c
++++ b/tests/ephy-file-helpers-test.c
+@@ -89,12 +89,7 @@ test_ephy_file_helpers_init (void)
+ 
+     /* Cleanup dir left behind. */
+     if (keep_dir) {
+-      /* As a safety measure, only try recursive delete on paths
+-       * prefixed with /tmp. */
+-      if (g_str_has_prefix (tmp_dir, "/tmp"))
+         g_assert (ephy_file_delete_dir_recursively (tmp_dir, NULL));
+-      else
+-        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
+     }
+ 
+     g_free (tmp_dir);
+-- 
+2.3.6
+
diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
new file mode 100644
index 000000000000..72b304a074f2
--- /dev/null
+++ b/www-client/epiphany/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+	<flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag>
+</use>
+</pkgmetadata>
diff --git a/www-client/fetch/Manifest b/www-client/fetch/Manifest
new file mode 100644
index 000000000000..8e7fdb8bd4e7
--- /dev/null
+++ b/www-client/fetch/Manifest
@@ -0,0 +1 @@
+DIST fetch-1.0.tar.gz 62009 SHA256 a2804a8b67672fe759a8687977dd13f810718152e69550654845014c94f7d8dc SHA512 6de273c629343b1e3190d2316a9c6f88ce89ea4899aecb3684c8df623450424eb34bc99a59578b9b822d3b02a25dbf2c5a46d0e957519dcf22d4662eada7f9c1 WHIRLPOOL 006eaf575b1548c0ea2106cffadda0161788afea1d7857755892c78cd09ab2672a414992cb9f85a67db972ac4aa0bc89db949e10da68d7d20a49dc8b5454268e
diff --git a/www-client/fetch/fetch-1.0-r1.ebuild b/www-client/fetch/fetch-1.0-r1.ebuild
new file mode 100644
index 000000000000..17bd9fbb7b12
--- /dev/null
+++ b/www-client/fetch/fetch-1.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Fetch is a simple, fast, and flexible HTTP download tool built on the HTTP Fetcher library"
+HOMEPAGE="http://sourceforge.net/projects/fetch/"
+SRC_URI="mirror://sourceforge/fetch/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=dev-libs/http-fetcher-1.0.1"
+RDEPEND="${DEPEND}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "/^ld_rpath/d" configure || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README INSTALL
+	dohtml docs/*.html
+}
diff --git a/www-client/fetch/metadata.xml b/www-client/fetch/metadata.xml
new file mode 100644
index 000000000000..d658d3104cb5
--- /dev/null
+++ b/www-client/fetch/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">fetch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
new file mode 100644
index 000000000000..f22d3ddbfc49
--- /dev/null
+++ b/www-client/firefox-bin/Manifest
@@ -0,0 +1,156 @@
+DIST firefox-38.1.1esr-af.xpi 483326 SHA256 4dafbd9e593df6bd21096e8382d83ede1a34a94fdff3e11412a9e52801f105a9 SHA512 464047fd6984de57eda4d65798968c44d7f84ca82a9fef81b191de51e74e5b545d45343cdab5e742353b7accfa7ff785206d1687f86605fc92978fcba95ca06a WHIRLPOOL c1d8e35c09774021c2b5ac8350b89c3d396d7513b2f64edd35c8a0c0caf736272c5ee30122518f31b6b3c0a7823af2c3f232dc1f1d2e61d91db23e4de37614da
+DIST firefox-38.1.1esr-ar.xpi 516495 SHA256 9c48e16f97cf02db6826f507268024f128f0f136444b4e5093f49fab9cb13ead SHA512 6e6cdcad3ac200e3d274c1539f1f2977566c5b6c7c98df89f19fdd87137e418792b495550b805e76f71a195f7b11a7205ee755e28789403057856fbaf64c056d WHIRLPOOL 8ff28af6c62f4eea0225e4695ca47ff94ac9288aa78e8637b1365ddf4619113f7b15a6b4bcb6ccf4245cbda0ddf28b5c41c7e8b312fe5143ae688dd2d889e131
+DIST firefox-38.1.1esr-as.xpi 509574 SHA256 f69e16f0c888636a9748ed27488518a8901ac125f12e98cc556c8a8183d64837 SHA512 b9ec793c19a572b80502caa269f62465c80e750410b9149716c8c5eb551d42c934bec3a3b6247adc641a169060e2f0a42a544f062065b0a211d0ce1f3ac431d1 WHIRLPOOL c43f25cd6d148f34287c4fe9c338451789215b2af0195aeca75af98f9c7b93565e50c64ad2f561dceb3429a89ff4a7b0c57767001a463ccac03b81968a2f1a50
+DIST firefox-38.1.1esr-ast.xpi 397203 SHA256 6edeac5ad2cc12659492b818024a3252af8a2c708e6f306d43f693518f17fa6b SHA512 b58a6692f0811ca34ba3f7299c0f3d3d6de0201c02edc065253ffcd2ffd98f77c203a7126552c62c4061dd4632d54f9ab8d33165a618c1d6cf92ba38efc9e80d WHIRLPOOL ab797102d247eb09c93c4cd3925b9a81ddf77c78a0ba98bbd3d246100700418bef8b125e00e6fedbd43fa347ddd4a8452c7e00b5ebdc45a5ad5cf18676619ff3
+DIST firefox-38.1.1esr-be.xpi 441057 SHA256 db653c1befe43c7984b1ef9c5412cc3ceee25523cd4abf7534dfcb4cb13f422a SHA512 2c94823a55f21b7105734b1e897f82d41a17cb1968edd6ff4ad33976df7861f91b39d0573b77f1d4fb09447725e82e19ad6c646145f8a982cabfc54c1729cd51 WHIRLPOOL 6a558f1e37991ecc35084a33c6034f35fe8eec83455fab790294485a3d7f0dd4dde5b609e39db2d233c480915a42d5434d6d5b6aa536c8bd610c4da6fdfe0777
+DIST firefox-38.1.1esr-bg.xpi 487819 SHA256 ab2e124660a72ca2aa1648eb3d874ab3cf6d8412885300f37f0741602858a9d5 SHA512 067a3cbc32232714ae0e6cf162a45ee9a82e54ef94314e6a93c503507fda9454250236358f3bb9a09cf3b383c4e70eeda218e17dec27055a8434c08d6816c8e8 WHIRLPOOL e670418b6f75cd559fa7f528c0daaaf3b05eb8f22f20ae9fc7c93988c175e69ca1cc0c50b818ceb92b2f180ec31035e5d689d3b5c13fabfa7eb1f126f678726f
+DIST firefox-38.1.1esr-bn-BD.xpi 528689 SHA256 2fb4eeb9e65e85c19fde95830a8bf6dda429002e652b6da5a2a63fe5b091ce3b SHA512 ba5df34ad8b6eb134e9f814e3888b90f28dea30cd3302ceb8921339b8d51f01e71ba93e49a86ea800a27deea7b2480605fc667f9c035e0407d584f95c86616fb WHIRLPOOL 5b1cb6dad7b696433a7b223f46069be5aa38da8e9156fb86b17e324cbdc0dbcb73721b7300004b6b49f485b77e24bd49f08e7fe95c23ccb7a06c7e580c857f50
+DIST firefox-38.1.1esr-bn-IN.xpi 527927 SHA256 a2afcc3822b0e0c7788d18361132fa23747a4da64a3b6285d2ac12d2a03d68ee SHA512 760ae04352d3ad0c35b25f4a8cc5b5fa1a2e2c3aad273fa6655c9a17d5e06bd02d4607bc54baba988d7277605bd263c27100066af79ecf6b692a4390ed1971d1 WHIRLPOOL 90d192b3486431f3831c83b11fc85ddbd2393eeb5cc540da6334d0276946fbb49c988812b02ab6f70eea7f744b36ebe76c410f76aa64510415f119d5bb68ef51
+DIST firefox-38.1.1esr-br.xpi 441960 SHA256 993bfcd305c7edc8f77798dc7d3ede5f1de882745dd24c157e3eea80d01ec63c SHA512 a2c3ca7393de8cbe12fe3db6900a078f219cadbabee3457495ccefc7d59e78d0e923313fd76ddea23aa0a17c65ab3743a61fa9f41ee14a06dbeee78ba9cae6ea WHIRLPOOL 44c402ed42a3fa41f186d98fcf54b4067c3b509e9c8c0fe8158badf8890d788333ae4552cb611cb0e7f5e58015d3470e4ba313315002644e043b1714d4f5eb5c
+DIST firefox-38.1.1esr-bs.xpi 485304 SHA256 fe9da450d69b1e74c62abbda7dda9a4b7a96d97f2508c67144a854dc13295c85 SHA512 3183cc0afa5d5459b546db92dd3ba5753e4a566917dd18df93e871a2b51f9b15542078bf812659f456cb10c266a84d910445d7e43647f67f193d576700e2d62d WHIRLPOOL 174e767fca89aab22f742d0dd5f8b684f963a35ee28978f62bce1ac43034e152058265fb6cdb347b47823e72ae77b4e48d315ea6ecb106b6e905c9172193d433
+DIST firefox-38.1.1esr-ca.xpi 458091 SHA256 1764219a298d2aa099e2f0c22ee93c839d00c17976bb3b83d74a6b78aed68236 SHA512 ad36e220b583d67bc6da1467ecb6521da99aa1a2ce8907944e5a280540c897cdbd1cf313fc262dd8b8974cc59b56f3ae352bb1d52dd33538dcb4fe7e8c54fe82 WHIRLPOOL d5dde5e9d7cd652cee6d28c6f6f62a315d57ade546f5ff51bb1963533e733d9b4d84be6dace15da03ac83511ee4622beee62f6d8a78aa315e30d44c38e9df6ac
+DIST firefox-38.1.1esr-cs.xpi 446725 SHA256 0d8be64c91b340eeb1d5ac6b7328f9a9855c1395c294013757cf563b97302a6c SHA512 bc7d41c06e2acb1c131ef5614fa2f57cef58ce6753ea472dd929f315d5c8295582772b9a9d1a4bbf5626d3a6913291a907429bfe8b3ab24565cda55fd54d95fc WHIRLPOOL da92ccbb4390a6dea3972dabbe3ea9ef72c1b67227ae208c7aa66ea095a578fb0eeffeabccd54efcb9ffc9e8e87d0100fb51cac21fb15b5b19958da62dd24dd6
+DIST firefox-38.1.1esr-cy.xpi 444385 SHA256 b11ea25e7fb7d1b3cede8e4682f3e95bb1b63f3c56ff2a07fc67455750be03e5 SHA512 e8898212aab3fba6543f24f6223facadcfb0312913818469e6d150918689fa681d2babeafb8e75f003c23ddc890078c2d978ada700a4424c091056e4da16cefb WHIRLPOOL c42accc06e7d772de0e0cae98e23f3c3cc9e0b5db82bd70d4d01172c90e40b5b2a34ee8966b82ac752607c3495422fb49f8ce2fba0bb3823f4cfd33292bba096
+DIST firefox-38.1.1esr-da.xpi 450760 SHA256 3bd7e0f29976ad3ea860f66e50e2cb37c1a17cb471a1274c22ee088d69d90e44 SHA512 32c6097a1260ed454f79922af4e9eb1306e2e8c562ebbd999240b35c1dc00849798473ebb64e4f9783d6c54eafea997f09c4567dca10a891bca2ced509e4d082 WHIRLPOOL 7fab9f37c372d08075602e3d558f9bb64b35dd0f979971158d086b97e686982d97bfb41f7b91c6d6bb2c8b9273bd96fe7dc3be961e4d70f14266fe5a37abd291
+DIST firefox-38.1.1esr-de.xpi 451628 SHA256 f6f7167cae9833802659c9aeb7ad497891a4739a19421adde159b1b1ad8a5b4a SHA512 03ec2dc9736f1430b89cde682a8e335e3fe577d8f5a0dc3052e595be68ad754898b90f1f9d25e96533880166520edab62d7905e734935e9551b4c09ba292b525 WHIRLPOOL f013eec5187edd28dec58efc224f53460209d36dfbfaf3ef408b45e07a84f2be5ab5a1468c90b30f9e0a36e4174d215338b80d8e3c2e16dc7b873bcb75cd538b
+DIST firefox-38.1.1esr-el.xpi 498370 SHA256 2fbcf81cbea4068518b46d9913fd51e28af238efddc335b740b212db0fbd0fdf SHA512 db17c6c9e091ee47594b89367a1a12bb0f4c06dbd372cd9509dc7ad139335e9110414b4c83b5f95b2aa443029b88ae3b800698dee4b5755efe91f032e5a69d17 WHIRLPOOL 72f2ec25279f234a7e7e491d7799b562a0ce8001dd7c6f8b3a07c51110551d3c5fb981e241c975aba1a901ebd6e65a965393dbd36f4fb986032c859c662fd843
+DIST firefox-38.1.1esr-en-GB.xpi 437845 SHA256 41165409bc4fd0f022bd1c2d153fe4de8c84b6d708ab865fdcb24b7d0ae95305 SHA512 31b1c874fc962f448dffc48e3b9c40dc16fae14245a9e5e497e71f6f56b8cf29f5c6dfb0d9865b111a10970d024a50821be8d1171c68f83570c43987c787dc4b WHIRLPOOL ef64ec18a970908fb40843b36471bdf5cbdff99a5c779c397927c9f1342d42d34907893662a95b0abe947424dae8acb4b397378df856ea56c043e0f812894875
+DIST firefox-38.1.1esr-en-ZA.xpi 439926 SHA256 bf793084f6e96b86d2d74e6b18c5ccc71b4ea66f289fffb192ea12a7dd796c30 SHA512 7bff53bf0d4018fcd20f96c89961f4144d1281f8154029ebd5e7fe41deb8b7e4e6e538159e71d3bbbb3f9294e459d1bfd14ced5124b3218e95f1fbc338a24aea WHIRLPOOL fe59dd422f0c899c5082ea1953927bf0c30d80d3fa3fd6a8b207e868f3594fd716519fb2e71ba49a50cec1db8d71ef168156c0b683cbe6f0b52ceabda27ab135
+DIST firefox-38.1.1esr-eo.xpi 488371 SHA256 1557a694592c211961ec5a4fa7b64fa6c7ebc014e0a5591006d29595bd5d32bc SHA512 855f8c6a12e16bf1abed816480e1f955a0a7a2e678f5498f8c3de1d68d10cc35fd9ad89b248d143e6d4d3c3f29c4f95ede473e71f7d4ed68161bf9418dfaa6d7 WHIRLPOOL 070708949b1cbe6e6c564e7a27b51511a7fe2b59a15ef7452cf600e2602a4f448851944ae4e288e32aee2ee20f6cde4ab90c5b427dfb1c022a894c053b0469c9
+DIST firefox-38.1.1esr-es-AR.xpi 453983 SHA256 97cf32673b28c28bae69fae4e179a7d497dee2a817a3f14a613f5da83b7f3ba4 SHA512 154d0a176a92571de01f6c94db82df7eddc9149b69d3b5b02457a8d43ca24aed093140f1854694f279def4def33fc54bfe364e7c5035f26bc5c536fefc946ea4 WHIRLPOOL d9a5c3b7adf40024ae71c6eff27e27fbf9ddd9d6278c8656b9c9e04c0a239067e13ba9fcf20cab104f935ad0423cb54ef598957a96c94d47adefd6fa549ecc16
+DIST firefox-38.1.1esr-es-CL.xpi 384679 SHA256 7c65a4fb1a285554d05b481d6380f0fd3a6659a9c4d38eff92717fc9b8943955 SHA512 dd680e47ca86d2daa4b4c748fe1c3b94cecc499edc1012fed5a99203ce727a2b77090130b698e3addf5a87f943e94e99b249b66200fdada4d439e53bd13213b0 WHIRLPOOL bbc5dc6d31e78f81eba593e0a040b87212f9dcb2c3ac10d75e98140685d375b145efe21bd58af7e4a1d6e2de43940ec9fd40540acf53a173ef1be6486c11d763
+DIST firefox-38.1.1esr-es-ES.xpi 374073 SHA256 63d95bccd59b4eb8c87653e8e2129b215a1be7780830e926eab2f058d5fd1ed3 SHA512 d3056795435ba787f59e276d1db12a25d18c2e3a28e585eae0ec179ebe2c18fc50177d3c3b7dd898e57b266676c384404aeded0d3ad3e645d09347662b4e9f84 WHIRLPOOL 6e1cade6edef11c334dfef38be4a280d9dcafc84f1dead6978e4fecc3b2fbb45ec7c2cbd97d007b5b5cf6d1ce08f7792b8009019a313b4a7d88c46b3aaa904bf
+DIST firefox-38.1.1esr-es-MX.xpi 457049 SHA256 4c2762d22289382daa818eb653c64b12144cf29fbbe8fd0a656b813c4451e924 SHA512 52cac95f138c374e6730857ae947c554015949200b3ec4674723092b55082f5be762368816a434679831f0262b10c46c96615195130a407df33a661158a5cea0 WHIRLPOOL 1d12d138f52c769c23ad180e326da40971afc9c5b895b04f9a9cb9d0b7b0a6ecb9267c0c55e2e9b71f68634aee4452772b284429721e3cf8eb7158848254c0f5
+DIST firefox-38.1.1esr-et.xpi 443228 SHA256 a183855018aee8338d88b09c362f057a3c97b679588f2d2f46dc1c21cb5a90ca SHA512 0f118dfca1df5a006ef0a2a8e0b0016a3795d6aaff7be319209a3a8e057c2d9962b33d5322c118a8c85c623a77434a036715abf8ad93c5ecb2fe4b464f7fd13c WHIRLPOOL 9e64b434a149697c737954c525586045cf593d251f07345244b7a15c24626247ed0074c100a9388ad3fea070ffa346ab050d1066045e1d2378cf8792637731dc
+DIST firefox-38.1.1esr-eu.xpi 466555 SHA256 ac45b7b36bbcc963f36cd547e5d2f6630a2b6a656de0f55c9d3685a5a429b487 SHA512 cd2948a921ee60610f13da3d7052ec06fc276daaf52ab1459838e104469b8b005dd58feccdc2c5443ea95c5f6a955f8f9aef7a237a4d715e5f73b1228b6f5846 WHIRLPOOL 285c605d00707250e46a4b32d801fbe1d4f65c1a0abd675679eb0695184d3de12e5f095ed8c5969b60d3138d514172c71565c5db4519fb1fac308be8f7edf029
+DIST firefox-38.1.1esr-fa.xpi 518281 SHA256 c30881ec0cd080c476504f72a2d25c73ea0a8189e136afa14da1be2fb866ac24 SHA512 182ea87ba4ea21faf1f06ff7ae8762a2030768e9e1a804aef5b93183a32c039294379833ffdd84a2abe8efbe050388660d53d584ed6a387dd5cd3f5879458ba7 WHIRLPOOL 01b9f159522830a59f8b23ce28a561ca55fe9b93e7a474174f400947d718aff3b658e83642a5b559e0d3225e6d5098d792169760555af536113796b33744f475
+DIST firefox-38.1.1esr-fi.xpi 444852 SHA256 2dea720abe29c4ed334b608c561e42b3cbeaeeee5d8011c168151bb3c004fe1a SHA512 e32e616b60edeea74e55e8df312d357a624f1fbead10e0a61f873300684d8b85b90e04f276784e817a8ea60a358cc3d49aed8d0b4fca0d8a8b6535b8093e8d05 WHIRLPOOL 78b37becd10e2135e5255603f2eb54bcf097ed33d398b8d692c25e240a81d2d128ecfc8f31c7f2929ad2b467bf55d6e43f3639813e75403eea2abf38e98cafea
+DIST firefox-38.1.1esr-fr.xpi 461402 SHA256 9a9f5f7f0084165fe3382cb8c6fc5169f69c5eb197df83745f2e10e7be1bfaeb SHA512 a49f53580e1a97d06ece5154e7bc557d833bece64387bf8892e556e2da08f5a403a6ef1f87fcc34a479ca37dfe1fd1caeebb18087ea3773a74a26d51907f4154 WHIRLPOOL 5c1249aadc2f7da23fa09933ce8221cca93f6f3b8daaf8ec1ea040a3647d1554e2caa982e847ebee4ee21499f85136838f4b192901e47058b6d7433ea333f52f
+DIST firefox-38.1.1esr-fy-NL.xpi 455541 SHA256 e69407fd3a290aabe02bd0f0915f34ff43891cf2867361116185471bd93e60c9 SHA512 07bc22f57874df49258fc36ab8674c07c9e73cde27b5ad9205c6d293b66b03b152ef9fd24cd2c7d7e23bea32e1a21b9b721752748b78e4b6ce0bd9d06e925729 WHIRLPOOL 657d7a31819515d0941949ffc1e5d768984e1638e62f6d00a909f2a68754ada7ae361ce1fde7f9d64bb72e88c5a7f63cf2cf3a6beccd61a729b74d39254cb8e1
+DIST firefox-38.1.1esr-ga-IE.xpi 469623 SHA256 c861845bcee5ed9943cd28467cd4a8e2f7936b56d58ffda76a153fbf1da59c4f SHA512 9605eafea1985b71ab7cc94705d8e5018cefe6af90a746af77f15f867916b3e1a79b09642aea89222b3cbf29170b459ad0d8e3516821925ef664c7c16bfdec63 WHIRLPOOL 655428e297701a6ae490ca0cd6f4de96272a97e232a8b5812b1e549e8a850faacb0aacc519bb146c7121f69ca1451a20128dfc3a685f44c0f00317e84d55f210
+DIST firefox-38.1.1esr-gd.xpi 454616 SHA256 7d60dc9805dee5cd25ceafaaace06df32be071aa60f8197f0f66442a27c27c91 SHA512 2057d20046d6d662bb5b492a7f360f0582f5d5e28be654712bce7e5b61a6e337c9839cf13018fe1ddb84405eb896f1b30412a8f97f4805142df7a5785a1a4ed9 WHIRLPOOL 844df6b44706031e370d36b926a1e75090eceb4cbfa4092e85c6739d5a8bad4d699644fc9759b15c2d5255589ccd0e8d4465bf085dcab01090009385f4adf369
+DIST firefox-38.1.1esr-gl.xpi 448923 SHA256 645117e59b6a0136b8c76c15e28bed3200a3d85e37e6d0855141e07ecc35facb SHA512 47c0bdf8ac6cf70ec5f91c7185854bbf9a2a4e66d0907f14adf681d7160851d65843c03935b152d4c6a51f93220a6af66e4713cbdfdb1c14d948233fbbc9b866 WHIRLPOOL 70d1c7115fb814ccc27276cb33b6e12d74759370276f745703e7f666e75aa71dcd74532516024460d579ea2028c823f0d76b26b52924e1fe7f0e081943ec1a58
+DIST firefox-38.1.1esr-gu-IN.xpi 477980 SHA256 752f4c459fa6d4012d9938c9acd56e93fbc6567cc91678c240de3c6dd2f41797 SHA512 57c1b3a106d0559309746b5c05204c281c7ecf00ff7b7e92b12731ba25ca611fd3fca45e515c50aa519967f1a051082e258ab46359d40bd8c61eaeeac74dc0a8 WHIRLPOOL 3bd367319bac67f00643f3e1f25f366976ff67f000abb333625535d33c5eed20c59da224545aaf0fbb15ad24ec0f53993480fe34029ee700503c812d96f3c551
+DIST firefox-38.1.1esr-he.xpi 486784 SHA256 d6a6f9268b1aa026278541a27b2a76d334f703f7b88ae3363096de6ab5917039 SHA512 17d88b455522a673e2a228bc9f4ef98813c7aa506c6aa6f3a20ad70efa891a5bac303e64ae480e7286bc51117ee772a46cb7c98c378b636763e5d9ab9374a448 WHIRLPOOL 5a4a76ab2699e6c127ee50ab67ed24b2247b948d7076fc9d382ca163e15b156619a8432f093cf2c7719b57bbebd4bfce3201b76827097733bffa7f2d2fc8e8c8
+DIST firefox-38.1.1esr-hi-IN.xpi 508166 SHA256 015a5391fc244bdfab858b84fc7865ca8c22838434c20d3bde66de9dc91fcfbd SHA512 1b2200b568e1b9c1a242b8d46bfd10b12d401332ba62a98ee369519c986c5076c0c811c744eda3a29ba83d263739d961c2df5afa30640062e0a07ede24bba3a8 WHIRLPOOL 33fe5f110d4eb90b0b9c1d61acc9a1b537b87e84ce0ae45f082ac8449268ca481aff574d35e8a9609b1c543fe427baf68856723adb4b02cd1a091522b108678c
+DIST firefox-38.1.1esr-hr.xpi 478271 SHA256 b846d40145446a7fce5f19565d06f4781e16b00f4fd7282589d4f91c2d8f6040 SHA512 c5c21fce4443a6713b90f68da0ffc9dad5d23c283accf222300ce6e21eaf97f66df1908fd33ed582915a9058ff3341709ba3ff978dcfb078390fbd6b730212d7 WHIRLPOOL 6beca695a22a0dc3e1448827ece599e12832624e71b58f40ce2f0fb96de315eef478dc976dd2b8ae6c9a4f1652eecf5424aa928c0b08f8fbcaad0e669da4bf98
+DIST firefox-38.1.1esr-hu.xpi 453554 SHA256 d1fb1b50d3c8432e5e584fa5c204841b10172f3513398deb6a9b182527e25ff4 SHA512 1bf3175875732493670231448e26913cfe0319529fc0d7f567afe8dc8ed0f0b8d08f005b2dd9098a06f0a068648800e71787ef0ca66e63eeb8bd9ce7ab10e72b WHIRLPOOL 0ad5fd5d52db8b6390409ac130d3b3b6198a746f5dac96ca754920317345191fcc5f7a7eb0c0049f1a6bab408a111256a4ca7dbf230f5fb6f0199ab792bec26c
+DIST firefox-38.1.1esr-hy-AM.xpi 534264 SHA256 10fbdfbab5c54d68a35a92accb9623d37aacfcaaac2b6373a7459598d4f563aa SHA512 c5115e9b4ca05577daa45b94c461c44a7441347fee47018bdf369e92e2af732dae4da1008b2242be09d3ce29708c71eb9605488efc8aaf048f0b53de6fca202d WHIRLPOOL cf515ccc9672c692428095c2f33afe9a4af11ca0b7b453925344e8da33442e49e025dfc018dd580378febfcad8ab17205b5c47263636b1b0622bdaf3bbaeba0d
+DIST firefox-38.1.1esr-id.xpi 431487 SHA256 4b998a744886c3c4d5db9048013b46227d4fb0cf8be62f9179052aaf79852041 SHA512 b4073a0653f9ed5758d9e2ad645ab4e3951e1d53b3ab91d7adfbc66997e1640f52c8a97a7df9f84ab22a534a6c45a57d8b7ea4835405913a3caa82966d419afc WHIRLPOOL f2d79b3a570d0f93e8ef9429a6efc863f750086c8b8a8a3a25ef4ffde525edcfaaaec0a12ff70566d6e8fa8197d7b1ff9f5a7ea01549988e6f6e8f4f88a2cbc7
+DIST firefox-38.1.1esr-is.xpi 485133 SHA256 48e0ca8182daebd4d8ac25e3cc17c4b3077ba3f644971eb0ddaf96813ccbca9f SHA512 3b730a4d47964fa65ad5192cd8a8ec26cdaf47efb4361a34b8bd8b97648d3745502c223df9018b20002dfb6db047fec77b86050c085c8a42a2dbb7b47260e817 WHIRLPOOL a68260b3b1da4a57844b5b89c66bde3ae5459f22b81b2432bafb5795d3da32e9569ea6ad1e1718d42ed20d9c2a8bb548997c148bbb6bb15ba89be70c0b934907
+DIST firefox-38.1.1esr-it.xpi 368409 SHA256 92b0fec73ed20e04902689e9e482572a07f3fe0c9fd928a22f39484e1e7cb6e8 SHA512 412a85b311d44c6208367352dd13addd924be64c66563e57b4edd99461eafa821c9a3721474b8f80ddc0b7fcd4eb3aa84693e09f42577f9d2396944bef1c9e53 WHIRLPOOL 22945b68fe2d2cc52cb453f31a600bbd398d65bbfdd5ff21d647724b492b2c29b8385b32576e2c4f0c40c0fe43212bc607c64dfe15d786025f498daa12855003
+DIST firefox-38.1.1esr-ja.xpi 479113 SHA256 cced69be8564c4f8f414f043dd965873bb93bf1693b59426fe558f9fa324112d SHA512 cd40b091c97dcc7d28b0046857ec30ccb10435190a12584e9e9c5a3ade48ddfdec769ce18295fef90d69f9c444e602418e3c5542f9a91ccb9b6a0205b18c29bb WHIRLPOOL 36d37e683e6c5a259a512db85ebe5972c79041ecb246da5111d03b3f81c3ed02c24d202786cc4cbfab0b5c78a184d02f3ca5e3047bcd73e394672efbd40066bb
+DIST firefox-38.1.1esr-kk.xpi 503568 SHA256 5ff478df19ef4d80cad295823b10d0ef58329a3648002f4022fc526823de302b SHA512 04551c50ca53ab94190f567dc4e32fe279585673bf4eab5e27566aa8d70520695fae8211c49ab9416450fff12e04707f23cadd13caeba33ffa2569cc5189d7b0 WHIRLPOOL 8cd70c3df39fb00ecd4e3187806eeb695cac11227fe777ebfe55ca2ab75d84d84d8ccea1988e3ee91a434569cc5cc59d3c4f3e66456d06f973315b9cc06635f4
+DIST firefox-38.1.1esr-kn.xpi 533464 SHA256 d7fdb3ee98b22df22c3ceb9de1fe604941697a8e7e43e376716b89678d47739d SHA512 e11fc1b22f4fabcf9e8ed8688f9f4a8039f22c7ceefd73a109fb46741ad6b92d2ebd51abb6a64be48412b56daa7d31b98cea223471dce239f4a02e0b9f430903 WHIRLPOOL c1fdf64f6ff4bc1fca8451e06e5886a2b6485ec42949480784f0dcc0fc343b600f73948684876144d3ab1bf11f0a8d415d9d85f0188128c299445a543f515c53
+DIST firefox-38.1.1esr-ko.xpi 460854 SHA256 819013f9d3546e79ed3f58f1ab3278fa0c366a49ad4171df83f370b2fc993bf0 SHA512 e232a874fdfbb287a983d98c625f472098624a691f17a047bc6f1d68e9bad72fb64c2ce501773da17d383ce67bf24365c254878f8bc126c56834abc1a73f6b85 WHIRLPOOL 1fdb89711e19bfdffdf92cdaf918907e803c1d6ae0be0fe35c978398548a178af18f7e5562689a0052372adbeb8c0aa657a98bae5065cf5cb34b558fc70c6850
+DIST firefox-38.1.1esr-lt.xpi 486452 SHA256 feed6b48a25a162c7afafdd31edd4244ff41c102a329c36d4eb41037376adbcd SHA512 9874cbd5a77633802277d92db7e010f353de2fcb705573dd573d5528476f1569938a0b3b40d51f68250e227917ff3294241b6784f18c41adbf8db4f08c2cfe6e WHIRLPOOL 4986b1f5a3c7a631f8c277f43220623e6a2c2caef1a490602d952cb380ca0550fb8c8a15dd3afa43e62bf66b81d2419bb0d5d8616eb3514b1b00767c840a8ca9
+DIST firefox-38.1.1esr-lv.xpi 467197 SHA256 1f3ea3b9bdfcf5d8973dbc181082d161cf514f7dfb233ea1b7d634aefc7c3a43 SHA512 b4b250be0e0daa647724f86e42d093c87c1267f96f66349b72f3868d82d1ad4abe114908cd7f0620e51ce0a993a9ffb4632e2237f9001c810f86eb28c9b4a496 WHIRLPOOL 026c805b03b0ed3c7b56f5b59af601d05bfd6d3ef96b121d7bfc8ac2cfbe438e7acfe894569f60a8165a5073d31950ee50f14c3e8f4f53579305e4dbcb10f2af
+DIST firefox-38.1.1esr-mai.xpi 514666 SHA256 8fe7ca64b2a301724bef804cce24b5b4108dc3f8c4714e2579ca1d31a1dfa327 SHA512 1ac5591a0b7b8ada4f24f461a52e27def9ba661291b8284024f7bacd6716aab1df72269e816f0ad53346543fb995f7ebc71a4476a2af362cf2fd0ba667709567 WHIRLPOOL e66497823d12f95d3ef11c4d9cd466fd4cbd945811d646effab10f1f211630b76b764dc7b3dda010ef5645d4492eaac6915ac973886550f5a6b994ca0faf3466
+DIST firefox-38.1.1esr-mk.xpi 529205 SHA256 fd736dd8c030e15f0cce86fa8c1b60403cf7a799a518e613c27fe2ed2a0ae6a1 SHA512 19c7f74cd4561fc043fd0bbe62ba8671d20dd16fbfc316ae25c61639b91469790488d75436f2b0124d0f8650409e333ad80b9bfb387846de885789314bad4a31 WHIRLPOOL ec1e520f336c70525a0db87f0ff065324ac46b72b3fb6e017d223d9bb60aa19671b475efa17bb18c57fc9f62ea3335ea53d66b7b589e7ea4e788a0c30c79ec5f
+DIST firefox-38.1.1esr-ml.xpi 528919 SHA256 8412349e51f6dc67af527931dab37e1e35b7218bd5274235a7d8b3b0cccd0b3e SHA512 c4ee3b617be34a4ca0c83615eb531034e3fa7b7159f19f52c982a72bcb527501df7e22289ad3f5bd360a0e23c03925661e12d5d6ad571a750f81ac2c7c128ebb WHIRLPOOL 9128275f94c971bdad0c60c08d6a89ef25a40ca9c54e1875518a7d598accc7692bcd99f98347bdd65fe34ec49da5ed9595eae444e6fadd1c25c3c8c59d7797e1
+DIST firefox-38.1.1esr-mr.xpi 505961 SHA256 95b96d1fda3c0a4079d30b58621a57b81815c7d26a4628ad1f8e32d46070aa28 SHA512 e5838ef2276d6ed0aaf596742e4a97fe39239bdf8911c7d108a928132a2d11fffa6034a100ae387e40b4ac24dcdbd50b1eb338071da658e65c0ff4154a5bb9b3 WHIRLPOOL dc4ddd3bf87dd2eea0c2575c8347c6df6829709b437393eddfcee42752c53606a3840560e26b1e82ead2f8d70c7263b702f8df7a8898f6f3d4a5051225e4f6f7
+DIST firefox-38.1.1esr-nb-NO.xpi 444176 SHA256 f0e583e053e3fd8a622ffde4837c74ae429ded8db4697f87b1484bb4b6da0f1f SHA512 c7e0399c0a2f83840e3d18dd87cf11db9dcc75d3299b83419b7843ea41659bb53f8eda114aa82ea53aa4adc488309e2f324af98d84bb004d5da6ccad7bebbf8e WHIRLPOOL 0ef3e9b55846c8de0968ce852ef3f790717e41795aa7572c76392f278437f8828d6388a38d6d313dc44d9a4c5938548a6929c9ee591bbcdd802c057fe2e94203
+DIST firefox-38.1.1esr-nl.xpi 443995 SHA256 c0ef5921a56295b3335fed929a625d9015bec27dda2bf404eea3f74487d49f2e SHA512 3b6aa126a0cc18543fb54b8cd11e15cad6c0a31a7e70e8d6b58543169b6ce16cceab061eb317dc49dd42a893a0bc0da3de68404183fa5d71118972916f4bfef1 WHIRLPOOL a54ab8f2264047df929c92488bc6ba1ec97fbeb59fbc7e0f6671bd06dfebd09ff861b37382e56f1d1bf22228ab76713ee1f6b36a653d2614849868b0a9da8d0f
+DIST firefox-38.1.1esr-nn-NO.xpi 438452 SHA256 280a4c0ca9c76569fd6464cd89e4d82065db9b3f997b59a3c6831773076050cb SHA512 24d29f1a294faf2640d313b21360e85697755123b6f7984a2e5823a3b705825446c6ae1af91d9bf512dd793c952eb12e64924905a883c49da3d6c66520ffbbe7 WHIRLPOOL 39e134ce171df1a030ef974f07424a307d8e7e1c34ce6ae7643d2d7f480987b9cb4ada6e7337447d51559273cd68094522d4287568db81cd431d7dc5620fe1f8
+DIST firefox-38.1.1esr-or.xpi 527050 SHA256 ddbe8ec30164642bc93e420d31680e493834203b995ce9bf0b19662d8ac69380 SHA512 c4e149a9ffb339187456add9d75176de52d1e883abf7d212502b6ca2d9a82392a757d0dd976328bba3aced37c88750d921a4117ac55d970e13ad123d3a3fe539 WHIRLPOOL 89a9a8e3fe7b7a542536405dc696774a4e2fd3cad23de59e99e97a9f391237ace56eacf42b9aa3710ed5472527f8e47dbbc906912634c682ce8f348247b3b4b3
+DIST firefox-38.1.1esr-pa-IN.xpi 493722 SHA256 cc335a7077cd3a98867e56c85f5febac507ee2cb3575b6f3445d52689840cbb6 SHA512 76d39b0e370a7dcdf4bfc094072fb937235eed3b68fc3b6bbc590ab9daee4c481b16b012e89f6bacddeda1a1b7c86862474aaf8f05c7e2ccf4a97a7d10c7e35e WHIRLPOOL 3604d59eba0cd0781427dce8572de75fe94455b494ea512b66765cbe3456a363ad183042bf8c50d4ad196390d6d63dce59ce5c837249cd336210d160dd8abf28
+DIST firefox-38.1.1esr-pl.xpi 406567 SHA256 0f4e1a4bf56d01bb1598255c24acd2d898e94cdf91648b35bbe9bcc8afbeaf00 SHA512 3ea2c8173e90d0b418986518074fa26532008ca02385809b9eb6f14f29bad7c1af8250f5d5aaab55f76a08d153d82ef8f31076fafdee0809ab8eaeccd887463c WHIRLPOOL 8ccfee7b3ee36796288bea1c95d2a134d144b7c460426b928951fb4cb6c0682d363c4282018af450455b9874dab9b45f06cbbe4f8cf86fd4d7648c65fa072e29
+DIST firefox-38.1.1esr-pt-BR.xpi 459811 SHA256 b289ab743333a903cc8de70fbcda7e14a009b6bed977c7cd22b5d74c9b46ebac SHA512 7aeeaab86a4bc2fec501bcf94e0200935afc7aa24e372ed0f36070b5959087b906b3341e01a7cdebc572f0793b4c298c85cc87f46c5b4bd6bb74e6138bc845a4 WHIRLPOOL d3201131e01e15950e399dbd042f3f9137f0aeea0ea6ce95901f09b62132e77be616709e384cd61937046926306a8c7bbee4fb117bc706b4626c63201427edd9
+DIST firefox-38.1.1esr-pt-PT.xpi 439976 SHA256 b99a95f3e38a3b8294b7882de94e1d7bf9c4b3829ebd45f35e14398db9f1b651 SHA512 2ba544ec2b781e97019bcb3a94b6017ed147ed1ecde9084838c9eb4710467c786d0de98debc782e5d663e2d043da234415e1b95fdeadceaf152df57b21810eed WHIRLPOOL 7535adda14c08088005a8c15c480c171f8b2ba1a70e524489870410b5585b3dcf3f967e99adaf4d23942a5c32620a0e63c0f3e1f381047e2b6ba82b1e6ff8cc2
+DIST firefox-38.1.1esr-rm.xpi 446287 SHA256 5cbe8179f22a52b45af4bce71bc005313c0f360c290ebfca2bd1ed64e3cd1adb SHA512 cc864d8933ad6281ce5cdd2283ffd7cfd281938839775bddca920b80c33135f10fd0687f6cf71f4b8cfb60cf60d14a79c6f1e761e89501f9ecab80ed1627d437 WHIRLPOOL 2982e321a382df37423c556ffe7dbc7f5f5324377c83269890676c6ee68062bcf3abebdf3b81197db98cb433e10fc2334ae7d0bafb7b1f827343277b1b608c5d
+DIST firefox-38.1.1esr-ro.xpi 494079 SHA256 0b577790e1017fffffe882fe508e4bfbec31c987d253389fee8680809152af66 SHA512 b7307e521f1ad47f11a0873ef7cc020651305df92b78d912169cf697c0446895ba071fe1c06786fd68c94b14825da9a7b6e4d4084be8359996670683e3aa71fd WHIRLPOOL 2a0ec024033c1677559e1a04e31b8626d1c663663d4c3d768731ab3a089bea558f6f9167a163db536a3e19847ae266d86df363f6c8205773c29a5e01b585e1c7
+DIST firefox-38.1.1esr-ru.xpi 414419 SHA256 ea274d18ff2abbb20ebf82ff1d95ec4189c683876ea0ef6ab91ee358259e6722 SHA512 a7d80f413fb173946754ece0cae1e513a69d392d5e2c147bee0d11da0e4e9c434ad2bb5966b40b37f56c7b4b54837b92232a95f3e5a59b6278c4a3c0583032ff WHIRLPOOL f3c4fda93c756656cb0d01cbb3cff05027b22e9bf596073d297dc5f5826c6e60139730bbf1071c2db06d4d087ba7ad7c13ca6ea0161d4c51fd4076204e00f62b
+DIST firefox-38.1.1esr-si.xpi 537394 SHA256 10d32d20d93a282313dc4c0368c313567565eed68d3c98965b32cc034c3e1b3c SHA512 a7d4ee183f9c7a9710b735c27be8396bff7ca2445ecb24e004d85b33cba929b12564400044b9063ed669426902178dc3b8690485f3c67b9cd9aa3b1d1c684918 WHIRLPOOL f634a9a4494b12409f6cb69aeca05497e0f862d2d39285e1f085cd8f21bc265cf8b33a34ca20416aa1359d128ed2d732f752b667293ac8704bc5b3c9dd54d580
+DIST firefox-38.1.1esr-sk.xpi 469435 SHA256 11198b290c163734c5b0204fb89f31f7c725a415b539524b02bd9096a5ba20f7 SHA512 6dea0138f06b74a55ef6c1180fe51e45fa8fc957135b1d8aac6cdcfc76ef748aa1747204929bab86d65f5b0d5280dcfdedbcc471a6a559cbb6de819562dc2dd4 WHIRLPOOL 84a7801c876ecdea933dd7faee4df964d683d2c717cf43d8dfc5166e8860756b0853b30bf25f0ff1e346190861c08ee48c0b68d537c0b57ee82d39dcd1915a36
+DIST firefox-38.1.1esr-sl.xpi 441593 SHA256 39f985bf83aeaa405bb39c4352116ddb7a43cd65af03801bde9ca838e5651906 SHA512 cc64c31ebda3f47df3304fff831eb3910303b47df7e3f2b2938ca119c3660b2e83c59f4468da8718aa1639d7c723dfe9cf7c08ddf51cd3946d9dd2bdff239b48 WHIRLPOOL d32ecb84123f7862ec9ba7a294ad2a6c19c2562220d83f4846c31e8377ce2fa6b7dd64e666bdf7c0a038d8c75e7817fe4d5896abf6ba9dc20dc4fc47c07a4f39
+DIST firefox-38.1.1esr-son.xpi 449269 SHA256 82dfbb22ec9efe7a51c4938ae72a871e149efaf43b114336b454df9840969001 SHA512 087a3572fad877d918b42ccf2498c0286ed29b3f58f8ed692a6974763cd7fff9bed9a40c162702716974f5ce356a01e645359a17c7c08647cda4ebbc482cfad9 WHIRLPOOL c712869ac3532a6194bb34697b638e123eaa92469fc007a66680e0899ba36d56532ba421d7f27837394c4f3b2951148db4374a92ce910f7d6d96799a341bc033
+DIST firefox-38.1.1esr-sq.xpi 486076 SHA256 e4fb8f2bb6bbec7d3f578adca74ebe450f8d4ea548be38a53efee439cb05fba0 SHA512 d7c6c0bfc1ae5b909fa0b0f8e32132ec16414923cb5ecb6bac71faa4694eb23eb4f5adcc2a426d0f930f0ea312e97c62f15e0db16d1f7ff71dff2bb31eeae41d WHIRLPOOL 658266ad8f806656c00e80d90ef1185c67944cd3a5a5ee79a2148729df634b23cfc924823a9c69b57d9c57f26b5b222a32348f4fcbe76e33d45ab9fade7a8422
+DIST firefox-38.1.1esr-sr.xpi 479420 SHA256 794e7da155795b108a17e8ad7519e8df67759286be0ea14314bec0fbf5970d86 SHA512 7791bb40a44d5e954347d59e9b0c9011c2dfcad5e4a6ff53fae898616bbd93577e5e739d0c20876055f44628869fecbe8c8b574de1e45a1fa4d4c316df9d6193 WHIRLPOOL 2d2372b1f20fed84b41020219672006d44b634930fbcd91fb51a60a8ba6485129cf74b29aea9cd451fb3e00dde1a6b4ec2ecffd2fe562912b818e76565a130cf
+DIST firefox-38.1.1esr-sv-SE.xpi 452631 SHA256 f888565097ba821bebaa57dde18f25a174b884e963697625c9ecc6b9809c8b43 SHA512 41b0412f15c6d53ad5244d7e8afcb54356da60cd20f4e30e51f0a36e4304d3030efba4b20ce9df81506bcb40c091d9fca513a8e5616befa657947c3258e4b7a6 WHIRLPOOL 0fb0791902b673f04e6c936f5959a60dddfcc856fc15f8a66a80f61e5c6c7be682f9444f6496cfd36899a9384c6ecffc8b71e4ab5aaa22e947d2431f58647ae3
+DIST firefox-38.1.1esr-ta.xpi 506606 SHA256 eeb5f1fcb6cd31d5638737e06437fd3102c0830c90aa5489247ea014fbd8b373 SHA512 175f5ca572ce1a84a85e1b8b174572edf4e32f828f2974cf99c57a17bd5fba2c9a6a06ae1d2e914520990fc63a5f5c5d41cb6b48a07825ed5541d4b4bbe982fd WHIRLPOOL 400ea2a7bb96adc27b34d0d1c0d9a23adfb21468d9d768632e34faff1cdfb3a3ab832b9516445d911ae277eade253c1cce6a5098f3dd6458a6bf00f76e915468
+DIST firefox-38.1.1esr-te.xpi 526250 SHA256 843a2f108a3aaf3bec7fcbc3c2bab10223cc39de727c7a9a005852a282bdcdc0 SHA512 3d9a77e3fddf05616062fba73e5e4056af69ba5d772275a057086201b8ee4b899bb46c7c85dc74b0612d41e5eecbc6286c636b628e2a8362f746933f4f76ec94 WHIRLPOOL d80515b21deccf40832b630cc70b688f3b77af3096d0bbc8ca07115ab8ca773078ef069af8270647b1779de2389a54c1ee1d76e15f7240d08e58b4353c3cf2ea
+DIST firefox-38.1.1esr-tr.xpi 481076 SHA256 d7e286b01413e77f4b888fbbe647e33bbfa4c8586288587610c0b0008fc1abd9 SHA512 13bf3aafcf5f052ef2969da09b04650c2a3bae36bd7bbca8802a6843f361af30eaa627f4443b3c882eca6140ab620ef5eb704987438624fc0407100f482c0bf8 WHIRLPOOL 4f054116b5c3f2412d2999724d2fa783fc6f0738959bb1646c20918d3c73d6ed6ba217c3a07ac6eb293afd189b29392b146345011c9905b9af1735a4dcebb3ca
+DIST firefox-38.1.1esr-uk.xpi 493314 SHA256 7f27073d4be9a509305c3ce9c38b36a202f89ae6caa6bce001b8c71c8781a208 SHA512 e19b0c2654c4fb157cca0b7a1bfad952bcbc6929130ca6e1f908fd710e8e240aa157e5cb7f9b2bc8d92fd10de5dc8454d334f2567cff92e62fb5b584a1ab2298 WHIRLPOOL 76a758c9398324e3baa0d3500b4585dc0c4507c4906ee2bf38d66f564c3e8a50a7ee78a02bd19533a439b4e7f021b1d8223cb0b84c92f212cee58004d16570c5
+DIST firefox-38.1.1esr-vi.xpi 467504 SHA256 5dbb33b24492c92913882a36ab14b4ddd4f66ab88a471e632b75d3401b2dc279 SHA512 1ebde2909795e52a83312de7a95d888848a9be5b27763993488277f9ebb4b8659c79b4c449faae23144522150cc4d817aae8732f56456bf7410041bfc8096564 WHIRLPOOL c7b0418a59dd3558dc378fe758913baed566de7eb3b9e73ff78428597451385a56db0e178c62c3fb45a1cc8186f9fee40653749e997ec1e75c0eafcf0e9ec9b7
+DIST firefox-38.1.1esr-zh-CN.xpi 488276 SHA256 7991a882bc8c6f32a7b17ae73f5f9f277ce4721142f43d368635983b94f1af37 SHA512 84e730a41ebccfa506ecedf34ab9178e8f06009ada1df66a416185b37fa95219eb30c4ae1ec5775c2463bec0a54a742e24897bfd1910e1d0b26290f19f482381 WHIRLPOOL c58a0f96c84deef6f0d8cbf67ab5ad4a385024eb1b54aaaf6e94ef2aa250b052141f7e2c5f9b3d355df7c04003861f15449125c4d1a9dc974905484a0da76344
+DIST firefox-38.1.1esr-zh-TW.xpi 467845 SHA256 6cd567d3f080113d38653fc35989ec90023d4a2a55ad383fa1884a32f5322cbf SHA512 e2cd554031764be878913df4f69d7b5a27133abbc1f9aea6e5ce16c67090c96de29ab40d2b0c7af962295c467e2377b3ce8d0e42b37b6f6b8b6a774ac9340392 WHIRLPOOL 385f8e4a6cd49c07638622c767810e668154095e03ddd4041251ef15ecd81b337875386ceb4b05a77412a8b2809e02b8a500aaee5b8e5e28d6472c40e8478765
+DIST firefox-39.0.3-af.xpi 487312 SHA256 636f1008419cdec31803ffec6e4ed1c9b9e5a9f9685b81b0677925284dc0698b SHA512 47351bedde233853b5c3986345de032cb427efb3e25ac0affa491e7b6f21e2a656b6b7583e66752c888e4b4b072b2611f9e9b323b2bce127c949468cebbb5d91 WHIRLPOOL 944b74535bcf88f522a570b3959f840c50acb491ebaca2d5de2b1ab2a86b2ec6b0425585c69ddd00c1f38f3303477759e006205a3051464b9566e0ae798e726e
+DIST firefox-39.0.3-ar.xpi 520324 SHA256 691dc042d849f7191cefd699917983a7f1863afc442f536be8362c0bf7d1ef3a SHA512 0a46c57f77fba374d5b6f965e15d655f4f8677b58afda43fcfe17c44798980a98cd26ca70f5d2daf941c045a065c13888c31687300ed25bf721b345bf2d96ef4 WHIRLPOOL ce6ad287b224cada893d8386b65d9cf7ea151b03ca01501c00382b7401a39dddee5eca5034c3d1742836876bcc1598331362052648f1ebbb720b29237c91873d
+DIST firefox-39.0.3-as.xpi 514545 SHA256 af15e715944304d55854057f28993cda96041576e7a1fb973baeaefbfc969b4d SHA512 d27b7ea53d38ee2e14bf3c02af155f23a5fe1b8b5c17f6d0489bc161b6aafb6c3c7b1787400a471a62fd5ebe9369c717a51d95f0235830e61d19169b6dab1fb0 WHIRLPOOL eb3de4206100f67f3979bd48b73c75c22e484c7b08df6d776abe14344da4907cdd01aa46bd4ce21df4692aef1bab71bfac2299af6cfb59d4147e338461d83b1d
+DIST firefox-39.0.3-ast.xpi 387702 SHA256 56ce0c10165bd56c4b9c822ac32cf542374f7e2ee5680bf01f36fa47ae901f30 SHA512 2c0170dfb8661b26b7ff1046e907514f6276b311bfdd5765582f6b3c2c9ea6d70b0a83a8ddc69c61bca4de6cfef01a91829c29108b95e6b1cb6c4ea48ffd1b93 WHIRLPOOL 63a64a80a47d2c048d5cbeae4e4ff9b86f397886129dfcfad9880e7199cfb7d929a3bcfb45fbf1275dc8ffcaaff57fb692204d8c1d16168019a18d256dfb579d
+DIST firefox-39.0.3-be.xpi 445946 SHA256 d23f672dfc3a9a0378fd00ffdd9a9193c53aaeae204ec0d14eeb817885102d5c SHA512 eb25f7039820b85baf869514de579d0acf2cca007538db075d426e460524d4acc5b26ee66282148e9d83f642dbee0cebedc52c884e262856dc9fbaec88012316 WHIRLPOOL cd51a9dbf51e95af55334ed37e734777aa6710ca19200e5a93ecd18bc950cd4304750c176dcab59a5860a4d0340c15e69d2814144c4d5142920e8f385957d031
+DIST firefox-39.0.3-bg.xpi 491424 SHA256 c8d6e26c13e246c71c00ef0ebcf744a63b3a4bb9611fe3c53c34d30e693f8693 SHA512 37981a182f9c22139a8c49a568a085cb323ce697f7648f5ca0a1558d701daaa0f5bfb7840ace78f0d09d4111e831929188f2abbcdbeaabe12ac86ab9bc970a47 WHIRLPOOL 766c8a441fbba3b99869a4019a6d3e0c910aa5b8f8ba4e3af05b575d3dae02b5059f1d3216830f945ff5fbbfc86fac59eb602dee1ca0a66376547f13a7ebb9b5
+DIST firefox-39.0.3-bn-BD.xpi 533077 SHA256 db3672e6475312810288dcbc51fbdf3361018860df3d7dac49542d0610a95ab8 SHA512 ca1ddf3436e31b1e5bad9718129645e60004545429d94c17f4a8dc52e62814f2a439e2ac43e8e56d6c2fb0b7f2968d4bed2c1f367b03959cffd752d87d98e381 WHIRLPOOL a6e0e12f02deba084072c6559d6d49cd6d028a48f4ba51285f672f12c866d07a5f59f44b033fa6f7f98b0ecc4b022c39fcd0e12f44655fc61cb0dfc0e4471142
+DIST firefox-39.0.3-bn-IN.xpi 532549 SHA256 cf6936517ba55b60fdbf43ea8f58fdbce8715cc1d8b500ea27ac6113ec87d6b1 SHA512 dc0899a2fcc84553358d60129f9f1bd6d897ceb665e337601df2afb443d2ca7d7ff54a21381766a9afa743038e83a36d09ba5d9ec37361dd91ca74c45a586146 WHIRLPOOL 6aafc9363afc50547407d43d2adb8bc4d6e755b588478c79aa142b82763c31e314a0299d4fe10038681e820367624af280c4da4ae295ef1fae93c16385239a18
+DIST firefox-39.0.3-br.xpi 445831 SHA256 ac2901001369078d450ee705c38434056172c14dc4fda04916fc2fee03509c6a SHA512 060cffc2c6a0614739a4808e023d8a44cc10f981843964d4b65e511ebb4490ca24dd8203023037f23aa34ee0edc804afad70592fd095f44153ed88aa7d49e7e9 WHIRLPOOL 73abbf551d3147df21767f7782c2abc7a2cdcfc5c7a622ebf1536276eecc0a4c2417a1faf4f6edf698422c1b1159354c8fdbafa9f6b8624f54d3295b61bfa0c4
+DIST firefox-39.0.3-bs.xpi 489606 SHA256 a5a4392a8c052690075a8d20e06a3033e0ee3d4b084c7a0ae90c17e87a388fc9 SHA512 df8102fbc9c1370e96287cb16fb49e5c88f0e30999b7ce85a044334c26aa27448d0dafed857778d7e78f559e6d6e8fd11641f046750f8ebea0f7b67adff4e214 WHIRLPOOL d3cac4c1613650707490c22fe3bf98fe341a1b550d3f419dc2db69a5c53d9328862fb06f1dcd9aaa13dab84b9e0164a048d4aafa0a22a38f25f754cb9048356e
+DIST firefox-39.0.3-ca.xpi 461924 SHA256 d4cf411e44da8fd0fb5a9db07712314fa40e09b2994f616b79fe84208fb6a991 SHA512 394f708082d3e3d0a414967bb068414aeb2daf7d183c343a0525931ab6862e05c2e5f22b21764db59648897ecf3d50ae674bc28b73c222c4d044be77abfd1930 WHIRLPOOL 2f7f8987f4895a729660c689220e7df63e53bebba91b665d127de0fd051ac8227bb137d50e2f76bbe6efe781c1ab29ca6e52f65989fe3736109d613b9c719c18
+DIST firefox-39.0.3-cs.xpi 450725 SHA256 f8f7b1c132e523a07192f91d86522dc8b34de6741501ceb4c910dec81d86f4ea SHA512 a716d226a51fd61d0837701e729cae82240a1fc03b5ab523a67e8856ea8a4153e442fe705470bc38608b7981267276e120ef3ec068ffcfec3e5b9a424507cd3c WHIRLPOOL 5a1396538b67c7d4d23755c1098ff797b00ec66061b062feaaa1beef4423a6b96593cd54eb33c51fa6a97cca8d2bd3d835714f16a434ed0c33195660351c7cbf
+DIST firefox-39.0.3-cy.xpi 448066 SHA256 64512a5cc9ce05fe19060358ea91b4c783074d0e0c1f33d29a7f6c599c277289 SHA512 aae955f84bd33d66336d90f6184f27ef4b9f8c0452b300b81c64e998ee7d69bfe7b69a01b67d129d928e16dfc2fcbc1de1addaa50acf470a29e119cd3ed85756 WHIRLPOOL 1b18ec5011abf6ac6c33f88b10d28b1e3b98a16eb6dbbf3f98ce083221ea2a61bfce40ba695e4982149ba002717d706be3a1b34576ef9d53209a526897c70f0e
+DIST firefox-39.0.3-da.xpi 454612 SHA256 4efc40b632d0ddf144c4d42d7ab958328e75757ac41383d0d3bf8f25512f4b27 SHA512 fbb0116c54dc0300d25e4f264762c81eef86f98c033d14f5fe03c4832365b48546405252b91b4aafa353b88854b8176f35b48cdf8eb7529baff8c66f9ea1c332 WHIRLPOOL 6961e6a786cafb8c14762fe937ec1231e28423b163b3be69fac2f994d52a62d8084e6163f3964a81ae83a16ff9032abd8560f8f573671299b5e53a20d7414a7c
+DIST firefox-39.0.3-de.xpi 456191 SHA256 e697aba8556a16fb9b64becb68e6772dfd51066d5ad69408aa8e9954ac855091 SHA512 876b844cde645bb0316178d910b702431529be344b1884f17d48a303db3edc72a560f209d29a061138c2745a70d54d0253ec5afc3177932e6b7ef99ee89f79e4 WHIRLPOOL 8bda6e39ea14e8af92358b303d78c4d34afb4ddbf7e0f96b8fad33250114c286ae71f14fc68e0052613036b3ad2cefdb064b018ffd6ce7a6dbff4e2461536a31
+DIST firefox-39.0.3-el.xpi 502654 SHA256 cf02a24d08394acef9768e835f3d291ac8432aff80f8b3bb2f5bf9c0bbb9bca2 SHA512 d19d27db087ef8776b14a2bf941bcfef130ade60113d93da1d921411ead4b976a5615fc67210dca91dce5c5c62e4b660eee90273ec324f0f9cd3824d7c31fe30 WHIRLPOOL 567922813c0169a332be9b96d0505f6fc7c94f9a479313d10828db707088be533d319cbcc39b1defd9b7ce8d708f9d2311652ecbe5d399b255d6b7fbca7be336
+DIST firefox-39.0.3-en-GB.xpi 441233 SHA256 7cb4b871f10400cf3f7e4a919ae1ce0dba4b52a605f80cc7fca761998e0de86f SHA512 6ccbfaac2c274cba193d5b1e48bde49c43bdd545c88edd4859d201a38717654530c1f36f987bca4afac76531eebc37ad8bfdc2e139882226802d096710f86d21 WHIRLPOOL 41c2e8d586513522d971f4814c0e6e58ee70cc0e6ac81447da27d45ee6b215a6699f7683616522e28c7beaafdf40538125650fd6e0e29ee28f1e80ee5c3cb36c
+DIST firefox-39.0.3-en-ZA.xpi 444467 SHA256 16001f64b08f486608602f99b0ad848e34f873807caec707bbf370f7757e80d9 SHA512 a1fa2af0bb25b3e0d8d65e59e5c78ebed809b08e6a7749e550c557a0c0b9505c5783488597bf8079e44d6251c515d0cbb82379d2b69c194e49cf8bbf8ed55cfd WHIRLPOOL e9aa070156dd211b3decdc06a3532f20def620e3f7c0b6f30ccbdef1937242be2427d4cec1af8b4b65d67f060e0a1805d2db058aeb51e6fa7bf62a7fcdf36110
+DIST firefox-39.0.3-eo.xpi 489006 SHA256 818af2981521308baad0374c30e98f41ea0b78d0a1518fe28cc0f1ac2c5bb64c SHA512 2a604f5f2451bf0ddacd6dcece0e20ba1559e1a4ea5440370ca3b106abb2a13069bb81a15b3f0d4fe9634c0db89c0460e2a6504bfba632b37daf3ec004400001 WHIRLPOOL a79f00c14da7bd48795625e3bdb21b4f07b84571180879e39010525d6239503c8d80e7e343717cf52e8e093410b966835381d145a9050820602d0603d159df31
+DIST firefox-39.0.3-es-AR.xpi 457409 SHA256 705def4970aa771e07b79985aedf008df01ec3406539373d0a038485b98263bd SHA512 4bcd64d29545d0c3514b4ab98aa6e5f610ed8ca444192377b22ba24b2f6f8a4e7bea83584408151e7b278384df4bd5df540df2d52d1f2cde62a00638ccf138e1 WHIRLPOOL f26ae55685e957b538a22a62b242174b0b8bb9e1799add1cf73bc9d0fcc9b4a81781dd730f4b7e463aca8c97a9957de0f48e701cf0ae44017b22fa9ca193bf55
+DIST firefox-39.0.3-es-CL.xpi 386703 SHA256 156679aa6852979a39185d556d8722c0cbf2deb7024c21971be6c3f92a2cb60a SHA512 c291446b9596365b657ffa12871118ecfbf6f2f739ea7c146a95021e9a26ecb6cbd974ce49485e1cfdd8dfa3f014c1cdf21b2f1ae279b0da4facd5d01e7ed696 WHIRLPOOL 794e3baf325cd162b52fdf659fe110271b9d8fcd681ce65d51bb9505518a75580eb4c96ccb7befbc73f8a0488eca3d3bb08fe17ac1ece63569a75faf64e090b4
+DIST firefox-39.0.3-es-ES.xpi 376301 SHA256 d6071cf95e71cbcfc92da652b850ecb157b865de372ef3499f982bd75a72ba46 SHA512 d4fc71cc354e490a3818b91280802ae4f576a0821947cec4eef6833196c7ed29714c1f3888e014efd24154e5d04dc981b7f9a7fabad6bf1e06137a136c8648a1 WHIRLPOOL fbf82ed720f5359972262f547f08f426da8b0ce9118a6764d61166dc0b441c586a7be8c2db6e417ff4a677670d9497430cd4cfd8bb004cd6aab021fcacf241da
+DIST firefox-39.0.3-es-MX.xpi 462391 SHA256 dfce4840d66bd581d105e43f2909070449a49bf47e2c7aae823c8b65d726481a SHA512 0138c655196f06c358cf50a6270b469f12d71038ddc55f4d6ae8b412b45a52949d3365e9d2f68a64e856c86a1860578f1f1547525a4c6e707c58497c0ca0c7d0 WHIRLPOOL 56c9afd0d252257556825cd179c6be8ca9058dd907b533ca850ede81532ba32dbb010b55daab00adf308ef5f91ee6c0f0d886227efff722f6ef6c81ea0141240
+DIST firefox-39.0.3-et.xpi 446727 SHA256 e5d388645605030faf36ba69f4f305a58fcbc0ffb423ddcd50ddc639c4f13c0b SHA512 efda9812179b8d5421d486f3146c2a94698029cd75f14b8934f11936a05a68a2c2a86b48bc1c7d2d988a62beb6e608e9bb8d436b74699e1d8f795cbaa3924a43 WHIRLPOOL 26091de9347eeacf5b83f2bdb2bc7e09da5708ec6bc2ddb79e3ca79c5e1fd1008c7c2235d7b7c5ee104763493e07f253e1b9a69a74529342200267ba896d99e1
+DIST firefox-39.0.3-eu.xpi 470412 SHA256 8a2ff73d671eef1c8c7b4b6071bbbfa6b66de411dda3d332f8f69466c5596d47 SHA512 431efd3bc505028d8ad4d18bf0bc20a8402a3d3a28b6c11455e9dd0181ad13405a241960b1d3a80c2ff63aa818091965388562d2c83e29a30f537443040cc6c5 WHIRLPOOL 7ad171f5f8655466a1c147a7a8d52654eca03d9ba542e52521cadf7553cedd7aa8ee2ffafce9346b8271869d7e3f6d1876f7f436292419b3674c1af2eaff870b
+DIST firefox-39.0.3-fa.xpi 520580 SHA256 4cc0e0f00af90d4c00cc4cc4deecc0f51688fb9621befec012cf858b1e763527 SHA512 8f7b76f7b5783b567c23cd9ecdb791ead2ac00916e06d8805c45509bc169a876dc37db8aa958db3c79f4b5b1fc192dee1c64f1929407b879e4e1109822c9e92f WHIRLPOOL dd22550eec25c8efe120abdca151272c9a2440c4ac7a7561feacb66f9d02a2ee7c483e6165c8ced278478bb0042981fba040afda9ad5dda3ef0d5e37a1eb6449
+DIST firefox-39.0.3-fi.xpi 448586 SHA256 21b1d1a0bb4dc5acf1c9a7f84b2273987b0525f796afdb0b3ebf3956a102a842 SHA512 5917737ebee096b148bf1943019f720c1879a4355213074e1a08bcf47c0d368322b180edf37e04452274342d93a2ad820e28bcb822fce742b3aadd39abc1f126 WHIRLPOOL 0e65447cfc7f860be7fac734576f7f833b9f22ee76048ad473febe527cfae27c089eff55a553803facdce9a2b9c13787a84e874cd9e194c16300ae40e883b76e
+DIST firefox-39.0.3-fr.xpi 465589 SHA256 9e158cf27638bc89ab4758e427212ac1efd4b3c0758344db1630df4fc319315b SHA512 1fdb86ac3de96f7e3cef8221a12990d0d91a8bcf529bbffcf8fdb5b73d5a35e96adceb05b778dd696d6ee6b7c1f2a8cb80c193c4bb17524c44ce4180e998ad76 WHIRLPOOL 68d3f771f09013375689ab8119f0db3da4c72d89f85ae3fdc0d342407e1647affcdb97a63a036b6e5e5d552b6fb95788b688d35fd91c8765f5bc790ee3a3ea88
+DIST firefox-39.0.3-fy-NL.xpi 459615 SHA256 043039d1b2f6b8519d5e4751fbac53c6cb339a967bf87e465edb46a77fc71e69 SHA512 cb88a24e9020a84262adc115dc6a31fa9ff77d467a024ead59d0a8bf57eed80d1e32a0265214339b78f3b4c5552517786d6b51c92c711f7ee3f721f7e00722fa WHIRLPOOL 88f1800e508defcc4e286e4c5d432f0d8285b11ea2e53a4f20d38a78c05046cfbf260b43bb9561691e0b89b2eb18091fe4bb7993690a0f3b3b9cf9a63eb68495
+DIST firefox-39.0.3-ga-IE.xpi 473549 SHA256 ceff6d0261008a2ad29c73f7179825edda4965cef8e3b269304e21039ca3d06b SHA512 3b72939f00fcb352d2ff23a20e457e31de5f365efaa2e4b319b18f72cf03029402b5f4ef3aee7b4343e02210c8b0c0f230e05263cec085139770dc9a2ed4b744 WHIRLPOOL c22ee96eb43a613eeaf5378cfbb7445f77e40613c8f0ce1d3282f0a1e49239ffb10090a9234bd60b09b5ff8ef5d149d9fb07d77e7379845ffb62501537e2becd
+DIST firefox-39.0.3-gd.xpi 458523 SHA256 066b1cb207b66c8b7acd342f92bdd724aff9fe89a85263ef4ba58e499af20cca SHA512 a9fd206771293c4dfe02d784fc833d9b1cf627d6b479bed986237f2dc1d59008a16cadece6cba633a3fd30da0492c25e6fa6c9a116f7fdbaf4df6949a0695040 WHIRLPOOL 149cc5270e18bd3b30d34a61efb4aa46030714990385628596704d34b4c8f338703b384a18af578c454c75ea332372bcae9fb96b758d47a9c1ba824abce794d1
+DIST firefox-39.0.3-gl.xpi 453847 SHA256 d95d8201f7170f8d3147b1a576668d8d32d0eff5d79d78231e8ae45c323d8348 SHA512 7095d11f20481eaf84c71dabf5a2d54df5d994d04bfcbbe9ae6196b7fc042ca9da00787379f94b171fafa57620f8a8154f2b4baaa5489a588f2b244c0f2c83e9 WHIRLPOOL 1659edb457f135eee76e18a035e8047ca079aa893c8e9ff5eacc4861428feff69f625414b2e28ce884410e03c3a00d2dc21e8a872a6bed1627b079177e7be258
+DIST firefox-39.0.3-gu-IN.xpi 482871 SHA256 9717f82837e53af7fb46881237cf5f549770fcdc18e72d095df5fcfffd6f03ea SHA512 8d6dc5a125443cda01965309df9a05a2126d88f8c93fe27803e81040319776dd81f3dd6cd923c343ba89eea76e47f8f27d13b42d19c9412d63bf798cdf4aa8db WHIRLPOOL 25704e231ec301e7d8693e24d0a37127bd3519fed2036839eb43499bcb36dcf4431d6ed6aa63c30e803ee0a4f6e6945b656e4450b5d117be49b45bea7537cf9c
+DIST firefox-39.0.3-he.xpi 486476 SHA256 140eba811957fdc4f487629cd747c6e3b8e787e337f371a5fd72d48994720968 SHA512 64bd1f0dd26646d1a55b1381363a5541044d7672f3a8976b11504d625df5f544098546bb8cd54a0b6c7e03484eb98b5e467c8461b934d508a6228c7dfa6f24ad WHIRLPOOL 64932103b39ec865d028220d1c7e3fb27882e7eb49ee32fae62b6a17fc9de593bed2bd0e15f971f6f47a2f2f9a649df4c4842fe0e33c06ab143a8a5ae391df3c
+DIST firefox-39.0.3-hi-IN.xpi 513452 SHA256 a9e4c7e773bd44fee252db5736585b77f39dfeefe3102bac062ac3d5ea7d29c6 SHA512 0983340a06b706ce357440c1422809d62c18afca25d14c20c7a3ae66a72137639e9d1029717b465a760d50a990b598b4a84e17d06c0f4d2ead44a4c9215f0367 WHIRLPOOL 9e3f5e861699aea4b4077f0b7c15377f9c7ba003efb97ca38145d7a2767d086ad9532139cc56025f3560113f28de765d6647137f5c0593fc225bec5bafe0d933
+DIST firefox-39.0.3-hr.xpi 482072 SHA256 c46bd88b7d0246d0579fbf815b5bf91519ee495d03725413da1f103bb66563c8 SHA512 05e0c2a1b6ba6ed47fbb0c20ef5492b1acca8ea724a42ac2ee22200cfe4b851297a32652ac6d93f3a193b967ca1daad20364379e095113de787114063d5fea83 WHIRLPOOL b3fedca192e4f8448eacdac18ef5d7e1fab5ce3c935f52c3e2c9de93be0640bf3274fca8fb3f6a4545b564147938d18464fb4ad98b1938f186fcfc94d399c03d
+DIST firefox-39.0.3-hu.xpi 457442 SHA256 8eae8d1f97a1e74ccd4c841c5a5402fa45dee34fa2caae1570264693fa377ff1 SHA512 759ede436cde44bf4a54a79fafb800be5ff264b607cd5ca32286b0111dde73b289a3b56bd966506f566ed583d1d42de5cd964a46b8cc6609a418c8ce17af2567 WHIRLPOOL cac4b4f59ed9c79b0265c7a25d0496251545c4a2dff753302566f0a7d0134ab996236deff91c91853a551ed78c4602784c5e4c5385de59085fc4c5a2966c0a39
+DIST firefox-39.0.3-hy-AM.xpi 538194 SHA256 4a34273d9893bd6a5bbf7f0ea3326cca4c051bec603db5b6dc3ac42f10a8f70f SHA512 f0364f6ed80c70a5c1db1062356a531bc5fa809a0c6fbfc6022a53d97664308682105c431a200268d3b7eed0e33b11b9433b3b9b2a6b1bb22903efce3fda9d15 WHIRLPOOL 1120c1919d983b0855c220aa66b64cacf488ccc55ebc49a83b5a8670aace10bc6988a83fda1c4086b050a777a5a68f389fffeb261e35333d1c4ed909208c8176
+DIST firefox-39.0.3-id.xpi 435241 SHA256 7b26dbb6360614d0c4e9cd37e771314a6e3f903cb39a6df5d291a330a1845481 SHA512 b425f2535a39cc6ab2f09928bd08cffa279e4e314844aa996e63da1e8164af80fa3ba9025183812a3cbf21d051463f19b44073c5a2b06289eb32227cc183359d WHIRLPOOL e8a13c63cc65b1d1346185f3d24eaaa8473c56609f0413bd148625c5832af96275ee5bec8aede94d24adb007054e6186e03778438f66d7fdd0f2344f07e385cb
+DIST firefox-39.0.3-is.xpi 488864 SHA256 f5a1a14dfaebdb4d8bede2acf9f9ee2a9182c30f51e8fd30ceaa852226e1585a SHA512 fd502151df9606f70d0e11e3d82af7fc7c1510480982084641ec08eaaa764f11221ea3c0b64a922c12ab0e01f13424e8ceb764a71761324e67fdf6f79d791b17 WHIRLPOOL 2920469d682e1cc8fd2a7cba092feb95067010ac37502058f4bb31d2adbed8d16247deeabb49a99fb0b25acb701bffdcccc8852cd3cc9eb736dae5caa3045797
+DIST firefox-39.0.3-it.xpi 370615 SHA256 1a78bfc2318aabee74440522dfd60f178ff06bd952424dd6e8e556f349083fc1 SHA512 e79aaea6c256469fd451585a5bdb03797d0ea8785101d2360abf5eae058a7328772e72d2fa1b33d51444d994eebf88be70f67326a989d480ec33b2ac481ec872 WHIRLPOOL eb811278232612f1e19322559abfb94a2b6bcdde83718d5d8ec4ae35f3da83c7a39ff860b667573f2723123d7283cab4210fe8afea7a9fbc26b20c5e2b760a2f
+DIST firefox-39.0.3-ja.xpi 483151 SHA256 c4e279fe7fb57c670e96d44f88fe48cdc94aaf95accf130faefcba5c3bebd7ec SHA512 8dbf2ccb249db22307781e645387f0c1ed6ec5b03bb790d41a092dd77e6bcab5c0d6168ff25d0d489f35d55c30f09685100573be9fb83544548064990cade694 WHIRLPOOL 0310785dbf478c3ce2905a3ef8ee83a1ad087e4622a173c7f7a9c0c10b96a23236644d72b30912f9b0adba25faf713d84e0e7cbd39c74889732c49477ec9ff0c
+DIST firefox-39.0.3-kk.xpi 507528 SHA256 38d76fc6d29dcbca7fbc5b91a23f79baa4710c9f7a4bbaa58e610270e701c5ce SHA512 e4bac413771e24c711866104969c3f794010bbf8327687cbc984a06512bfa302403284f0adb760a587dc8d4e058d6b03266696a108a4383de566dfdf6766258e WHIRLPOOL 16d0ebd182084c694ae5c9eea20f6cdb327ba9f37552be610e8602ad79c3e25b8125d875735c24ad8014303c4f6ce7e82444e0d9a3bb36a25ae56e83c4999bf0
+DIST firefox-39.0.3-kn.xpi 537656 SHA256 cfa3d9223c361ceafa02a865257e995dce26545b87e31dcd43d809fda123ef14 SHA512 a0b844288da56d6bfc187383e0040c39386092508d335e73902c2b8e449ff4af0638738b0d0d8a56cc7cf27e0876716816db632646348e689afb5d1e7cc7eaf4 WHIRLPOOL 8fee0e7eaf00d19b6a0864e7746890ee61d93a261715a08d59bec973641546544499e53b5609b6e05cf325aa3f9e4881a58c9669bed5f698218c08a242048082
+DIST firefox-39.0.3-ko.xpi 465015 SHA256 e3a7dd8b0243b48da1daa027ea49621ab38d7d0ccedc0f1495216c985e344298 SHA512 9abcc41967699951acdec6679c527226bbf8de27325b490c952a5c9510ffe0758953cb9e1b28e9d5ab893f5633060d37b420d525d9c4d8105af5e4185e0cd4cf WHIRLPOOL 572820618127b88a9c65fdf8ca2f1a2907c733b97d812d6c99304a6a6179dd96f0c160259129852d3de18399f7fdbbffc51716b956af280f1a30e83f9c090543
+DIST firefox-39.0.3-lt.xpi 490582 SHA256 3c26dc16f13b69cf6cc6d254472f33e6d496dd1b34a459cf7464c13a7953ba42 SHA512 69c78ed0ea74b0db76bd9df055ee04db5c7684e647a014b264d9b872bfd087b0752bae06c03beaa87903234057cc311d3888b668e311640dde0b4cda8506e4ef WHIRLPOOL da6c4de47548a676056840715ae2962dd88c655547082d859c5dffe666b8291b5400c1a1a60d76f1778d6e9ef943674cfde364dcda82e49f060f73ea519b5f80
+DIST firefox-39.0.3-lv.xpi 471167 SHA256 a20c29eaa45587c268744744f191c3c189fc2c802162d70fc433e9801ca684c1 SHA512 1f06bf99d47defaec80cca30365ef379a8bd0e4aefc6e679ad3d2dbdfb9ea530a0582cbefffe5ce9561dceb731aba5403b1fc189bc2f6ef16205d401dabfccc2 WHIRLPOOL 94ac7fbecf445844e170b048607ecfd8f8387a4a80d5703c4ea2926daa59c77a2c960375488f8de435672eda6ad933c1451fe9b7bcc10b7b0869b4c72ab6d5c7
+DIST firefox-39.0.3-mai.xpi 520124 SHA256 c8cbc057e1bf7af2fc48a378d271a5c3e840fbd98a249cd40ec5dea9b80e58b3 SHA512 430a7338d376408298ee1fcd538f45a740d97c8f1f0e5924c1b792c56bbcbb19094064a15f54e9519ccc4e8aabad1988752884b017a2c29f2b90238fc11fbf99 WHIRLPOOL d2287ba62f556cb41a25672f674de5c6915952fbe3ebafb78e6da488cdaa8eadc51c8ad3fc56dbf7318389d551829b85817c733148fa391127a866921167d341
+DIST firefox-39.0.3-mk.xpi 533584 SHA256 951cbf1c97e0f8b83037f997337c85bc18061ebfa99c24ba22cbf9b17954b6c8 SHA512 f4d914e8163b5ff994b0e149a6f72f3117f3f417936f72f958c3859184e5379204791ce2e851efc7546177ead9875176ea9f55fd03671261f01533b5fde3dd15 WHIRLPOOL 62486329a1fe61ada0eec5a6d6b94bc043c70bcb431f9184286dcfa86a5748f2e85f5a931579240542e09a89f06692e947e24a0fb3652035bd4039788173e4ef
+DIST firefox-39.0.3-ml.xpi 533594 SHA256 3dce61ed9f96b540c0294f0ce57f3d4bf95a1c357789cb89ae611b6f8568ed07 SHA512 af05ac8f669a2bb1014826466479db216f19c772fc6c78cb8897174001807810ffcdba53588466a50bd25eafc3cbadb56e8bc6b1e6e915a2d81db13d8948239a WHIRLPOOL 76b6494b564804749825701a1ca13d00f84fd345bdac18a840d3040e128b154f6c20ba2fca852eeeeda1e98b6d4fc4439caca12626ea8e73999d7a09a643c0cf
+DIST firefox-39.0.3-mr.xpi 510890 SHA256 0e6daabf0b522a98a5043fd448fdbe8686eec2c506e37c9ef42c5b09662f4c0b SHA512 2d504b81be9448bcaa360d960c7403c265c67ca9cd46927962c5c92ba54979645323564ca08beac7b51c115c302b2dd640e8024c4538d5d4916d88b9f6a88d6e WHIRLPOOL 3b75cea3d7d7d0f57b8954ea60090fe8fc7e9448f781ad21e2dbf7c792daa28febaf683863d4d3a705ced7a352aa239dfa01fc839cbe05e829a06febaf2d152b
+DIST firefox-39.0.3-nb-NO.xpi 447826 SHA256 db306e0a784d8892e53b32be5d24171e0bc9d93b9b0902e3ad0c8d15d32fce05 SHA512 4d8485bd05504ae84c5c9b83a21171ea13a9bd4813a1c7eb17ac2bff85a2b419ea24df4199f3eed619846cf985c536b78c8b38b85d581154645c5c4e39343b8a WHIRLPOOL 062c2060edce3ea0cd036433450465c1962cae119c3317f4df453f681afe104082fd49d71dc57718ff2da605e958e4bbf22190588290ff59cfd0cbe4f9c8ebc8
+DIST firefox-39.0.3-nl.xpi 447541 SHA256 eb7c7fae899d51a4e65c170272de7127a24366926d8bf5e42fb0ea4db92f72cb SHA512 e8b0fb55960f174531bfa3f11e1c011cac3dc02f094dc2dd115af8228dc34b1bcde44559c84d1d06b9c68520e189a73939c17b85ea8b5b30d47dc1fef5070107 WHIRLPOOL 4015c2f2315e905f5bfbdbc2e1a04c266a2fbd15960480fdb5aeb8ef62708b13e3787ab5e8b954472452bef30ebe35b192b80d656ec57a5f2bd68aec1a3f4bbd
+DIST firefox-39.0.3-nn-NO.xpi 442078 SHA256 cd4cb5e85413d2985b2612f2a537e9caf97cfdde81ee55b8e8f07d7be5332edf SHA512 0ee127f79d30b847dae74ff6210fc22cb18b7c476aa58a97c051a5c22d878d8175ef8b3bd2527b322af9ea1948453a7849c56ca20cabbc46ac3c89d45953d328 WHIRLPOOL 8dc65628a9e55f8ef03e00facd2617f70e9c7f18faba63e7d10d393aae861f8ac7f6617cbf524c908ed537eb06d168fee1bbb461ff4bbf2fb3b43d4e5116405d
+DIST firefox-39.0.3-or.xpi 532006 SHA256 81116e4d849abbd6c48ee2549e21d362bf58d2f42f51ed52755ce6ffc57db2fa SHA512 347757157886c6c3127b9c14ea797bb353de47adde32444508c97d741bf48a4244ae285f06f2e870231c8b5882e43a052b8350ec4f4c825c16dad831ae8197ae WHIRLPOOL 6da7f2803d1cfd9365d904161469cc8918b8294522e88f6e77ac4a10f6422051bbeaea05757021044b67b1139be683464b1c80a037aecc37cd70fcc6452e1022
+DIST firefox-39.0.3-pa-IN.xpi 497421 SHA256 a31deb9194383d9020028e1bedd3eb8eaa51c1ffbd184489d6dc726247002695 SHA512 5cf1e49ffeecca1fdcfc45d50205e0bcee730281d3f8fa91eb4f85af4f04aef224245d20ea21dd5292130e5a4d8362c3cb64cba2b4d46e20739a4e270671842a WHIRLPOOL ccd763ece2c7b8e55750f57684cf6dc2c5e80fd1b9ea723d4f2103aaeb70182b2a6bd4f4118b35df2bee8d216d52cf062c6b0986b5832206629af2b75648ca06
+DIST firefox-39.0.3-pl.xpi 408065 SHA256 fbbdbda005b800683e63e495af2a2a81cdef7827da3090e648ebc52eac34c601 SHA512 55ac27bcb31a55987339c6fe4384c92b2bfaf871ccf4c5382ab44604d40ff556fc67898adc86b7c3e2462b969213b1fd65b12b0f7a7067171b48eb84ea53708b WHIRLPOOL 14728f1481e7147298b87f568d653640e8d799cbede26c80e037d1ccddf64b8c33eddac95d258aac6c26edf8e8b186a70fd8811e4fc42d0ccb02c4a9a92d1fa3
+DIST firefox-39.0.3-pt-BR.xpi 463600 SHA256 00e7b5c788fa46c3fc8fa98666d67c971684efdfa957a1005fcced7e6059716e SHA512 964130adb994852e334dbc8bbd72ab661e7a93346e49ae943c106faaf6d6449d06980a61875b7516fb726ed1c9cc40bd22e8141e9bbb20ad9b4be543945f7690 WHIRLPOOL e8e722042c967f992db6d26377b690c83e4b8ea5b324494702e50a74cc38d9b145dd151ee2a446425595caf7e9355810535cd9d187bf42c1cc031dc85500a871
+DIST firefox-39.0.3-pt-PT.xpi 444722 SHA256 404a471d7b2b1f0437231100c84398a961b3849c4e1c880021a0ac943b3d0c45 SHA512 f606e8fa8aa19138a0a341c90e789b590bdcd7c10c2dfaac74c65e3a8706f4955a8137f78198348229c282ce54839a3b91ed10ae45e42ab74fdc651bed401a2e WHIRLPOOL 34ed05ff8351c0f8582a8ecf178b1dd2c93ca59442a58a05f46eece4072d909b43a9b15d394e65c428925d8c1db67859611cf53a187347e597fcaa1546ecf7ed
+DIST firefox-39.0.3-rm.xpi 449716 SHA256 7ef916a3c91539d4a30d6928bd1c78bc4748ab7d2fa35622c8a28db35fb62cc4 SHA512 b5d5086acc75837a6889d9066876056283656669c07e62280476bf633e53020e0ce0535144580258b8458856573dfcf6b3ced3ba5857b81586aa256aacde83c7 WHIRLPOOL 2f31f296467883721ab6fae8a40db3038d948f6eb6162598c206467a27ce41157603936fbc336c2e37fd5b77616d7839b39017c18cf779eb2d37b3f7869039f4
+DIST firefox-39.0.3-ro.xpi 497999 SHA256 994da0e3e34237b970a4c6865dd26c9ef5c67deaddf3de17b39b49fcb66466e9 SHA512 856eda6755152c7ff3a22c47bd9bd5a4d2ec08d4c72d78aea0b8d1ef64c8487420e5d555d3ac6203b03c2c87b411d4ada49d08f4f7dd4ceb402cacac7ffe64c5 WHIRLPOOL 252d8a2f0d2749879fc635e4b4c07cbc73bca2afdc17fba0114fbbd93f16475e0dedaa37f6e7610d91f7ebf4ff5f451ebbbb5e068c3d9070035baf4fc60f4fae
+DIST firefox-39.0.3-ru.xpi 417169 SHA256 f8a9a859d42855a6a5eb0432216ba1e0154f398023e027be8810a6f8795eaed6 SHA512 d5c430bf08aefd418cc0295ddecb5e0aab7fa67a5c97e759729ac8c9609d14ba053b84ea8cefa8057d0fe73728461adfb4a97a10d32eaf3cfbdce8bbe88bd7cd WHIRLPOOL 57344bf5a6d047738fd24485291701a34ffc673994ff984c0827f345e44340dce8131829824a5da9d234c666e3ef53924bfe7a29480603f5ba99c89448868c56
+DIST firefox-39.0.3-si.xpi 542368 SHA256 97682f379d6629952e5711229586d6b0770aaca762f6c43206a5bfa556ba1c7d SHA512 df8b2be2564d1c878f5d6693a6a50f51f4f62a7aab32d90d7023249cb748e98b3d548d987c6a07206a2e565e288ac3f249915a0530778e20596c32d68ed45334 WHIRLPOOL 810b4b1196fde50b4289cde3289714372d252bae66a6f1425192dda6a55e170719a2327e89166e0aadafa05f3d02b01896841e3f869643c3a0f9977846b01a67
+DIST firefox-39.0.3-sk.xpi 473460 SHA256 e4d998a0719d7ff997024242f8da944e7f3a0fe5a3fb8022a3360e0bf04fefd4 SHA512 e7ceeb4e0edb077c646a1d7c35e622058745ff58a1b4bf42d53611be6b09f07f3f36cc49fb05aa1abaea535c41b723a006345928dd8dd635c34ffefb040ed7c7 WHIRLPOOL 19a694b6c8cbe6595e0a5316f40d3c5666912daeb9d8e0ac3de32eb9ace418f1a2a22bca9ddf83fc219edc6b729df101813e25259f1d12bc6b4343df530c7563
+DIST firefox-39.0.3-sl.xpi 445485 SHA256 fd7ac56b390249a88a2d7565d0ff96b1d4cc3aacefd75a38d7b200f4e0c15569 SHA512 c43960abf342d6a42ff31a41abcbae45b0b832fa7acfea776ac15fbb0664941a7762fb803b072d51e66985c08e6e192615f76ddc2154afed3e5d636603e7ada3 WHIRLPOOL 09ff11b99ed0c836f4b502aece1ad53191892331b72e1116f3d4fe78b5ac8b09a419624a3bf315c02d45a6b38ff90f191bd3bd3d18f414c356b61f66df10c214
+DIST firefox-39.0.3-son.xpi 453640 SHA256 37b2fa0f744230fefe332b790b851d990075c5d95923b7c608b2365f381bf4b7 SHA512 d412012ec80011f154d7d45a9523e56586b87746e025776f014cc3ab30a84d1de29602c64027a55df89f4e40bc11257d9519b94f430937ac18e0dfebf3f65180 WHIRLPOOL 2c7fc8a365717155c2c3ac7d2616ad4f1da878be46fb751567e7c2c40f4c556bb0378050bdeae1e9ca21e945ff1ca98c946a233be447fa1ca4f841204ce05cbf
+DIST firefox-39.0.3-sq.xpi 489759 SHA256 49cb2e041ffbcd7b86e31bed2a0070950c15418e1bc5af1bf59b3b700636f4af SHA512 263a291c240457a6f596323ce918226a476e89d802987e9e97cb8875242b22e79ca4e7877de3b87071d95b4f4326d0000993c352eacbce49e0208e196da5d459 WHIRLPOOL 9ef291b167eb44735e9dc8e2c636d83226e84eb2df97b274cd121fd9a15c9bdb9d16f4e521f32e416e4307d9742646eecd24c14abdc0265986311b6bec11796b
+DIST firefox-39.0.3-sr.xpi 483403 SHA256 22bd07ca3505411cbe2a1d8d598f84f584810e89e7de9fae0ed83c54a456897a SHA512 4529f34ac1309e601d08173f168c1ee791cb7115a0317dd7e8a1f4f32f3918b53f74df8b715caccb0cccabacfd8a72bf3b6f1be7deb682b9fe91150caf289991 WHIRLPOOL 464187afd2a2bcb7ea9b12b613219a3e673fb6a8a943d138424cd3df26cb99faa718c9770b98fea71c82041735870fd39565942720607fa100187ef58ef2c72b
+DIST firefox-39.0.3-sv-SE.xpi 456399 SHA256 ec9a1d4323d972519c103076a2c169ec737e664a26837e0a0a1079018944db41 SHA512 8b0aed17ed8d4a03a3b9f823ee7802b953dd3b2d9c36fe9ed88e18aef31dd5f396bb5e16da203adacdc85160e04226edbd0b0cbf811a6c60154223eb5a2b0af7 WHIRLPOOL 64444a659332a006fd1a7a7ce4ca78af120bd9ba0c596cd56b251f38a30cbe84fa3578c72d3717720dbe124ef5f9c10c97a4e81aabfea66c33ed434ce945d3e5
+DIST firefox-39.0.3-ta.xpi 511681 SHA256 b7b8c30b7315e7663306127a9bae08e028cf251e80fac411eb70e750ed149b32 SHA512 45d0df6217e245119841026f56a91881cfd6d4c9110706945ab7d0a86265b235f510ee73a3ae7af1639c4cd4f28d1db0ef1904b75ac706a100b55d055c5c366e WHIRLPOOL 41e687ae18f8f72f3e9ce9ab40f58828d4e4771ab2e8ddafbc96017082e65451d4cea79259e61e236c2bea5afe721233e50f0970ff3d01e7416604ea16c63f0d
+DIST firefox-39.0.3-te.xpi 531783 SHA256 d5da9eb34daddd4ce0052dcb45ddf47fb998602f80080c60f42776c3d8c2ff22 SHA512 69cecbc53883fa1e41de85da344c9cc77b11e8626ed605be21d87b40c2f2397e30b28839f3d395d403ad7b6979508eeec85b884e0bf64d5d02cc63d96810ee78 WHIRLPOOL c6e0f75da97f8c2a70376781e9948d5ea261cdc51cbf5740c0578de008755b7eb3262cdba3d9d79e501c90ba376c0e3f616ca94695546d8c2af9145ce46a5b99
+DIST firefox-39.0.3-tr.xpi 484957 SHA256 5e3648520c427a05b70a23ba593177ec0667440df97b0680225d3782bd2d8184 SHA512 b6818870fd03d04d15163d6faf8a6a889fc22645cf019af43d5c85bb7b530b2facecbde1ddc912f93a39b1234efdb248f9624006de3d113595b000f73d842649 WHIRLPOOL 7464553a902fcd8cb9aab3495f4fc58c32cb6fff34c1abf933e3ebc4448c60ecf2c6190dbf78f8c602c0cc6b69b27f7d980da12e481f93c4f4759f71d0eeef21
+DIST firefox-39.0.3-uk.xpi 498398 SHA256 dd41a97f505354fd861780955e4e1a5ad410ae7ad6a9c3b7d09f643a99f9797d SHA512 224f4e8fed072f6df2b1e8ac29d0175deacf6998102175498204e570fb7396c707185257a7ab9f2a32cdb18efbab104f814de7eebbb51fe70d0196d8d087b77b WHIRLPOOL b9f64ca3084253043c884750c8127adf7bb82d47b4b6bdc7f1b2b18e368d1b78fa36bae98e2076f2f339342d8dbfae572eb3a4b8dbc43ed9a9c2b0706f1e61b8
+DIST firefox-39.0.3-vi.xpi 471791 SHA256 e131d6f0ee1c332a1c7d4b8cdeec93fcaa571ee2f776e023c414f1459e03d305 SHA512 7f842d16f800f1ec79493845ec43d359090e73da67d2e6d0af1dc6fa80e85cca23f92908007160243c69f66a8ef91cd4915ff82d465eaec50cd8735d17b0d1f6 WHIRLPOOL 17af393d9c264af192dfcd746a51a90b3ad7e79f832282fd59136ec3b7fa92d1f46e63bf4edaf3b018d6ff3c3b1d17704d804247d70450aedbd90141e0bcd202
+DIST firefox-39.0.3-zh-CN.xpi 492381 SHA256 4256b15ce942bb562b17994885cd4779e9549a827aecbf63091a6814c68a8548 SHA512 acb086dd809469067b40b22bd6ece1c906f8e012a559a19ab95d94500919b103d062dcb66b7461c7eef3ae865f87722f364398c09122931c56c546f715382cd1 WHIRLPOOL d9be6550cdc12e2947118b138a3625587c0c59694243e3e3d62f669d6f76073b10905b4c8c0dd1f65f488f10254c5d1143f208846b2f58179d5896b671337c0a
+DIST firefox-39.0.3-zh-TW.xpi 471889 SHA256 976a680743d8af7d08caf20f2f0bcb547eab38cd58b3fc7fa8bbc9cf9ec7804a SHA512 4231406c019c1e53a3d93180827957431c8dfaa0e1db89e8c514c35e03c6442e692d070c7fb37e16ad72179722353a15a093dd9e23cb20083ef92c7cd3a8e087 WHIRLPOOL dcd1a95c35d974047210d06184f0b823f95096d533021a618507f7381de1f6d1740eae5e01f170f9a92fe2454d8585451e09dcc81525c2f233f71ce5c34a1699
+DIST firefox-bin_i686-38.1.1.tar.bz2 47101577 SHA256 bc8cbd59821ff0dcb91d6efd8a097ec82f795569f9ecd19c34d672bbdfd77da1 SHA512 1d4ec08755ff70c36d9e5dc65bc7cb80356af3dfa129c64f1b07fd704c6e6be15a69a7b828f69a46fbe50602103da0feabe22b9281798e8af37f06e58eafc257 WHIRLPOOL bd5870254feeeef5cc6e015b2502203774a1aeb4003b81fe9614cf069a2f9d189f1351055fa21d307c2007341f40bfea6fe358ddf91b0ae332853b59de2c0d1b
+DIST firefox-bin_i686-39.0.3.tar.bz2 48610177 SHA256 58077f0da5339f3d90a2c74f69b875270d936fa8a12d8f98684fe0c856279e92 SHA512 079d7a0e9bb9a589bef9a9dff01b47c2fb80c4a11ea61d53360c64f87d14ac0f99c939461d546c03489c04359f0eb4cccf995491f96d0c07e757a019c4806981 WHIRLPOOL a676b175d7011304c8495aaba9c663b711c2440c11829b0f849b93b40640a2d457565987e2b3a67e75753a1ed60d3a247b3ce750c5b3b7b1b5e8ee964026f40d
+DIST firefox-bin_x86_64-38.1.1.tar.bz2 46257356 SHA256 9d2277b66d6bc28869cdc1ffea94ea14e35443adc61ad643e52a5e027f0c3034 SHA512 9e5814eda9e8b24514eba88201597d61f8abe1169dd26c578459b781db0a21a1aadbef13b03bdf6430bcf509787bbf337c6f599f705fb08e7a04fef7a94521a9 WHIRLPOOL 1da8affacddcba854e862508567195d7caf940149bc2bc52714b8710ec2a00b77194afad523f26c5564f9cbd061860fa2967beb17ad230c50c49204d1da2f350
+DIST firefox-bin_x86_64-39.0.3.tar.bz2 47683298 SHA256 4c5a6911130d4920703e9101ebaebb21fc77841e0470af0d24c9f48ee60e24df SHA512 1c318e3e467a2311e461a20cf6aa462fe30f4391e7f0ec6524ae7a481ce1e451d5632f6053c99a7fb0f3bd99d881ebae6b809856e97a5fdbb7671c3a617f888c WHIRLPOOL 6b2b607c144590c89ef9dd9b22e8112882e1a3bf355f12c1633f8b8b072652aa6d361eb47504a63c68cf2e4d84ef7803bd4c117a11308c55e3a7bc25eeb2dd88
diff --git a/www-client/firefox-bin/files/10firefox-bin b/www-client/firefox-bin/files/10firefox-bin
new file mode 100644
index 000000000000..6e0709edaf53
--- /dev/null
+++ b/www-client/firefox-bin/files/10firefox-bin
@@ -0,0 +1 @@
+SEARCH_DIRS_MASK="/opt/firefox"
diff --git a/www-client/firefox-bin/files/all-gentoo-1.js b/www-client/firefox-bin/files/all-gentoo-1.js
new file mode 100644
index 000000000000..0ac6d6a49886
--- /dev/null
+++ b/www-client/firefox-bin/files/all-gentoo-1.js
@@ -0,0 +1,11 @@
+// Ensure preference cann't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+lockPref("intl.locale.matchOS",                true);
+// Allow user to change based on needs
+defaultPref("browser.display.use_system_colors",  true);
+defaultPref("spellchecker.dictionary_path", "/usr/share/myspell");
+defaultPref("browser.shell.checkDefaultBrowser",  false); 
+// Preferences that should be reset every session
+pref("browser.EULA.override",              true); 
+
diff --git a/www-client/firefox-bin/files/firefox-bin-prefs.js b/www-client/firefox-bin/files/firefox-bin-prefs.js
new file mode 100644
index 000000000000..c40cec506636
--- /dev/null
+++ b/www-client/firefox-bin/files/firefox-bin-prefs.js
@@ -0,0 +1,6 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("intl.locale.matchOS",                true);
diff --git a/www-client/firefox-bin/files/firefox-bin.desktop b/www-client/firefox-bin/files/firefox-bin.desktop
new file mode 100644
index 000000000000..cf88bfd83e03
--- /dev/null
+++ b/www-client/firefox-bin/files/firefox-bin.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mozilla Firefox (bin)
+Comment=Mozilla Firefox Web Browser
+Exec=/usr/bin/firefox-bin %u
+Icon=firefox-bin
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
diff --git a/www-client/firefox-bin/files/local-settings.js b/www-client/firefox-bin/files/local-settings.js
new file mode 100644
index 000000000000..9dac3b0eae0a
--- /dev/null
+++ b/www-client/firefox-bin/files/local-settings.js
@@ -0,0 +1,2 @@
+pref("general.config.filename", "all-gentoo.js");
+pref("general.config.obscure_value", 0); // use this to disable the byte-shift
diff --git a/www-client/firefox-bin/firefox-bin-38.1.1.ebuild b/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
new file mode 100644
index 000000000000..09973ebee18b
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MOZ_ESR=1
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Not officially supported as of yet
+# csb
+MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko lt lv mai mk ml mr nb-NO
+nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
+te tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto /usr/share/icons/hicolor/128x128/apps
+	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	# Copy preferences file so we can do a simple rename.
+	cp "${FILESDIR}"/all-gentoo-1.js \
+		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="/opt/firefox/"
+	GTK_PATH=/usr/lib/gtk-2.0/
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-39.0.3.ebuild b/www-client/firefox-bin/firefox-bin-39.0.3.ebuild
new file mode 100644
index 000000000000..e97a81b0a563
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-39.0.3.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Not officially supported as of yet
+# csb
+MOZ_LANGS=(af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko lt lv mai mk ml mr nb-NO
+nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta
+te tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We used to not use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? (
+		${MOZ_FTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2
+		${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? (
+		${MOZ_FTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2
+		${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto /usr/share/icons/hicolor/128x128/apps
+	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	# Copy preferences file so we can do a simple rename.
+	cp "${FILESDIR}"/all-gentoo-1.js \
+		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="/opt/firefox/"
+	GTK_PATH=/usr/lib/gtk-2.0/
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/metadata.xml b/www-client/firefox-bin/metadata.xml
new file mode 100644
index 000000000000..74d9257900cf
--- /dev/null
+++ b/www-client/firefox-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mozilla</herd>
+</pkgmetadata>
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
new file mode 100644
index 000000000000..c527fee94109
--- /dev/null
+++ b/www-client/firefox/Manifest
@@ -0,0 +1,325 @@
+DIST firefox-31.0-patches-0.3.tar.xz 6004 SHA256 1ca282d9b58e611c395fcda508bf0ddfebfc91ea6a6132b59f1acf90566f663c SHA512 4469ccc3200955bb790a177352ebdbfa5c2299581bbbd0d83be4e2e0ccd5cb850c5023f3784dfbb3cd5d0dbed9bea4b533bdbe1627e42ba60437b4743a0e8fae WHIRLPOOL 86b2da659dcb11f34cbb6bc966d7f7ab79fb3f8f3584f929ea50f7893bf84b01ece435c4598c05b538d0719fb0426fca51a1cc9f9abdecd8b8e8beb5109cc899
+DIST firefox-31.8.0esr-af.xpi 431089 SHA256 f25c7d085e5e37983da4cc39cf67a430861f77535d10c93bd10e63379e4ebd5f SHA512 df8d6650eaafc6b97319fa3becfcc3b7c71f4ad3159ced8bd38e22e43e78d148d346b29d013e7cee8e362e1a75c3c9249f138ae6e1a8e9e36e5fc6e5b6b8a45a WHIRLPOOL 02cfba0e3fff4088569b6affe9110f179840baf72345974c1cf17759afdc2f09e2aab7c03f2cdd5ea37b3294493aeba827d83e08c93e3508a951385b207d6438
+DIST firefox-31.8.0esr-ar.xpi 459824 SHA256 1284f9dad514abdd360413b4f59e3b326a2d9bb95bdf8fee3c4b2cc77fcc229a SHA512 88abf3e985b9fc6f7559231d6ffa3991c08c191683cdd7ad2f0227581b404611ec385abf79f64284328a62bc3d1ac67fd0ad47bd21e034466c7fab35f9ec12ec WHIRLPOOL 41a1eb0d98dfda4c41cba9684fae2f85c4fe2188c71c82beb60142fa518e6f5c26654155bdeeb6726a7963adef9a4502d19c28ceb835b3db3b10896dde33c246
+DIST firefox-31.8.0esr-as.xpi 448568 SHA256 1fd763199b6137d93c1903eb0f5a452e11bbb0a23ba0fe4957d54f73d282de66 SHA512 1d7231ef5dd9bb3c513ab8ac4c1465fcc07fa7232ac94880a701307aa971822aa322d1c30ea8183233dd74e3a479fdc1e0ef0e1edf8a1433afa91b25ac6fe27a WHIRLPOOL 3880fc73e082059e0dc0056f49fd1c51352d1d68a9efe411cccd4fedae64de63775d42e8044e291579599d66fa7b6a570ea1a7ae66aff7659d378939eb782caf
+DIST firefox-31.8.0esr-ast.xpi 352340 SHA256 0de1bcd768d49174fc3026551e755f139f0379e33500acb131fb1ef4c5708d8d SHA512 f6d2f36e734331e21ab96f6188f2f6fcdd5352c7f7be7d2383dd40ceb95460f644aca0b9158a31270a6f90d9d1c980124eb63493d10c1366d4415ec75f0fa099 WHIRLPOOL 7e88a677ca73e3908a8b2393b05e055cfe677fc99177328d2408ac1523e082414200e7479442a06e082d25b9d689aaa133c359408defc91d53d6e0bb2e17dc74
+DIST firefox-31.8.0esr-be.xpi 378668 SHA256 c8de226c6f196622acac801b61f7dc8d578c78c0ac0b613b4502f22a89cdf72c SHA512 1a99e657ed8b72230ae4f6732579164cfe05758ae8e60d5e29130fb7f116a3e73c2161b08aab0e2a41380d073a091c79241be325e1837133b12ed7ef6a924984 WHIRLPOOL 7df25ac9ef254faede0edb676399ac0251839f6c215cad338ec856b2b9b1230af6b57ba0e2136106211363f421fa00b9aa66f32e5705dde4c9fadf669d8b3f71
+DIST firefox-31.8.0esr-bg.xpi 438060 SHA256 6de12799470d71c005f51c341ba32b6ad7ef940c028633a7837eeb8a0b0ab936 SHA512 935723cd40f1f4a0e096f2f8882723c79a465da61dc9358b845dbeca35664bed8483aaba22e402b4219772c997204610dab07c4fbe40293f5c42503d4a39e5a7 WHIRLPOOL 25a4463f08150d8abb821ddc1f00c2c756e73d5341dfd319b085ebe748f120dab214b723433e6fadc288f9755e8792ee27679f2c3cceca28adbe7ea91de4c9d8
+DIST firefox-31.8.0esr-bn-BD.xpi 472626 SHA256 d492e9dcdf415ed33350666a3697917475c8936cf973c9889bb0969623f3a221 SHA512 b376b3afb914d6dfc2ba5d232466f92c9c326788131bc387539e72cca3b5a67cf88fb8ac6c0c608959b87d85587ce2c8c9cdd57a533017f44ba26ee11c7d6d79 WHIRLPOOL 8c09b0f0e47eae2678a692205689e732f57441d515985c3064a53095509a91a3fe748697804367d8f0d7cff38601f2f6993ad18b84f6bf4ec548e65adaa10c60
+DIST firefox-31.8.0esr-bn-IN.xpi 462593 SHA256 97d0c6808903cc47a17297898e2d1eb47fcd07c7bf2ea4358117336eac85aae2 SHA512 ea4eddbfd85efe63e3671dba3c579cd96ae7bdf997ae24e638dbeb7f06bd07516eb0d61e50f359d3f82bff5539c468f96736427c2a9b6775306c46b53ad9dbe3 WHIRLPOOL a9a7918173f656fd83feb5af4752a962dfe34029493afe86bbc30a77d8376a4deb1fe1ffede92eec15f1ff4ad42b8e4ad9f3089ed34338499b09d20da8c0c3b9
+DIST firefox-31.8.0esr-br.xpi 389704 SHA256 1db6f2410f8e6e7f1d594e98ea3cee0cafcbe36ea4ef896405238e28d5f04d4f SHA512 9f47e82e5d95152387ea11ac5377635b17b95f0dbb22a9e348e566f0d9bb651c858ebc463bffc8e89cffeabf86cb0fa4756ca64aa9526cf9e73a51bbd92a92df WHIRLPOOL 4bdd7103e02f2338296d784eeb22b599587affb0d310d3b58b1a384c525d25247d1418e049e2655d13cb593f30eac879737be82ffefa6d62d5a5f5aec266bb1d
+DIST firefox-31.8.0esr-bs.xpi 429014 SHA256 996b6fb78c99c431e6cf750e44a8830c0c47da780ec58179d34500c03338eb5e SHA512 45f8bde6b7cf403fe10b11f5f4d80084dff9fad5623a49d91a17f999a7f81664a9f286b5da257b87de128cbf6baa6347222b680abb2a311e850912a606476160 WHIRLPOOL 3dcaaf45f4372f993bd162da00095f9928ce6d5496a609f35638b425311e8d1f68d7bddbea6dd8bac70ca39b0a3fc6265135d57caa122bd6a418d783f94630eb
+DIST firefox-31.8.0esr-ca.xpi 403575 SHA256 1a9d2d75ca2bac9a1ba44fb89f3b14b79eb059b8900b2d4e789a398b52be5d19 SHA512 612f730d6678c4246c70289c84d56c9c38fe6956bce796bbb65ea842c4d2139c64b561477a4164f6927651545555995b05cb1913893956a535442a13c328c6d1 WHIRLPOOL cf36e5dfd1a872da80e7cb01f86265055c356302da1a726ae98092434994b541e29b7cd8ac8d744801da627a910239c07f96a7e342155b5b72e2e5bc8a310038
+DIST firefox-31.8.0esr-cs.xpi 390978 SHA256 ed401fb1cf338b4b57f41c90f92dc294737477cad81f7350254d3ebe59055eb5 SHA512 41f0aad1139a87b481375bee348d46ac0c7264e81680bb1f98bedbb2ad450a69d6bf66bc9b7afa882337d67836d6864f2c9ac2167486209dc8e0213df7b9975d WHIRLPOOL 21591d0f2076d062733fe49329c80566d65611a7d0c66c57c47e3f80f2238acc101ca5e2433c49f39b1cacac9cb3784258f3c412d5b9a1a00efe6112701a3b50
+DIST firefox-31.8.0esr-csb.xpi 383695 SHA256 55c0f81da8eec764dee6aeee00a415da1352bb22344994b3ccb86dd396e8b242 SHA512 ae9db39edf2d7a3cbe58bb2b7cc2e45071483a534a98a8c1fd18dcf72a52e7ca917d0e9fead1e4c8135a2652a76789357c1a6146708ebb75722ce9885ead85da WHIRLPOOL d24477469fdbd3837880d2bdda25e146cca8a7babe4734c2aed07f96ac506264373fb96909b61716861c8a485e6be5eb29dc90df2d0f484752fbb623e2aafee5
+DIST firefox-31.8.0esr-cy.xpi 390727 SHA256 6aae991744dff15029457e44b9b9c45f03812869da530e7c1ce5e82398b1e2a3 SHA512 4e65da14a4f0766ae62132ea8086cf2b868f65708326ac482ead194f2cbe7dd29f2d3af0de6bceb38d54075bf0b5074c068a4d2a2c0e46c57996b310a60cf430 WHIRLPOOL 619fa9e05f779c3ef3b25f8e086f12342e68a439674b16a7b1fee2313991a76f1017ea9028704c5f982b50fa104382ddd33ab448c914fabd949818a850db8f3b
+DIST firefox-31.8.0esr-da.xpi 397747 SHA256 bfa843fcde93c0aeebfbbd8206e8deb24c0e6609e925bef3e66f31a807e2552c SHA512 cb9bf0e079e74dbaf54827b6df8c60f4a346ca89d073185a9dcb45c60bd1f5b09fc54b2697d3ac9a20a876287216c72c4d81476de509debebc01b84a25a6ce96 WHIRLPOOL db0ec21de67292ae2b3d43b44749e3a332141d4b807ed336919ff86e9ddfaf2daaca82f93f2e8858cccb5beed7fa534ccdcfd1418a498934ba49fac4b559ebb1
+DIST firefox-31.8.0esr-de.xpi 395164 SHA256 a57ff0394fa95b2f38c714d889af378572c48647aac9f3aacb1f1ea3768d6f85 SHA512 288a8de557472ee5cb5cccbcec4bb227cc31e0d2e807d1007b38bc18986aeca033b48924403d8dc4944a2e6daac682f3d351b709e53a123b7372c28164728c65 WHIRLPOOL 142919bd50adaa8cc93fb6e9f50d9de0d8316dada06a77c4c736721a6de6d245e6763a05659c271b355a5bc827b53b849423509f815abd770e2e86931b870eb3
+DIST firefox-31.8.0esr-el.xpi 442982 SHA256 0bc8d84324fde6060b2c56be09853fb4bcb7f23c4acd43e53a38f933517c8cf6 SHA512 275238b628b0253eb91166742c9763becc7e004925bf21db716564c6e8258aaf2dad4df8859eb8843a5544b77b87b5707ddfa3a6430e8bb802c414fb357b5b90 WHIRLPOOL d8bc082ad3fefbc62590a8196d8c995c210d7e9322c3efbb38367d28a52cef2198843295b269599b3643fbfe78add922975e8d536b8354aa2c64264cf5eaf120
+DIST firefox-31.8.0esr-en-GB.xpi 390118 SHA256 9b440a0cd8d537a8944b19ddfc039210f8a1e925f2fbbde74ee3e6373fef9c74 SHA512 75d1ee4a5ce454d3f40013dfb830bf0d9c6c35e0acadd82fe48bca341bc1df1266a9bb963a074b583615de34514f94c68bee389598c1a16a682089605fdbe28a WHIRLPOOL a6806040dc677834e8f70ced5cb300e9b7f62ba4bd353ff7d1696baa60115539ced524e2468aaa21d34bb47f5c07fa2cbde184ce4e3341c597d88c87dca40d11
+DIST firefox-31.8.0esr-en-ZA.xpi 388528 SHA256 36f82315d244897258f8e09c376822cc9e36f9f82b76c450b3728f0b5c096d64 SHA512 a7f530207f5dadc09605c28f9e25ee6892a8f5f7668ee606aa9c76436b33f1f38566cc0534ef2339b1c685a0aaba301a348ee4b59971f2e794d6570b131c9df3 WHIRLPOOL 8e56db20a87d43ecc574407771ce5ffc88299e17f679034cfa83126781d1d934fd7b45f7807aea39fbd7bcc24110d208a32d1260446c4c0b0489d82b68af32a3
+DIST firefox-31.8.0esr-eo.xpi 431831 SHA256 ceb709ed988139a9b9cfdae16788baf07b73099ff0a4626682632edbe738a24a SHA512 fab7c48b3d9d565d67b7c6d188f95328d9a4779f23b49fe3ec3119a2e4e701530809df4cde81fe99a3c362f603634e200a11fafbe1e54cc106c2f2e3da3c1688 WHIRLPOOL ee5551491bb3bda206da5f412ca8702267f31e0c5b67c567ff0ad8d11a07fd83a2983269b441a87b2ce23772b2faea286a77c19ff65a6497c4526cc27fbf9e1d
+DIST firefox-31.8.0esr-es-AR.xpi 399937 SHA256 fcb4a0467daf9fdd67e510c140c474451e4a33a9bab5e649dad48a7cc360ee93 SHA512 6ae990b91d95909094f1c2eeb93d8cac3a0e6a5a8b0d7b7e396e5138acf8fc4ad221440d1160c39bca46b295dfabdd7c77b12dffc2ef3a9629d31ae391d22be4 WHIRLPOOL 175bec313a2eec5b40c1e919ef90e70cfa80b166fd73562c7776baff95b42aa17cced56e54ead93431cf7dfbbc115bca50cd0d76fa8042bb251d7b5218195e8c
+DIST firefox-31.8.0esr-es-CL.xpi 342808 SHA256 3183a34354550f8ee8359b78e59b9a3997d540051a2ada55448b8a4317023428 SHA512 832207bace2fa598cafd64e0a4255e2faeef2e1fcc0a5bb4994ab35a66f1dc0b41bbd0b5db334c1a783d8f679b8f6fb98237b46f401baf1e16993c7be077f255 WHIRLPOOL 9d18bac74a638478dbe5d3c1ce66f548be5a389cff0c00d1f5e188a739f40b9694b780a49dc7bac1e731129d54b8ae9621fb1ffe9c818d5fd9fb2298c0c0d6de
+DIST firefox-31.8.0esr-es-ES.xpi 335880 SHA256 6b73b5874e0a0a69e3b92b47ba83f54c3542d2fbe223307eaf112e45cf3edfa1 SHA512 753eaa950f558dd7f26cf23c37bd145840d705209b3904e83e0882cf6e8017e2bea02f18990669cea8bd05f840a826bd606ef1f66f7487efc9288ae0aca48dae WHIRLPOOL 6bc3e4adde295a14b921ce2ae4e7d8fa3c34c99ee90c27b01074221e6d23c629c56569a4eb9ae8e913458b0abd9df0ae80e566b43cc866eb07fc10bf985a77f2
+DIST firefox-31.8.0esr-es-MX.xpi 402672 SHA256 75ef2ce98f6910d171d322b21acc61ffd17cc9e67763bd2618758bac931f7256 SHA512 8e4509581b9ff5f328145dc096f4948fdd62262384f45d4fa0fe1225161fd8ad26030bda0b152ca33fbc5cd434078508246a178ffab4510ac4d7ebe2e5dbc906 WHIRLPOOL ce32a989e7aeb803252b2a7e7597f85adf98787b35359dc0eeba7699fd90b36cd3f613a63a7b5ab2146696ecea74dc2d6376f8f34f71867b5d2243da239ac964
+DIST firefox-31.8.0esr-et.xpi 390360 SHA256 6b492ab45885fc4457851ece95045f3242981369bdda7f236fa7acf106eb1ea2 SHA512 7d8b40225c6c425c76427a9f2844294e8b6944d78978404d786a0df1bafd79c9aeecc103fc7679f387a9bd311a0b1ca34d72b12569af878f2c8a4fbf16c36e43 WHIRLPOOL ae148592ddc8fc31e44267703a6b8a279f7c55f62c5e17882086b20770278fc58db534a979f11e3b8974b010e07aee99dd8a6a42b32075f12fb81b5b79cdfec8
+DIST firefox-31.8.0esr-eu.xpi 412999 SHA256 938b1e7f8452f5ff4b302b1e7efcb248c375b09998c6e04fa8c1d4382f27c89e SHA512 1e1ed4b828f9ca894039a33ab5ab3e998f215227ca46ab53cdbd4416448bdcfaec34bd2acab22847b7f631ab24b225e9485091540d61e1ba1825f62ab705977c WHIRLPOOL 296a21bed8275696329b65d48a57717eabf85453bf38138d4671713c8032e36e72633ab82497d86696ca86a3a17138499f6091a5e6c2f8f33b4b118fc84c0f5d
+DIST firefox-31.8.0esr-fa.xpi 460857 SHA256 16c8ed7a3a343d00a84c2bf06499314d9b8136f7da15bbeb938e387cfb3c2f30 SHA512 ee89872d802729a3fd9321e55ae526d036e0d3383cd420ab5e0d82ef4e4873451790d6e1bdf799a7197c60543efccc53278cf76159bdd7479f5ca27bdc26dcf8 WHIRLPOOL 70a1a9b1c1480249f658a8d44b555c46d09fadf49f24e46b0548a7c247c6e5ad8f4a15cbe9d3637bfcfc780fa2023587016202d05faf8df17ba67f27a8fd56c7
+DIST firefox-31.8.0esr-fi.xpi 392740 SHA256 955db75d87c64eb0725edb5cfcecdeec1acf714101a20509f070c2549ed60ce8 SHA512 3f2632b86b920f3197bd8013bb2806953c5c7cd68367921568a1867343566d8283ad9f0cff484f3df27b920391e77a50872461a4d8b31c20c8557605352ecb01 WHIRLPOOL efd14d0e2ed11edb1d061142fe09d0b035c5af87209c1e837efc05411ea6c03ad3c5cf979e3c37fab9a16aab2ec6f634b05284ee73532f0a895e87ea48b192ae
+DIST firefox-31.8.0esr-fr.xpi 406462 SHA256 1051e16f01167f662375c504504e4bad3d228984fb950a14bc50af615660ec5c SHA512 d95d4ad3a2c76830ecb9252eba72cd5ef0ebf3ae4c1658fdc2bf2ea68a91662d52a3e5f8a3a2d5e0c357c52d8a897b5e53337c344391fb7fa46d00edc92bc9fe WHIRLPOOL ebebfad05884a4f221482458dd1562c8300275dded63a7fd3635fae23b30666f8f480724f032a4419a3e1f9fad27637d8f3f4e68d966d30241fcd481867ade09
+DIST firefox-31.8.0esr-fy-NL.xpi 401930 SHA256 657cbd66cbb78d606ee2b2a2238bf1b264c518aa2b729d7b9a398610663516cb SHA512 fb42b4e9c8f60212da786ee584663af5238bd91c2b6b92bfc25d80f312529ac8c3e2fab1dc6aa4e8dfc3e4d04ff30f3aeefdae4e75a3d9d297ce67ab0ee27610 WHIRLPOOL 9404b53ae64c75c9b081d800986ee3aa1ed5cf9fc8a557798d6f31ec7344191f464ee80b3fb25788b5e5001eb9a119784d2adb32d5ebd182d40a0a759407337b
+DIST firefox-31.8.0esr-ga-IE.xpi 410077 SHA256 70d970fde11492c6317bef5e9181626832127c0a5c68ceb216603a866452766c SHA512 5d653e0262cea71b81dfef2119e6c78b7c1630f13d571fa41f00895003fc9e27bc8a30846bc04067a52471b06309de8e3b81d045547e9ba2f6677e458b37b590 WHIRLPOOL ec87ba007ab1ee4d85c9c0355b8514b60ff50fb7032fb236512ee786f96cf9797ed153633403932d78b7956578fd2e458ccc9c15721c5b34cc58985cec66b20b
+DIST firefox-31.8.0esr-gd.xpi 403014 SHA256 89a5ba83f65628f0b6cd1af0bc4d6a4fcfc4e1a0c9c62140f668d9960ab0d1d1 SHA512 2e04518f47bafed8050090709b4031514a50b00a8ce0595a48f8bebf9381c2274c5bd1a50576a7c14b31427297170ee7fe2de99ea7de5644abd02e38f580e4d4 WHIRLPOOL 40567f6d89174f018fc644160b0487b56a31336ccd1e5bba427e7bc4671480f8ef84ede7088b09971852a22a292a4366a8d713136d2451ee23d29b8bacd9df8b
+DIST firefox-31.8.0esr-gl.xpi 390599 SHA256 86b935c6d5e0bad6a800cd53652832e42cea4a97be6bcf02d3201cc35023983c SHA512 e4e14892e78a43251a9bd757ef9ce236b8d5ce8e2750d937ea51aaebf55bcfe0953a25815115d1ba8975caa92dcd5557cba7435431c1566f2166e5cb523c70fb WHIRLPOOL a973b11660597e8ec586aac8769eac5d21b25dc8281db253486ed2af266513eb0e2eec40804fca6ce8c1e64a234d859d0febda22af52ddad69c26605b50eeb44
+DIST firefox-31.8.0esr-gu-IN.xpi 423504 SHA256 0eb2f5a2aae5fe27c0d6742e28bd74714bf222969eb20ca298c04162f72f7168 SHA512 820335dd154c3548e0f9fd31b6fc0689950c6770b9ddac383b28d07c951198f79105fbd6134772c790bd7a75a842c49614cbee3238487d514c149c8572bfffe2 WHIRLPOOL d900a7eae2de49b7020631ad5580b0f3c8751f53f5f0da39ad61b11dc249342acca903b931ebb6f83265bda9b0947d5a4b0fcc9d787f64da1ab0555c1163a1ec
+DIST firefox-31.8.0esr-he.xpi 427630 SHA256 e3f526538aef5235de335ab409c294782a9a094aa7a4188eb179f7b063b35c7c SHA512 7be4a5c96170463e276dce0cb4a3217abd55743f3817db05cd15c6903e128cee122daa0dc08107ad39c380c77f4dcb4050509f1fc97fd28efd113bf970531020 WHIRLPOOL 8a395b4052720d52316324a8239cb83b9cf68f4fc9622a5af5e4362a1a125b993cf74b864d68c3c975d751af8adf821d1e17cdfbd153c4817a5fafa4b92a5396
+DIST firefox-31.8.0esr-hi-IN.xpi 441402 SHA256 940e8c34ddbfe0443975ea3f6493593d2e31e5ad8c19512898da4d80e52f52a4 SHA512 9e8f48e17d07b1e22a6ff7a86210106b05e70a1aa583948f2af6f1e3d09a327b7fab94c192bf11ac69fb4c707724b1af84d7c230f1379e5d2042d603282a7313 WHIRLPOOL ffd53d1e64833c6efd6c25403fa8537adf59ccd014bd7f94d2e8ebfdbc7347492b99226e457ecf2c6b92094b34b2843a98d9ba911cc8fb943e1e7f561add6406
+DIST firefox-31.8.0esr-hr.xpi 424371 SHA256 4faf6d0452f688dab67bb687dac41d388cace1eeeef312e9a974291206e7a997 SHA512 3c93bfa5c6f891a1409086288416887e9228ed16b27604ef96b39b4671bb1521ceb24635f5ba4daefc8c975ac89fe594bf2245b9e7b2e4c6ae62284ccccbe2f1 WHIRLPOOL e9ab60dbf7f34acb391c10a40fb69362e6875936115dbdceb41874d4784e4b66163a5baedb0cbb49a40824d507dd00c621a3ca2ca070d3e8e7f66b562836704b
+DIST firefox-31.8.0esr-hu.xpi 398644 SHA256 26e656d24fecfe68051d77937da584f6f7ca7191bd4bcd927210f7ae48e19b30 SHA512 0098c3fe921ced12f1628d8181092180f119aca25060100a1bea0ab9e775c4029a4c66a54b0efb6c13b6d10827fcc1c4f0075acb1db508ead6d13ab12b6db3d7 WHIRLPOOL 5edb78b88d26a47aa63e793fa5d31892be6c1cbe193a4bf46885cf7f722ef147b94e9db48862d075724796131045495748208242adc97299de4f3a35da18c332
+DIST firefox-31.8.0esr-hy-AM.xpi 478743 SHA256 7017df2efa635f31d7808d07981f2ff3a4cb33da14db91c299c0b33ace24d24b SHA512 483a2180588a522e6b188e1866b7494a46e33d7f3083e82786aa175dff3fcc789a714f15780a4d6f8a367667a22724d7de8a00516c1b22c1fd6c08763754962e WHIRLPOOL d4d815211e60a9b7d1d9620d71302b86aa12e623bfa9e9b65454c24a43f7b587e4415a14a61a9adfe6a40416dff1bf6d4ebea29d3fc62c3390d2df04568340b3
+DIST firefox-31.8.0esr-id.xpi 378301 SHA256 59b35a3b56ca209e9f81b4dbca35f6361d4205e791a8328449cb9864be30199f SHA512 a83d33cd59f8248796017e7b3f1d236de98374f82f8a0656dfefb1cb24c86984a93c81dfd1b9da12119a8a85c64e946877e6445c2964c90f1af89a55eae3d2be WHIRLPOOL ce84d5dc95c202fb8410dd3347e86ff809d7c90dd4f48cac919553ddd889f3f3572f8fc5bbdf8594b468cf1511c3ed9c4c77f1f5ea6e1ed4f1ab7ddc69c9a4d5
+DIST firefox-31.8.0esr-is.xpi 427327 SHA256 4103272f8dc5450e78dbb5c67395b7b9f96d8e1f0cb2c10eb1ae0d0ddfeea60d SHA512 1f20212c5cdac7957f88b1e59e4dee47a0c6e518ad3ed5a4ce9787607759b3b3e19a4aaec02b5ae6405763e661314f9311c863f968e037b7bfef9c0119ecde8e WHIRLPOOL 5e16e56c769bff57fdcbdf12c3fc5e98899aa2aa14c9dedd96fad063c5019a4f2eb178c647dd9ac88425b63f72553015e362a8e3c09d3ffae0c7c29f12c47eed
+DIST firefox-31.8.0esr-it.xpi 330905 SHA256 d61cd7125d23f73bcff8eb09fe4dcd7b027412c7bc6ed0fe34dc71673d980302 SHA512 7b0337d40f95f305fbbf6f6fdfc46e23efb874d6cb4570308f07cbd092e2ddaf2c5d8ab829fe3fade050bc109c9ab2aa304b8a2daf4f08e6102a0b5e7068aca8 WHIRLPOOL 21a418caee23e27c31df0efcbec2dd3477340dc0a21c2051736c5c0b6596fe3b0922438b8a43d1555ac2828ca2143cb9b500f0d54a0e895ad2da6a44a7c60696
+DIST firefox-31.8.0esr-ja.xpi 421665 SHA256 41581bf6e01fdee7d2f7fb899e4f117ccbb63b39b5e687068b289d87fc9c827c SHA512 91712ae757e4069e187fd0a3db1a80945e4767fe766e76876edfec7cb0003435c453b2bd4e054ea8d10a713d8ddfba14f49ab968137dd16c63daa944ad1b429b WHIRLPOOL f89ca88ac1eb229f1a9b5dcfed7363f09797317ebbe4f1d29a24f5889b86466faee09c7d44008e347e790530c1da30b1dd6cc8c714669024a73889658aa221f2
+DIST firefox-31.8.0esr-kk.xpi 439116 SHA256 f0dbf64e8c4bd400d7173a57971783b673077a6ba67676f0bc7d0f0dfb41d0a8 SHA512 5c1cd4fc38f2c5a4326b8049e9a9ad4495b0f8bde0c1406ba63b01be81ca1b19a74ff9b4a04b6d283a6ea214e5ebc54176676388082e2cb6be008307c900809a WHIRLPOOL ca533b9cd9f65d2fc364f83ebf947d44f0fbc6093609f3d0720644249ae070b31feb83a01d951451e4f8752fa1641715c7f904de7938b74a5fd3a6a16dfbbb4e
+DIST firefox-31.8.0esr-km.xpi 506476 SHA256 8db3136845784c04af04abdae91dc789fdc177a5ba0435fdaa63dc94cc85dae5 SHA512 ba4b77a07c991d5e8b9c2676f4e0a6ecbb5f1efcd41565a427cc73d03b39833170439df5b706d06e5e419922ee9c5e390fd27c622982ec9657aaa9f71880be2e WHIRLPOOL ba92fcc368138e7991b8088807410db03c65ce9bd2372f5cb9485eecfa42bd59e733e1fc4a8b34e352d4e0387f37119fddc05fdb2e3c7fe00088e02e99f13c5f
+DIST firefox-31.8.0esr-kn.xpi 458891 SHA256 4c410df79ae8723b10aec36b0e2b8d2bbad621bfafa580beba9f7255e31e7c0a SHA512 f165cd33e347eaa0533d1ccafd0ead63beaa9dc406cbe4f089f326b8ca2846e80f5279b1d89a0101ab46163981d4e65ee33e40e17fcfd11365465f4a7e2264ed WHIRLPOOL 81cf72e7a7d8a871797a9a018a1e2dffbe346d6dc1aabf22991fd7cf57fc4f9c244e89b7f73cbd5ad1379fd2a4e685d7b58ae55011dd347227cb1ee13cb85677
+DIST firefox-31.8.0esr-ko.xpi 402814 SHA256 eaac0f0ed4b69d8ce84a4212a2f4592d7ec1b32a5b5e3baff3a1d3f477b3cdda SHA512 c3c1590b99bb989a586f603df1ae3dd3abf0e1e0bf2739519bd2bf0d884ff4e383d3e802d4d6310d337a8e639e2cff6ddfed9c2c6ac1f79eb35e9dbeea49d9b3 WHIRLPOOL 30742c88b140a4e93b04f9a83d4122eb7f444c51f8824f472ef772cb2941f664aac19a26ebf12c1ab205de1e7fac9b3f3d03adf009c9351813dd954e0de52f85
+DIST firefox-31.8.0esr-ku.xpi 420260 SHA256 eefe2e6a3b84c4c9ebb687aa5b8a1d6fec672251456c3b5b265d985534f89699 SHA512 7eeec859ba3ccd478dfa23d6c3757fa91944504ad531801a09c409371de3f929bbe618e137713ccd02685925380e5c7fc2a74796c0a1e255cf4cdddc9434364a WHIRLPOOL 3178ba133c6c0fef2006a3f5298a6c03a74a459ee2b8fc1dee6439d2302b476c213228a5e5b6af572f489c76a4ea850e31e440fb840d206443355c698ca0542c
+DIST firefox-31.8.0esr-lt.xpi 435431 SHA256 d63d13981d071dce6a6cfcdfc6d6242f7e756e04b4bf7f8e5d5d1b3ed01e68e2 SHA512 d6794e51cd8a48c62fb244b07d8eb9e2f438ec99d502ae2b376a37672ea61a7931d39578bde2b6db0d01476bd5157e4628f4191de0a8e96339e2d70d9e98045c WHIRLPOOL c3ddf7efa2c00d33d3fa068868ed720e63fa24421554daffcd150cd6d06f5017e20e353eb8b09d8f691c6a0d203ef674172f59bcb986bec16565965fa11f3f3a
+DIST firefox-31.8.0esr-lv.xpi 398576 SHA256 95509ce9ea142f545d0796294159e32de77eb8e13b749528473962a075f5c788 SHA512 9bb899775c3cacfdb8c1b0a4cf6731347193e233e5657ca7f2ec9cebcdd1c9b828093ec30ac9844081523043a3972baf96c2d61bf0976b9c53d69e09d8465962 WHIRLPOOL 7e9e2eaa56ea88fbf550b5db0ae99adc0e7cc3f51ae20e03a4936de12cfed2fdb0d6ba545bc9b03412e217adf1059ab5c29a24c72aeb3398b2f26db21459fa89
+DIST firefox-31.8.0esr-mai.xpi 444885 SHA256 b659ded2f5691c83d98b8d3b31919b966a65c4d8eead39249e93260e26aabd7e SHA512 10e39b1b4eca018ef1c5abe9438d39ec804750302738479678c613adfd33fccb82201ddc0af4dc149d3d4865cb92da99019b2894e54f96a96737dc2e3fef5117 WHIRLPOOL 8ad1dd9102990e61b41d3e9eb4b0e905fd43249439cd11bc23c500276ab701eebb2269c57b0b313f4d33d7a2de723ae68e24dfefea1b5426f4c2a46c9235c4de
+DIST firefox-31.8.0esr-mk.xpi 475483 SHA256 f5b2930322dc67b8aa4474b2f95a859c9df66de7e8ee1912c7f57bfa16f451a6 SHA512 5439b622482705516b68cc4c646de981aeeed5035be5176f7264e78a31c1fb32a4797bc0d7e408ee7aecfaef0cfa1ea00757128d5d8f0362fe790d42ddee0e9a WHIRLPOOL 0aa00f4589eee82c4f7b4796ea204f1e711b6fb7561102fd198ffb6d4507079dbf7ac50f76dbac696309bf1a652e7a1ad5764407ec1efde536cb885f463b635a
+DIST firefox-31.8.0esr-ml.xpi 466254 SHA256 da17bb2873a7a1632e9d84e1549294498ea96be520b46213ab51b35dd25ed19e SHA512 503d4d790887e309311bad34f06ae369434d2f14c17a4fd25c386bed98e61d3fe82d31b0f5a003be0453ee065383fecf212f8be499c7102a648a82e0e7f89176 WHIRLPOOL 2141cc21f62b94573c6a65f7357935ba0f40fd598c854455294b7c4fab4a39aba8e4e5e55eb47b333034502d75be630b4cde2f3bd743803313ab47d1df4817fc
+DIST firefox-31.8.0esr-mr.xpi 451292 SHA256 e805cf414412013321a72a3ec466923e963e536deacfc85c9b9cf24f83050ec3 SHA512 f3ec20f6a5aeb30cd3d9952eb54f3963e50e6f02b6366995c10883df88944824e6cd8b967cb2ef3d2e08317ef0684b0c71f4a41b7edd0dfbdb7d69050a02ac79 WHIRLPOOL 1c6d961b13145ae4855b7f67fcb973af1fb461868107cd048023401df69442b2d87de6a9ebfa5dfcc6189bb2dab1bce6b887265dc272bb435742a76477a2ca56
+DIST firefox-31.8.0esr-nb-NO.xpi 392005 SHA256 7fb8547e57628c233372152e36ff828c40355f9bc146454e42e008cabcc09f7c SHA512 274ff03a49c1c080829edecad7d07f411f47cb6ad671fb7286d1a31d85148c962226e309ee73fe6a280fb53e5f6c8bf6f2675105be43c9bd23ba0659fbeba7b4 WHIRLPOOL 5a0a671277c3d9f41f16c87c9af7ade87f8e03c6e039fd9f27064d62a8bb8c198c60866f5ed5e413ba82b2a9cc86a4cd8c09dc4e6f27fa4effafdca1a3e1d511
+DIST firefox-31.8.0esr-nl.xpi 390885 SHA256 bb2e4c7e4f52b251bb37e02eb7c61211c2bf77da06e926966005d8100ee98e9a SHA512 4c9a0d56bea1fb56f185e295c877f985c967c1da96fdc264d37c5b48bb271eb69416f5156c5e869989d429f5e69d8b80a9a58cbbed8a73fee2ccce68dae41dd5 WHIRLPOOL f952f6b5279c899be7e19c875df46a64a8df6c28574bf39bad0fbc658c316958671456ba4feb54dcaa95abaf4256a516dc920dfb6eb022a4a362f16c2be120e3
+DIST firefox-31.8.0esr-nn-NO.xpi 386281 SHA256 cc2ce5ea65b8f35c77946ce15e90ff6514ee055b2df0e9d0f49a7b7388d5adda SHA512 4df1d721a923aedd54d040137e93bdc4f14ce7249d556ada20e11218d975fdf7b6ddf03dd052558a3436e30bd5dcedb2efca2cea48c32973201b2af397bb9a09 WHIRLPOOL 03924f2ad3006e8ae0fbd0a95aa7ff4e2991639e10b3b0dd173e8c30e0e1d97a8276344fa50903a125721b4037eaff381acd3b362203eb9197af749f257c23cd
+DIST firefox-31.8.0esr-or.xpi 464749 SHA256 fee5ad7c86861d78422c3692fd9c3e5a33c6af0a58e18915ce158e728db9afc4 SHA512 04eb282429b73d73341ba89872e0eaf6f3eee588aaaf06c160c39f0623e483f22e09638af75549c730d8ed58b980bde5c299e51e5382e270d9eb7f1f556f695e WHIRLPOOL aec71b7f3748f4db1a02086d651aa20ae0c6b94392013c841cd2097e813fdf40eef8b15dae8300797531e361df6b4262d9f3ef1672a7d339873717fa2e7cd828
+DIST firefox-31.8.0esr-pa-IN.xpi 439326 SHA256 21454547616987cf88d10fa22293686825497ece3c7a83beada236786323af12 SHA512 a8297f2fce2f074343f96e827f188b51cf92a86d72fdddcf410bc9caa7d4e5e7bdefc197f0719f4f1b2e4f327bacb7fc594b7d79cf4c31ca3bc2cbd07857c210 WHIRLPOOL 6d27ded7b46f654edb32c23d8ac90bab622839c204753dbfbf033e2d75c1b2fe9131781160e21d1a9d90e9ddc623d9d5a66db0fc167007cf55e51b119bcad790
+DIST firefox-31.8.0esr-pl.xpi 374747 SHA256 9a979e0d8ab863cd9693dfe91065c0cbd66a64c9d1ab815d614711187c7f14cc SHA512 7db1fe4a4f4729538e5fe2114cf3aad15a775dcb833d0e7be52626f8e3ab12ffd589968743233407337d85253ce40f786cee46faadb7c739e34f0ee94fc522b8 WHIRLPOOL 3e702459e4e6fe923f53b6054d7ce5f02c9303305d367ecb0b4c6b0bde011cb276418ec00e1c74f2450df60e302faf280a6284d176bef9b89c226905970c24d0
+DIST firefox-31.8.0esr-pt-BR.xpi 405564 SHA256 6795b1a2ee6204691f8b380d3a45d23dca6ce13b2c3b4ce0924d46a3e25f0236 SHA512 a583e23241aa515d901e23046621b38dd55010e938d935da5c0829726a1d2748fbc4438103717dcecd8521652355f92aaa1c4058436eacd2c68d97b1d35b4885 WHIRLPOOL c530007d6848655d6189c0db866ef2d784f5ea427e0d087074262259e134e57060705031b3b773c094a295b9e4dadbdc7f7b53904635a37f37ccaa1c4732585d
+DIST firefox-31.8.0esr-pt-PT.xpi 386344 SHA256 61d1e790e3b5e26b4729ebe41f1aaf74b75b840cbe0bf996c9769e0e4a9f508a SHA512 5a77ba3dea225a32cc0ad7f49fed29e1fe0057ee974510c7f9dae3ffcadfab9157b6b1c5f75cb5965fcf3cd6b99aacb660dea651b911a695ef6ffe3728916eb8 WHIRLPOOL b564525946174542dca27a43867b6727275686b0855c85520cb9a87debb88bcd4fdadc161dd87adb7c0dafc2802d2500aa9b049862a0e2b93d354debdcc17809
+DIST firefox-31.8.0esr-rm.xpi 399286 SHA256 67a6582f424b0b205d45ca6a2a14e757e617b346244a7507456708bbf71bcc30 SHA512 28bd520aec9051a08c2390fa2f37041cf0b00e8600e77245fd0fa7fdb6710bc6752d8a357355ea6a5e1ffb8d79888f0e0df1cfdb1af09bc53928ae5ffe58d23d WHIRLPOOL 9ca82c6af9a8959baa1e3d1a95f8b6373921547f0a122694b4955437ff19813695e08e17fc68d6094e9bd768db992c062b6d90071fad7f9aab10eddb8a56a903
+DIST firefox-31.8.0esr-ro.xpi 439387 SHA256 67ad6a8df7e0bda2a1932c5031edbe6543825fce27ea0f8fc0b31d257a1c3d58 SHA512 a418ec6d6d7bc1a6b9766f978ed66838e02d885f5dedb940570369c6857afa8a39e15cc47098a9926f5e7475a823a2e2258a37ff570b92b340c20e85e9552d7a WHIRLPOOL 9f46db8e58afab828fb96184bac05d471eff935581ed86055743c614e2bae5eb12db8b99cca6601568659bb3f8f8ff5b4617155c040076b1124c2ab16ccdbbd9
+DIST firefox-31.8.0esr-ru.xpi 367897 SHA256 e5980729f62b66a83859a8dd252339ab3b6e596faf57d0daad693d1e7122a711 SHA512 cbcbc46a992e0d82689601430d3c0785fb8ff3c2684fdae0012621d1be4d792b99032b7a3ba4df290b10d194062f535fbfaf7dd52611434c4fb3de36ff016089 WHIRLPOOL e257d6cb20d656c4afff75cd0a2d173a8a1f11ba6da937d70a67e64ba2c423711abdc47be171ed10e6ddaafd7feb2f5cfde0f96e1727e036397cbb4ebaa4c5f5
+DIST firefox-31.8.0esr-si.xpi 463224 SHA256 ee2080c7f87c940074d16b8298886bf00d519b65220e7bdcf63258085657f80f SHA512 274825e636ff653de7a63e849a7efdcfafb3dda1fd900173837a16758a13e2bc778b9ee6fc15cc2d3cc2c1d244b11c2ba32f7800ca6f64fdcc8eb24af72dd2c4 WHIRLPOOL b12375d58510ed86139d9f09ed50c01b5b882891b0ce6171d5731dd77b185e185f43434b9be0497d36f67caf84d05d17a4a138cb4cd6f31183104c1906a1fe80
+DIST firefox-31.8.0esr-sk.xpi 413802 SHA256 8df73feedf3ab53001acf104903c87f94b8b2b0aa14e6f6536329d671ca40a86 SHA512 7e91c03a84655d3d95762a2cd0c0967222957b8cfa687eb393abe42b1f0e94d6354b9a1b00db80c2c1a72095f39da60be49f6b64dc88987767d8b0c75d544d0f WHIRLPOOL e10db9f63c9b90e8e6ffd9c98b66a582211a4eb34a475bade40051aa3d82039025aa38b1a12d31a45dc2d7503055e7a9c5164c05f97838ace1dd9bd01f0a3adc
+DIST firefox-31.8.0esr-sl.xpi 387134 SHA256 a9316ff49b3122ab3f9a4eec99b9874150a939f56cae5be60ebc9f9e64ea2e64 SHA512 4cc06646155f403fcb355b909fa383c603b37ad245d68acd9be09cf8724018935d8111d31b81568f509dfd83e738dc2baa1152f615d131a48f2de8a6a07636da WHIRLPOOL 0fd9fa0eeb15cb79ca0ffae04b16094395b81a7a11c354682112ce93facfe7edaa1b0e1bae8e1045349996a6415b0d26a562011e6c15eaf9ee5de8a978c22cb1
+DIST firefox-31.8.0esr-son.xpi 395143 SHA256 9e09238e4c2d30f8e22803ec03a31743985c2fe8c69dae4ac42da490240ef934 SHA512 9d446fb3d8fdcd0fa5cd5afa83d9430f908bbdafb9b8d3df9e2c2c9c3fb18cece73ff5c3630d1968b6f225a21577972e084b9fb93ddcd3bd88a14c026b1ec4e0 WHIRLPOOL 211c570c0c5fdfb7cbd51ea9c1fbcb9e6a4a9360f82b02a57e56ea3313cbf54b02bdacb1956ff2363a09056506b6e604089d2676bf7897ccf58ec8d7fa2bd4e2
+DIST firefox-31.8.0esr-sq.xpi 431136 SHA256 f7aa933494acc361883f6f1b71be4b284a710b3c638861c4c8b68172a5a61d37 SHA512 8f83979d8a2e2d0d5a07d39b62ddfb6400bf066076b5935fcbfd4d978afe4b324a2adb854af5e6110bab9714e081f1f76524cabbe693cc282729a4a8fec9dce8 WHIRLPOOL 10be7ef83abba01b4312a1c455a3f4715d573cb54f495dd7034a8f317dcbe5722a03f4f4cb40d700cb52d55a399715d59e98bcf8f4538177b5c8a951adf577aa
+DIST firefox-31.8.0esr-sr.xpi 425902 SHA256 ed7b0ab8e40cf306a67f36b525e33ab697d96cd7da1f93abc77fbf0f8e35d8d9 SHA512 421a69bc7a4209fd249efa9166b9a0f3e88dedee77c62e932e6b1c7788216dbd04d83d77add172a9971ebb78665382cc1fb5b27536fb22b05e6dab07e4a85ba9 WHIRLPOOL 7808ff87ed3353bc47e6ec724bf3838b8439882f20fc25f492c91b82fe8a509546f8da21a2b42e4f947ded07f021c675fd92ff31defc9a5ef3fa15169f003110
+DIST firefox-31.8.0esr-sv-SE.xpi 399025 SHA256 b206a17c8ef70b9988cbb1709522c088f00770f3c286b39ed157ba50965a2e6f SHA512 a2ed54600bcf0839fafd2c396f8cb6d57a19d6f8cf5daaec84f38af4de343ee7315ebc85c5547456562ffdf4009aeea11b4a5aaf067ebff489901c58c933f111 WHIRLPOOL 2b403d95f42815b2cb59b2ec010286ce7ebd7a1215098c1bb21f3c0f04ae3baf71dc8ba0e870b0e73eb0bc87cb0993a11d986bb3099e1d882b9b622430db2b56
+DIST firefox-31.8.0esr-ta.xpi 447686 SHA256 b395ced53e4c173b5593ece896a8dc6f82d92049c11bd7704eb85883407117a6 SHA512 301e07f8846193afbdff63b0af6f1b6ebd8874bec811863a244747ae83e62028675f08a67fce21f6cbc27da2843880ecdbd8879c72db494cd0b65e5b4e84e83f WHIRLPOOL 99069b1f080d27e93636389f234379cebc226b19b4cf7d445be2f47de0d45bf211414e7b1a3a196572b9c9ddfd79f67a465c5ccb0f7665caa079f2bd3c6a7666
+DIST firefox-31.8.0esr-te.xpi 462591 SHA256 22c74ff5e08fa97ae208f835da1350507637661e919b7324e52c98a4cf95e6dc SHA512 6c9cb5b3f7bc9a73ba88cbd1f7a1a2fe4f9d38b291917de2feb09218eba4ec1ff3759de726a0e20e6b8261b4e9756d93bbbcfa92da1051f423d385522cfcead5 WHIRLPOOL 1278d2c174af3902e82b4fcb7a5ddfe22e23bbde5f0a38906c89854d97f693aede9873823fbc2603bab7aa8475abfbfe7f3a8424790f66317d7d61285e84a265
+DIST firefox-31.8.0esr-th.xpi 478126 SHA256 d2d2cc9c931e9e94005cc843fa21d016534dc306a3db699ad4ca6825d29ea5c1 SHA512 4dcfaa04b9aa9ab5b4238d4bbfade697865bd192fe522ab01def67cd5175042272a41c375bf14c2f79a90029bb90947305d4ecfb17efd7ec7b3181814a0769ff WHIRLPOOL b95b2cf6e2f9ea9deaeadaf9887f3600e974e1e5202720b0dd716a3b9be35c2d69b4f0ae96c23a31842599ca4127f7115bd45634055b57662b93a787731f519c
+DIST firefox-31.8.0esr-tr.xpi 417370 SHA256 56d5adb4b0802c644af1d6b3a864988c4f4d860ade2b99b3b3930e44c35807c6 SHA512 171d02fd5e1fa5e3434b9419962b5283f91c010824ccc2d57dd68a722605bdd430d9c726413573b9199db10af5bae4de80c9f0d1046580e08c487db08b346779 WHIRLPOOL ee1bd97fe5d54735fcfd7f34b55a7194197a0e7a64df139b7a8e0e0981cb38685f4de288a702818c205c7c15fc334dec70d6a7fea2e1b14d89dc16a0df64a2b9
+DIST firefox-31.8.0esr-uk.xpi 428003 SHA256 1690d412de9898d6159dcfce6d5793cc3180e6be04e12d2a441bdd07d9c2f91c SHA512 b7e78bcca5e828ea30fa3d2d22cb302c501e6f9f93be8eb890b3953c6ff38da18b013c39f172e39d89a1ac7eb6c54a0a4fdc6339edcdc6872794a7cbcc4fa1b6 WHIRLPOOL d36b790193cc7fa9b732025f5973b5f14398257ad70890dbf9ef16172fa233ae6ac74943ce7a7a9e7a3da0aa034b1719ce9b545d2cf5cce4698e3c36493cb9ae
+DIST firefox-31.8.0esr-vi.xpi 413374 SHA256 4d003ff580b4482324fde6d55b1faf8626bb3e7f5c0c73a39258a0e530b8ad97 SHA512 76cb6f38bb07d978267fbc5676c3ca37c2e9aca21b7d9e6a0105b109b6ba649ef174a378475c0dc64e400468b5d342e5bb9fc9920d73b3a8a487831b4b4889e4 WHIRLPOOL dd1a4675033e415e59f39aa9ee07fbcfec2ed7ef8f7bde45a1eb590dbecbfdd5363e9a46e3f1061c2c62c57fec712b8f19cdde28e95af1056cf0cd9e8e7bd6f2
+DIST firefox-31.8.0esr-xh.xpi 397876 SHA256 cc7d30aa4b3eaf4ce9d44ba4b97fbd223d2335d10187147b85db512b34e1bbe5 SHA512 cfa2ba7049346479abbe869916f08fb2b2c4ea3774370ec1ae01ade21deab76e4e3c1988d25bf86a4cc748592cd497314691aa76aaa2aa372e96e6ac0c2b18e5 WHIRLPOOL 58198b4017e935606e0f18b5d905edd93449fd3588a8ccdd5472bb535d89e268144c719da31982ef8a1be68d1ed3ae7eb8dee3640d39576f4b2f777a59e44456
+DIST firefox-31.8.0esr-zh-CN.xpi 419630 SHA256 b9d236eee6f4f6a69190ff80c4d120f47985e1b91998a4ac89fc78f607d4be6b SHA512 e8266ac4e70e8f9070079ca53777c97b1552cdddf10dfa52da6b2c12d6510672d40973e064fb7246c55c043f57c8c21af31fa976842e1f85ec57bb357dcd899b WHIRLPOOL 1696b223430308e2493d16986e2f1170dfbd752cecb33fd43a5de9e47bffd14e6be70aa569aec6f88894e90666d14b31b0f190d69262bc76692d914464de57ae
+DIST firefox-31.8.0esr-zh-TW.xpi 412520 SHA256 b5c6a77f6e9a1f1e6c6660eddea900f02693d1c663d57b68ff0a23bf48c706b1 SHA512 3bc902a342cd03d32133e079c3fa475933aee21472828f0ec081834e9c020b3db6fac92b377c39e8c5e55edf480246bcd3701e0d7c071dcf57cc84b5210bd3ca WHIRLPOOL 6dd04344d56a9428f5b997a2764dfa26b660579c375328440be92403681e8a38c35e1ae7373342ab3a9613be2a3721c8bb04b7df6f430f9057d01ff2930dc5d8
+DIST firefox-31.8.0esr-zu.xpi 433216 SHA256 d25e233dd05c4363b52502511ca8da2be227acf2471a8fd5ea229751c3e67b05 SHA512 24f613c09f23f7620ea8e95bd29c4f884844aeb6819408e16b3c32257c80c1e70c09725e7cdab480e99334aedd1e422724fb8fb2add1282c1d4fdcc95f661053 WHIRLPOOL 73b55307402cd69233ab9d7fb56916475507c0a48659bdb156d9b4c45672f427d4a1647bfe6cb90a5868b96ebfb9b6a72fb2981e43a135f641f0f5e4c10bcb10
+DIST firefox-31.8.0esr.source.tar.bz2 148730951 SHA256 4c14021637ba61690ac2b52eff31c9bb96e4a04d334bf934d33932c9c382c50c SHA512 4f98aea568fb8f6c2bbef8cb509af3b4ebd8a17360fc1b3908d1dcb53f94f457c125e14619d3bf78c68123a3be107830d83cfac51bd7c5ad75dc2ee46b2d705b WHIRLPOOL f7edc60bf22942e521cb12dff24f8da4a582b07e7f3e060246ae533189f1e812ab791f41ca4e432619ecefbd8cd4fce4fc8d57b4f9f0d5a620b6efae473204f0
+DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
+DIST firefox-38.1.0esr-af.xpi 483325 SHA256 1a4c6835db2ba384767f6ceddf021a30b61c1d29f17577cf2f7330e3358c9ff7 SHA512 44c08b31c3c1c3160c4e992a01bb2eeb30c8177956b29d09be336970521a7671f1847dd88122973236f34bd5559a9d69bdefc271386f6cda8edf90be520f34e1 WHIRLPOOL a104dfcfd811424d53e1bb4d85d20b7a4d56dff6275d94ac180073f5abc770bf81e0cfa6fa7a6a98f29bc76b687e58071a4c7dbea51a638019a3e6fb5295864f
+DIST firefox-38.1.0esr-ar.xpi 516495 SHA256 47eef2d1bfa6e5594cd8835bddca7bfd5019aac1553b54b05c1c749fad659dda SHA512 156891397a303d80833bcfdb459ff79f252257c5b9a7d9af5df334772b855f3c19d82af8daf3b6a1c205d63cc508fc57a75b85c756e22813b7a680784cf5289d WHIRLPOOL 2d8ab97d91087bafeeea01174da694d8de9e12fb0854e5b770f80822f1b72246c65ae7d6f7c993908883bf138fc6732f6aa62f40263b42f609506001a3dd39b1
+DIST firefox-38.1.0esr-as.xpi 509574 SHA256 1628e61d5bb7e7c4cbdff288ca2e6d8623578ccf12797e63b27864e68be21c1c SHA512 91a86f97b6e93a65dee7e6c2fafa2f7f5eab7df6a92c1d5f5c3afa4fcdb3b2572d9a36c3e277371a17819ab34001050b13602bca759485b47972e52895158439 WHIRLPOOL f482f546e3431a9f08a964ca9931988b5104c33850165c7f0cc500873ad8525d8266c1c513d780d227608681a47f55a635cf66619ea87e01e649b99f607530ad
+DIST firefox-38.1.0esr-ast.xpi 397202 SHA256 bfe8b26cffb80f7cc0824dc08546f31d54da190bf8fd342b12204ecdc85977e7 SHA512 c8c53c37c3e1700dbfb7a0a24d92d0ad886cb8004e96359887c53c4ae84239d4aa7e636aea46498d5007ffc814424a34d5218615e18e9da980ba5752a48c2aa5 WHIRLPOOL f06955af6158a6990c3fc62a8e0b33925adcf4575de9dec1c3192e5a14b3db1f76afcf1723a2f6ef38bf3d0cb47a278c9083027cdf7ea5bfaa1cbda471c61117
+DIST firefox-38.1.0esr-be.xpi 441056 SHA256 ff7583b04c4e57128f0165ecd94488bca77cf4a84bf0284f313f9aca2c885faf SHA512 16302e03d61f951261977cfe4e4eb17fbe3236ca17905898801a178511b6340f7d02bb72dd2736100ff34ae5cf0446e648662342a7a959cfbcfec2fd938d67f4 WHIRLPOOL 9b4bbbd4e8021005297ce745e793ab79b08c2b0911cab3a0cbc85af8f427387c4b867647c80fed2147e53624988561877aecb304a67827c65b3d55cdefe01e70
+DIST firefox-38.1.0esr-bg.xpi 487819 SHA256 5096d0dc1ff5e547fb07906e0a3183b3117a6453311fb28afa991db5c34c95d1 SHA512 8d41f639af3cf2e69891bdeedd791c4ad59aec6f44e8e4eed1583fab2bf0aeee36b20f7a6dc3f604b669b6c2d55bb21d3a4d1d03b99d5bbde8da6dc18349cec5 WHIRLPOOL 3e9fd269c277df8e403df154be342b0313c764ff46fe7664a45f712eece126160ff38090f9bc40f142c3ec905830fc08657fcb4070adad57e13b695065868978
+DIST firefox-38.1.0esr-bn-BD.xpi 528688 SHA256 2ca791e8a573f76f60698b3b634cf9c0768eee657ba6e99f65c0f8979e152216 SHA512 2ad035fe503183cfe90f5023dc92f3d997e8c11c77777db25faca0bcd0037fcc2c63417a43400d7181e89688df9d1d4ac45f0466ab5374cb0458de0887ef8b7c WHIRLPOOL 8c7b880968f04c401a756d7d4cbdb93944f9bb365524203c05f91aa6f1d6fb8b694605d14d4e5e8c2ceed4fd8e5ad64baaea6fb524fbabf8ad7a8599cc54d462
+DIST firefox-38.1.0esr-bn-IN.xpi 527927 SHA256 b664469d76782fe549f582b79cb88d8350d439038ee1eaa7a7388fd5b3cb1eff SHA512 97a315ef001e6d4dd76c3886668d356505247155add36f5bbb186c3c0730e69586ed07dc2d2c06872b0a281839e9daa03721214c5e286ef502df0b9efde37989 WHIRLPOOL 583767cd69f977e3293ef39d91f199ba218b720f41070f7634a19a0093372f0e67a5b4496c57e6cbd736283ecdd483fabae45c63665eb19609db463a7f7cf507
+DIST firefox-38.1.0esr-br.xpi 441962 SHA256 57ee679bb3532a0e9289827d4fb421598683ea8168656889edddcff1e21bb6b9 SHA512 64cb77643cfb9b612f2c162398985b514287644b6914ec8a5bd7174639410ca77fdf037c1a4ecf035404a2e911be2a3fa99cae37b7456df8facbd3a6e1dde7bb WHIRLPOOL 14f2524210ce009b829f501da3c00fca120c309de192b9339319b77cabe6904417e230c125b1ed51c41725dc090a947838b7efa063f8df4d9402dee9a6e9e782
+DIST firefox-38.1.0esr-bs.xpi 485305 SHA256 92b42a21fdd59775f65f13316e875f93f7478695aa70ab02016f3145c79a3aea SHA512 1e17bf0fa120c0dff172322de6229886b7dc1c009e6ea5e3c1819084343e80a7c23369059ca2e2bc7941ea4a44a2e4561c2d29a537014fcc770e2a7cf7aebaf0 WHIRLPOOL b74c4e0c6c018b24c82cc5813bac1572ad97988fbf1400a4aa72ab98db40b690758f6482437ba38706e302e42063802aec08e33cd2e90df6fad1259a23c81843
+DIST firefox-38.1.0esr-ca.xpi 458091 SHA256 53c42f1501f90ddd9259ca255baae8a7ea6a1055fa88acc0cd1de9d8a20db2b9 SHA512 291be1770d900c4890c89a2d694ba624b2fd33d82ee8ec883169bf616730bddda2f30f55661b11e254528e0bd2c8137cd89a37bff81e166a9a0af48e8a9b0ca1 WHIRLPOOL 41309aac9a935a8767e2380a56d91189dfadb165b0edd4e4b71f5f74e756f031854fe23f285d035da7fece5db3cd7a71140915936c3e45469a5bd8addb8eabaf
+DIST firefox-38.1.0esr-cs.xpi 446725 SHA256 a23e9ea357bd08c5029d31d6865516efc5ff3aa8504dae8dc316af5efc859fa9 SHA512 5ebec9a541fdb1da3eb2d8584f8933bab4386b283c6d4f9a494e1e6f98080d3515cd8a640323063dafb441138b4bd639e7bbe1397f13e4a4711306d541cdf8b3 WHIRLPOOL 01a0e01853e427dacd2e4b0a39e8a55b934c6fa1df3d37973db6258f720668d58874199e54ff48048517104979cc8bdad193c02d86e0c8a8dfae7275f5b17234
+DIST firefox-38.1.0esr-cy.xpi 444384 SHA256 464c9b57d03fbaff4a6241dfa492623a338018a609e2289defeba196ab454b95 SHA512 77c3dc09cdd56993085560c54663c27fc7233c65503ea9bf0d161f18b85e15d51ff9169cb3743c44f3df4ab421cbc539a64f8af03dd84b87de41a1a673753264 WHIRLPOOL 378aef3c70515f0f8a6f6916623e07f1f4909f9fcb9bdb30877c08ac8bdd89934ee45e8a80855e61fdfa6fd411e7c6b8e46ba4f45b566138efb05c37ac3f1dfd
+DIST firefox-38.1.0esr-da.xpi 450762 SHA256 2b339c9a73067076f4ca8b28d9d8543064be5616dd4db50cf0bf1ed0e4cea3c2 SHA512 72dd54fd0f0c7cb8da9627eef6aba8102cd14e43f7e3209cecd8a0e72fc90b13f46a06820e4ec2376510a98f3067dfe4485cb927ae088b9e9f12e23722785525 WHIRLPOOL 048118e6bb8191f36a3d28a7831f4d269f95c826e2db7d3bdfd05b6537e8236adb901a74e562494680b459b4ffa5cc4182c8782d69a6de4e32517deccdaf8127
+DIST firefox-38.1.0esr-de.xpi 451628 SHA256 bb0aca584ae740caa4cd2adeab2de09670c38ec8dd0241512318201b3ed6d761 SHA512 da152309ac2c5ce67562a7a910f060ce30e06de78668f95fa36da07839d5723bd6c7f59ce1f30adf9aba75233ec025965c7d4473bf7a197292daf8e5a676ef35 WHIRLPOOL 296eb6cc6ea9928229ffee5601c97eb56f9fcc78da6bd4ba2913e7219358572f69e7f6a044973bf9d6b97961ed1c88bbc7bf36986b0fc3ea98c2e8ccfcc6b2b7
+DIST firefox-38.1.0esr-el.xpi 498369 SHA256 96e8b36888ccadce8d576208a76ab6522c3148c501bc35549e25bce545c11a01 SHA512 46116ff3a9bed023dca6e0a6a59748efaa143a0f2b95036ba7c9aa2a45449b3cc720b2d9b4db059f551e720b8628f4b18eb3f293b8083b0156530a7395d94cdf WHIRLPOOL 4256e6187300a36a706d3655ad9741f6b0471e04e6f680e488a1529615b1f054948c08a5c2914f125be504feabdcac28a328ada37a87a976de15449af815f7aa
+DIST firefox-38.1.0esr-en-GB.xpi 437845 SHA256 3f80590f27a73d5cb50b56b7658c38f4378f0bb1b84d3da4c2e0cd9a7b8f4120 SHA512 0638702cc485a9b87262c1707fb0f549a3680afad6531beda6b21a48c8a5e6477c88efbbad5f27fc5736117a7e2d1a35dd6c9b26a647e03d2aba6130d65a7256 WHIRLPOOL 8e422d5be0bcf758c8c74eb0631f7bfc786ab3e5d053d52e61361051ba54377f34f12fec6dd4c1380aa18f84710cc56d88823730b1ae8e281e6f5f9c2bd41c95
+DIST firefox-38.1.0esr-en-ZA.xpi 439925 SHA256 6d3a854cffcb9a6ff37a6ae4b2b9a91da3fd16914ea4cd70f69ad3039b960ceb SHA512 175ce315f0a39f26ecd3850b693b4f643726196b508fe1dca3c355d4ecb20b5f029274425a29eaad45a4f8679b61ca1925074b556ed7b64754f47514442655fb WHIRLPOOL 4f5a7443565bd374e942c985a5f0ed4c09ff54b8618dd71282fba979b8495b877de490652ed8466ba27b690bb8abda4de50088c807bcd298fbb745991a14d749
+DIST firefox-38.1.0esr-eo.xpi 488369 SHA256 ac159c4a6b9dfb3b838dd757350cdfa92d7322c772e46bf79fbfce8d7e03b433 SHA512 0e2164754865e3431387b1b5c85841cb7eafd66108ac9132c576aedc6db6b57b9aebef2539dbb197f0fbf3e9b43a30871d458d9ed7d01b9728e0054622a5b7a8 WHIRLPOOL 288e0e497dfc3144fff31a11c34d623da5951d0e292bf9897d32eecd94cd6825b53bbd8c998a844f3eddd31e7e66c93d87b769867b2fb4244d2c2ba1479f050f
+DIST firefox-38.1.0esr-es-AR.xpi 453982 SHA256 7410081864264d57267ffb4795aac402a72d30e369e4aa6ec2df6501c77ead8f SHA512 080c59d8bdaaebcf33eacf30065c609e570d0b6bf8dc38df8093512a992a06efecb0ec93fb0413c5d123cca21128a1707fbd60f4aa46941c48041349f833c398 WHIRLPOOL cba1a10bd71206f6276e97802babba7a9868d80fb5d0111d2213f189da31490d19104a8c187c9ceaaae38b8628bf1d1799798cac7b91abc5e340775a3f8dad61
+DIST firefox-38.1.0esr-es-CL.xpi 384678 SHA256 f5979bcfc6576cd6796a555617966c4f7c42d90bba52dc281824d09f7ca2ba01 SHA512 ba7338c60739f20d11c930a18426c634809571237cb9e035265a055022542aa4b70eff4cf40e240aea5493563ccf719dad6d2823bc33a4ee97964f3b543199d1 WHIRLPOOL 324967eabb9f269a2f20979bf7e37c0d41f8afc27889d39197d569dc1a3a2a00880d2900fc047d3ce47a3caaf1900d264c34aff81a809fc74825eb51fd5a9694
+DIST firefox-38.1.0esr-es-ES.xpi 374072 SHA256 87e28415879608af646ab9a531108c74b18a8b94f7a472439841ed7b79240537 SHA512 9eefc913d35b3f98a8578635ebb7bc82f327b4dfb4354f75d90b2058555ac096936a9b4da2086720c5cd98f35c7d6c3683146f0e8bfbf705bd6101e8c5793814 WHIRLPOOL 931f104fe98ec1459c8cb18ff5c3744b7002a964ec6072b159a25267b4ebe3b2d21547f797d9c61ba6ba7fb91efbb5f064c3e1103b7b86d01b62f3b7b9d70976
+DIST firefox-38.1.0esr-es-MX.xpi 457049 SHA256 aa8e47ac74821a900eac826459e9fefb0eb8c0de77ee1b5246a55e23a369f4b8 SHA512 b1c3aad20e2bef48cc383903e371793e416fda9348785a109fb15d6ed57976e89b6b62f4f4e86d015741f1e040ef5644ca73fd857f18e47f52b4ac1136ec5c0a WHIRLPOOL ddc8eba52ac75ea0350cf428aae38b0253ced2bd0ae695a9ee5ff8ee5e2c60b98e974047237d7a5b0c0a5decbe602fec2b4bacd1ef20cc4e84ded8c2ffb2cfa1
+DIST firefox-38.1.0esr-et.xpi 443228 SHA256 76e0e0480e62cc5187e6cf97845d61d835a16b883582cd8a27ef2b6e74c3d69c SHA512 4ba06efaf8005320c945f7b5f87573426d1db0fa37b40bce07cd8ad2be43825ec25702fd650eccbf74d30f6f2ddd0afc56049d9a0d0ae40f9b51e33e8c179878 WHIRLPOOL 74a6d578e5a3fe796f7808c6924d6b75c761c416bc625898fb8454acd4630109debff3ed15de7b91e1980bc4758535f7b81147904a2927a4e44c31ef5b4c410e
+DIST firefox-38.1.0esr-eu.xpi 466554 SHA256 ecac2d452d2a4e4165970a1aed2a0ae6bff8212c0d6dc0687e5782758d5d72d9 SHA512 88782463af0accd5fc34e563be9684c06df1f0bde614d126cea168ec0aa478408dd7de7242508f103bb36314785e46a5db8f9097f07aaa26b28eccd568e6f385 WHIRLPOOL 269569ec6d51492a036a119349cc00a2fa623bf91e0ccea8b9dc1a6be81f4c0dd3f6e706c07680c3bff82888a80fcb60174e8432e20bdbb80e1494acafb2f101
+DIST firefox-38.1.0esr-fa.xpi 518281 SHA256 90bbd088bff3a41dfc752f695f0184e68d5621ffdaa17536a989067bc2f4f7de SHA512 445ecf02e55fcfdf78397eb9853e193504c10e36f5c32ae6679d954066c438b4c4b24dedbccef9b58b2c4dad6ca352170cc509f3a98afde02451cb6ef867a45e WHIRLPOOL 2969548537a7fbe0e95e959c2729f66002a1db01d518cdaf080ef7e26dd7af3ea67629fd49ef94f65d98aa56187d6dcfe13034936722b97cb01bc9e8acfc19df
+DIST firefox-38.1.0esr-fi.xpi 444852 SHA256 6d1a14149420b2d851673c58308cff8b5218a4e9835b60d5a5274d2edf367635 SHA512 a46f8f0de6609285f53b72b38b5a198360e885a487c6eb30f4436982ad9e18379927a3fb17f18c123ef729ee68bbe7118f1755fe42226367979fc3e6119c73a4 WHIRLPOOL 8ef2f19adb8a41701d9b4e7451b94fec212162dea8fcf21fc66dc304ee128358cbeb7dbe2084e8a0ecf40628e484efe33428ad27bf08dd9dd78ccf09ad81b969
+DIST firefox-38.1.0esr-fr.xpi 461401 SHA256 8e416c8c930e09adb020ede16d420fd94a4e0e169d3a40213e33db94dee44d6b SHA512 d94258cfb505c9b6d138c9ee522624d6b08b69ac7f5ad086bff95848ed637bf5e818bcb4485e11c10803e0d51ea1f575c9214ed8c34beb1e921858546bf0a863 WHIRLPOOL 75285ba8d7ef8717fe133257645768891551ddacf98abd3cb6663105bf21fc6732b256d752baf398d3ddae650edc9499eda4cfb25d930e2a207ccb45f12bacbd
+DIST firefox-38.1.0esr-fy-NL.xpi 455537 SHA256 f6f06bac70b7edd570510deed989e3184d08a42a7e49a7e7960ed1f6a705e0a0 SHA512 3c0ce9c1ee4c2082afda684e6d4fe87065dfe8ed21b87cc25e8317d0ce059bf39d60c9e4b1de559cdac6d85a7cdd72cfe7dc426457281114cd9c73a5f913a073 WHIRLPOOL 1d0b2e438a5771417975cc84f83292460b8922d43f3a7be4309991aceb02f1c731ce60a583442d8664ff649349b6ae3d147b6c41125509283244c42ebe32872a
+DIST firefox-38.1.0esr-ga-IE.xpi 469623 SHA256 39ae1a583ac7be57fb3631e98734008823fe735ac679a173efe8729ef66e295c SHA512 d8030249f2c21792ecda79a0c2eea7d45e9562c70e737f379010c1262fb003980bb1b9671605742ab1d0a2097b6d9e37a3d1d3e2a0aaba7361cdc1775d1451b3 WHIRLPOOL 869c550ee6d967561c2a5620116574a26ebb0bb22e639779341915da7e824ac9df8b64e1b35208889a3b1049b9fcdce3d6ad592c408b38d1ba5d5c3ca2074763
+DIST firefox-38.1.0esr-gd.xpi 454616 SHA256 c38b1152552c91e0531eb4536b2727bc72c1c9397679d8b42003dbf7dab1be7d SHA512 daa1d8ec24c2048d6319552dda2f009140200d1d932b5d903d1a1f577168c0a0797112d5f630b74d1f52fb9c8d73d8ce4da339be2f0931055ac652e2b4dd8a93 WHIRLPOOL 98c52d9e44202d68011686340e08b4b525bb1b3d8a2b4df5d5ac1b05d0f36d267107377ceffa98239b5b6cb505fd5e776e1bea14b8a175c95072dd8a6cbb1c59
+DIST firefox-38.1.0esr-gl.xpi 448924 SHA256 d8ad198ce7afef708e7974384cac5b646efa58c1b914c0e58a0c19569276ac9d SHA512 0e32926e68e54edde06fba692b476c24260cfd856e23781e50a92eb74f583f76d9e3fa99ca3aa131f5513102d7c6696dd9aedd13c41763c1edc40e37eb8a4fe3 WHIRLPOOL 9781cf33d8fa7fa604962fe836123b5e881b8ff4d588cefe548df56a0dabf32b391d763ff43999258d55cbb59755501918f5dcb7cb0272b8f4b1600e6564cad2
+DIST firefox-38.1.0esr-gu-IN.xpi 477980 SHA256 dc03e9021e27b9c5d41be2c9e569da7165176f2139872fc5694500edd71e7102 SHA512 6df194c34585cbcd1faaff40ab30f2f629db88c68fd9d1399ff3b000ef2ffb7bfccc345fb46ae3be2fb0446f0d9fb489524342953f0a7b352511cb3ffbb833ad WHIRLPOOL c57f02d0dd0efe875f207e2ea138a95300fb111b8f0631d3c9b33c70330d5e19b2e2a0e7879b3b5e3547205e42f87ff4456e86aadffde9cff3aeb2cb87f8e9f7
+DIST firefox-38.1.0esr-he.xpi 486784 SHA256 4d67723435a899817745f8141c7671fd8c0ed899db6b9fc040a7cf77a997113a SHA512 e17ccdd2f672fd3411379bc9ec7d7960d60aa3174ade86a8cebb19e6baf1e9657c9735f76336a18ed4d50b8b4b5e1745043df91c3acedb9caf61ba73913354f3 WHIRLPOOL 1146c484edd970e9704341a7e8856dd06f4d977f5035f3e859df14d275804c3a6c9b83dfdf50757eab6284f5f705143fbaf43ef43d744b6c41ca66c4625e0cd5
+DIST firefox-38.1.0esr-hi-IN.xpi 508166 SHA256 3404e4a912049d583508619d92fb37663629cddc09f91f2c6f6e007fcbd1a281 SHA512 18ba745bcb565ecd59cc79a47ef18941bd1b576c6b2f25152cbc2b1c66360f4cdcb53f12fc2e48d07033650948409478d9357e3c90bd43d10867d4ca63bbf549 WHIRLPOOL 642c9a47166a431d198893a2f7a932e257cec46310d821081ffbcb46533edb8be0f0d29f3f188cc502635d97a5eed8b9c3d1b839d00b99bd5ef5e4a5fed75935
+DIST firefox-38.1.0esr-hr.xpi 478271 SHA256 98487a75721efbb651b30d94fc00edac8962ca4aa0f356c714aae1761ed1650b SHA512 331c338552dd0fd1609ff71d0e73e02c28153b8c3cbeeb3e139effb456f9ee77bb143c31c5b3351e9de5a309500ec0084e93956cd47e522ff0d4a68af67361e0 WHIRLPOOL 185cedfaecadc40210abde065fa778478731ec5b638fc70187bfcee25a3179fe20cd0fa4f2a65ba6c7446a1f9d6d36324ca4455ab7dbd623a6cb596127106cb8
+DIST firefox-38.1.0esr-hu.xpi 453554 SHA256 93ace7ddee6b87c2a3cdfeedce151ced7354d3504d0d7e1aee8f2368094cabc0 SHA512 b242c2ef11baccf88bc26139c096a6e4a2d4e365a45374698836533b1022f8297fcbdb7abee8051dce1566324c7efb45f0ee20c0da1758d5cc8f8cd4443be302 WHIRLPOOL 216ea957fb0ddffd0ff6fb541f1c8be28eb27cad263c716dabc7f0798cfe65cc44f2cecca836b49ac76d7b88fd760c4819c2a3e1a71cc102d451923938c3211a
+DIST firefox-38.1.0esr-hy-AM.xpi 534264 SHA256 8c6a5918df7c1bdd36cdf9a5fe44400c53e2e8998dc910ad71ff29178299d63b SHA512 6de1b7ebe3d4c4938ac099a78066c0e033b38e577984fc6a717d625b7a1faf9c680ec8dbfc75fa5c197b3cc90b7f68cf0b0e9bf6eb39a2f21c7504c22d7c48f0 WHIRLPOOL e0792081df761f4f8b3919292e85853ae4afd151ec6a85eabca96a5c4f67aa853606a96b9b454cc40520f52885ffccde76d05f79f09d060ae3b1001f5a93743a
+DIST firefox-38.1.0esr-id.xpi 431488 SHA256 f37f250ba26bdf7cdb1f3d47a6bf7f7feb90ebd82da1a55ff4f11932af1da1e5 SHA512 eb104719516cfcdaed9a376bdbed6373a95d76dd771cd562fddf343dfc8a8902abcd28eb3dbe2209b1d17255b8651ed4826ed4119da59e9cf36a6188c8e213c7 WHIRLPOOL d97539d59a714c1b99d7a42d08027ccaba271a34622fa0e0cc5284de1c296add94de3854bb55d65d6f1061a2fb8216f70b5245c771576eeded0a9859497b284c
+DIST firefox-38.1.0esr-is.xpi 485128 SHA256 fa4eca6ec46e110683178b282f4bd3cc6b47b315e4ddbd34cd99b8c00676b297 SHA512 fa67d0bb81cebc6ba6a2b16710cc058c010d90ec94e33ae162d562c7dc222da3b716144197eb042cb1b3e9c1c1171ee1959c92b0b0c67cf91ee77786d33df390 WHIRLPOOL 5730f90435118c261aa078d8a1a505143b8c453d49bf20c91f90052c7187a1d701faa01119b175885f88cbba607e95492effee793d19dfbdd2b32b7631a1c2c6
+DIST firefox-38.1.0esr-it.xpi 368409 SHA256 42948d7424e1554ce71e34d34c63b1bd3b94bf067845b8826576591aeeba3bb9 SHA512 b003d2f17045b4c46024589a116354efd85b317c66fc9150c31eb3db1960547b3f8b98fc6602cb2041d1ae2f11413508b4d913bca2077c5629effcae04cfa41f WHIRLPOOL 38c938a8efbee891238cfb12081a84186fdc315d5b7e7487fa8a2752e022ebee13c71921d515e9c7b1700d4e67440d0dea5159980bce12971cafb2519b9ca9ce
+DIST firefox-38.1.0esr-ja.xpi 479113 SHA256 456e16ba61c0bb904cbfb3d05b184d6fc9d7cac7f346c7b38d9fe230af96e96d SHA512 42807e4e7455faf2ea4a97528ec035d22d2be6cef55d94b0644915c9cb5ee622e64b9746823763962aebc25a689f91316bf751afd150cc6171ee032c6502d772 WHIRLPOOL e97ff15cd89294c6e10e57a552409dca215f58eec9e40fceda82d8146d4389f4364c3708fa748c037f293711911fe8be425ba49fece835fd660e85fd9ed34642
+DIST firefox-38.1.0esr-kk.xpi 503567 SHA256 0c10adeca506e653e464285b1feaf049d79dbcb45e1820dfe6cbb13198422c5a SHA512 f44dbefe360fbb1be89b7809e03e854b462e0dbf7cf5f9507d41837288781662d0de8c498eeb46c06a830de01e4d49bf03e16bbd2bf0358bbc715a4319d4f478 WHIRLPOOL e276ec1abea8dc337b9d8cba7cafe408b37bde96ad8a30e85106455e5dba5b2eac04772cbcc8a786d74ca819f47391ee7cea3a8eb299fec3af0b3d3fad31e4c1
+DIST firefox-38.1.0esr-km.xpi 565673 SHA256 b94aff6d6093856b1726b1aa8d6ffa0ad2db3a897ea9ad6a5589fbffac6580a9 SHA512 7ed0defd378801e77f60202d11548be2a151db3803b84ccc09d283e212b68831dabb290000327b6eea921c58b5a27421b7edd11112f038c6b16ad690c1e04a07 WHIRLPOOL 9d2d1ef04f7cc9556c4be21c0e60b5f3937edc8c9863bab3d2b7c61612d9c445f353f294b68342c270155c9204be380092f3e746581eeaf37e2bc59eccd624c2
+DIST firefox-38.1.0esr-kn.xpi 533464 SHA256 72d4b3da5a920975904ba4f17b55826685ec71ffc4e952a946142210e2ae95eb SHA512 dfc0d0f81ebbb1b65de128fc7aae33eb667a49e5bb38841db2e7c2f14339dcdda4cda4835e0284daab8cb86fb0369bfa0f65cf14fd83287c166daae2fd952711 WHIRLPOOL 7f0850d3f653ae351b214493392d50d8ceb19929e71ae4750677283d91212df0091a6520f3ec5245c1a686f3371810e9084d42501997868d072772895606fd1c
+DIST firefox-38.1.0esr-ko.xpi 460853 SHA256 4caa6c2e11b1c0d9184cc688fcb5f9534ab74a1d87c2d7624a83c0fc1ea4699d SHA512 914b85d2533f060152255af58075c87354d03adc692fdea6cf00763127f86adb5a1b97a5bf713627cac03a8c82fc620c92f589abe9003ee3fe19dfbafeddc92f WHIRLPOOL 5dab91b00bc7e5162c06513d1152da4d3e7e0b4279af51e7bab52142e5c0776acab1026f1cae16d7319abca39eaf064ced26580eb89078b2adc684248f506bc7
+DIST firefox-38.1.0esr-lt.xpi 486451 SHA256 0a4c45516ba00ab84b2744690ff4e70ef624825238fa4c4cd6345db68be158e5 SHA512 e1b08b521f9d830533e1d690821d1b758a59dae7c47be09cfd36923b9de17342aed0f0dbcf6fa16a7dbdb303d58443190a967bfe451bd7e8ac517fe1dd596d40 WHIRLPOOL 3265588c35ff174f1af8488f883d49346c2369fe560cebb49738ad8f4f280b73989244c7388763d4da3db5c6935e11962102da2f5e064b127dbb4422ca877f34
+DIST firefox-38.1.0esr-lv.xpi 467197 SHA256 3f88098b580f7591a9a435ba93f06e73f6adb312d9a19ad4b756768b93bd3b1b SHA512 f4c30d0ee210e0f1a1b6ce2a09ba480798206535f3f7e576badc4bbf6daf90c850051c9486105852db72dd2bbaab1436f3b85c8af914ca2780aa0ee871eadf8d WHIRLPOOL f38e1f2b637f70569c62ce656f1f2a550c815dde8e063ab3427f44a237affe48bc46c457c04a3542d136f776169d01f1b9cbb4460fb2696d6cda841cfb005b80
+DIST firefox-38.1.0esr-mai.xpi 514665 SHA256 27473c24c7f66a9ed31ccda36d04bf98cc81f699bdfe4c5958de0abd9c5c6824 SHA512 a8072bc9a5d3ac02c34f8b59974be415de626f2d7a1c9e5bef4d820e925113ed416e7bb8083a478c962e845cb58e7b009715a044eb95b5ef42d9a15392e47fd0 WHIRLPOOL ddaef2e461f6f3276cd06935eff1e451017da3dbdef599d7d8fac76a55d486bd5ce7a7481e54981d6496bc1306363c192c9ab8d4285ae72bc81c8779a4d8e8b0
+DIST firefox-38.1.0esr-mk.xpi 529204 SHA256 6e2d2ac3b859eedc499041e2961cc1bf4b92316dd59526f14ff694fb4c2067b4 SHA512 d3967b6eb8f5361da3eeea6c5068b1b52e0a99481180c2f058e56258f9cf7a990f577151629f8585955c17a1a2273cfb0f82624463b05666faf789e47adf2f7e WHIRLPOOL 7bb366995b0c579a07588002d2602a554c3f3d7a7091e411fb9fd488d1e0d84f5dd7167ccc4431af06b6ce0f8d87d1f4fabf5e58be95f30365b9345fefa067c9
+DIST firefox-38.1.0esr-ml.xpi 528919 SHA256 f4d488f0207854450945af1230b70db6773bd94bad6804fdba4215bba921734f SHA512 33988f7cfe9e70fdb80efec8a360f727685e70ececb08a1906d5ba3cd691eeb69f8de2e1569a119357119720f85360337d2a2646e7ebf586cf0d93eed470ec94 WHIRLPOOL 2852006db226ef4b6902314e270dd8c00081800e2311ea7f2f24c4241002195388d1077611331b2a4565864c8eb329bbaa9f1631b715b74c23d2efcca1b9957e
+DIST firefox-38.1.0esr-mr.xpi 505961 SHA256 dd9caa414cc4ba76ec4161b246612cb008585b5662b4c911d1ca7058e86a54a5 SHA512 b6bcc08a5140d726b2eeeedc3bec6e10c9ddc21fba796f6ac8a0ac58cc8f06c16f8e4f94015610b288787b81166bb8cd80d6cf5a162604f000cb14a19208617e WHIRLPOOL b30e0a5f671a7d916c0b9642447664da5e8cbe905c0b46f6a684138e5b4e08588bbe5cd0299dcbfcf1627fae00f7784e4503a41e5ed02cbc44e9e07fa856212c
+DIST firefox-38.1.0esr-nb-NO.xpi 444176 SHA256 9b17997524d839b610e60b42cae25c512ea93f3fedad473e723a91289f839ca5 SHA512 cd3eb56660a28d8749cf5a1a89b90ddcbe52e6c2c2bcb1ebbb6210e528048a23c942ce6d8b05a7a7a0923a6f52657f1b1afc784767c137d04a0760297965615f WHIRLPOOL e13a59b6192e558d197f299d98fbf1d1b00e5f2ccd04194672d5f681ee5e5fbcd33bd21812747f058082c9ff050b44edbe4e7a1e114ff85521dc62270a4b7808
+DIST firefox-38.1.0esr-nl.xpi 443993 SHA256 8d1532bbbb2a843babfd5b46909f0af1457fc8c9c14145b693ad0ff91b3e90ef SHA512 7b813ac71df705c145ff7068817062af951dbdd489f7afbff2870f5d3f0b9de2d6927ad0f48bf98e97943ed644b9d6fe063f683cbe83911923d3ff5cd00fa003 WHIRLPOOL 218e9ca98853711908d21d76a732854ab5a3a9dc034302ad90a9685d7154639e0c97e47b1e29af16b104163fde071daa39e9aa2ebf723ba290ed2bbd4fe2990b
+DIST firefox-38.1.0esr-nn-NO.xpi 438451 SHA256 732a5be1501711e2aed2a5073dd6a3726095b8d3940765e4b368c74c2ad32c59 SHA512 6bfdabd0130f29abf0a44abe45054487a4f8d2b28aa88771a7f32ffc06191482acced58afc8106cd33e9041d3cdb97d8e41552f6833f41041a78cee52cf06ccb WHIRLPOOL 8ddad282522549996af32ae7bd2f98530db660eac7b822456943ac4bd819faced53d8dac0c8d2b8a1e791be2716211722f72e8408b167ee00cc32b4143bc5c15
+DIST firefox-38.1.0esr-or.xpi 527048 SHA256 1297c29d98f2b1952d05f50417ba383c28505dd316ab8fd7179be6f6805ba892 SHA512 2d73889329e5719fa7fc34802113b544ea96f4eda59092837d2fb41f0b1b4cd979649fc25adec19d5adda86a8e8b6f74857a8065c9158ead8dcbd33ce6aa438c WHIRLPOOL 51535f96d873c44b75e17f3ddb46e8142a801fb16a3492119c76967d8c532fc0ee751ad996e042e3cf7b486c03a6090dfe42ebe098c8b7fc0be45e67637545ba
+DIST firefox-38.1.0esr-pa-IN.xpi 493722 SHA256 d3ee939b7914194a87f5ea3b24e569c3c9486ca3d0b997e8303c2c9c42b3bf76 SHA512 b9e997814b5a19666d3fff5830e2ed3a6151bb7f058ce2f4ce1e5aca199ef6925c9c2af462b07906ab09c56a6efd58e690a197dc40cd37379964fd242ec546bb WHIRLPOOL 612ea817ba57eeda0a306f0a44c9158b11744af8d1d751c38cb65cb7a2ae2f652ba1a76511dbff89e3542e372b5704fbbd49ce67b2afd68ed535c1c40e7d4507
+DIST firefox-38.1.0esr-pl.xpi 406566 SHA256 8b88410da0376d2c14ccc3e3c0eb8a0031d60d048aebba176100854a17bc16b4 SHA512 d53ad13f6065007b5b244830a256b7a0187c05704d3c7c634e72156789e8ef7a656d2a9dac32201dd83d26f367b8daf7c7180e355ac0026936badefb412fd46d WHIRLPOOL 517b8269f4b25f8b50fe8c386d8e2ea099ab46cfdb4170f509e6ab5d5a9205c57d650915f9c4f54ac25861c63dc56d600ca382c8dfcd120111199f0f4a32492c
+DIST firefox-38.1.0esr-pt-BR.xpi 459812 SHA256 f1b89e40d210497e3a7ef45b7acbf42c9d0b0b7990efd35d94f04fd0247dfc53 SHA512 dd7130e8af67517fa6624989c6f6cca5c7dc216e563a397b10300991eb6b0a81946b4bf38eaad2ce36bd2d1818c929f3b2283be174f06b46e92335d8d95946eb WHIRLPOOL e144427bfc3bfe5c7b028a44679c5400470884c72b3f7bad554a32ebc7d314c17249c1a17d5853645177fc87f5ff5372228a07005e7f8ca679461b96e4e74ad4
+DIST firefox-38.1.0esr-pt-PT.xpi 439974 SHA256 23e456c3550b31d7596956dd9739ef317ae742137419d426a4326f277e1c0206 SHA512 7b6e70c9e03ea6040bb84c3e4538c48cd123a401a269d6c8eb66d7354d28416648e6b5221a9ffbb933a0eb5f88dfd1a0bc6ea021b141a38c25fe03d0816a7950 WHIRLPOOL 3928116eeaff077a8c5065ffb329ca826d025e3d6d82e0e7e47d42390d4f114de9bc6f72ebc0716964a5aa710d535dd1298487c3f0c4f3b91932cae272da35b0
+DIST firefox-38.1.0esr-rm.xpi 446286 SHA256 f305e7a119c349ec71d4000517f315867f8174147dbbf6178a715e27e9aca29b SHA512 da29a8aa7d77b5033b3684f8d8412e13078e75515761cae5cff9c6599063b44b630016281d2ce4e5dcbb785c5d50c32f4147add21c70ddea95da0cda3c971acc WHIRLPOOL 00c9522d93b2c8eb4f63eb8eb5a32e5e236c0b0ecfcf54a23c9461a25f26693de4abadd1aa8fb300f0e22752e72a010287ee74e77f216a2c9e0e3d12152bc668
+DIST firefox-38.1.0esr-ro.xpi 494078 SHA256 cd38ec29af9fbbc27ad61330d2804d57f999c98cebccf6333aa58d55c4e1db87 SHA512 122e3fe6dc05b9f1cb5ece62ad74da962ee0faf7c8742c19f12f011b2d1fcaaf0d75d4f46a50841e83b5a483c7bfdc30259f4bb7cc3128266849a2af8345386d WHIRLPOOL 09204f85fb099bf37d6563907eda6f508a4bf3b18a87e460bf559695b2cae1255a045cce30b3e8e9afce56546e17be53edef2d0d537f2ab433979e22de08ea1d
+DIST firefox-38.1.0esr-ru.xpi 414418 SHA256 b2c612a33a7e7126343644b3931749cd9de1421f8bb1aad283087f0ede074c31 SHA512 c5ca3471613d3a63b6cd7144e658701ed0ce91304f6bd3316b474ad22030dc2f9fc3b748e0dc8d393318f3c7d5ce8c4804766c1f8dfed559b9b8b0b8e7d441c1 WHIRLPOOL 4b3f4de6a2c544bc0e37bd448454d1c18f596f2ba42994a9f6069e392143d2e1e9dde26f4852d4d3455ab6f6b7cdd7829d99c372b40f6d0da9937c13270a2874
+DIST firefox-38.1.0esr-si.xpi 537392 SHA256 02de4fd1753d33e6b0c1d81dce2beec09dd01c1bff2c0e82864ec0700971bb68 SHA512 e241a5d9c5cd348c41035ee57a43b1729bada33c31397f6bbd80858261714d648628b19bdc3f4188211eb953eb3f5cd81cf0810fd7c2e7c2fd44d79436e97a9a WHIRLPOOL c2ec49d862b342ed79848c1f56a02bacc04fddf380e02bea79b0307beb727421cc1050f9da674695d4c3d5874569c9d9a8082e4608aa37b48082b26431d32d73
+DIST firefox-38.1.0esr-sk.xpi 469436 SHA256 2fb1510e200824e455dee3492c8de7c0dd6bc4925307c5069d454fdc9513ca9b SHA512 fb2a6b7e2471af642ea0390e4af6639bcaae251acad9deee6984229710dfe918757ab7fe400854183e32f022138f8f55d5ec4a0646580785526c3657eb8a322b WHIRLPOOL d0286d125279120029e23d28a1e367c59c7fc717ab7254d042b7858270eb130f0f9a7327dcdc266c202405782198653e8eb5dce9577a5add416ff777c95de9e4
+DIST firefox-38.1.0esr-sl.xpi 441593 SHA256 d5f5ae891561d7ea891f9eaeee4a417e76159f8ee2b6402580d71e155de5bf23 SHA512 ca26e2f08fc1d6b54e9638f3780b67b4e633da1664c12046b20d9d5129e4ce5e216e72f9d1bf963776a56acdddab68d963b0f3ebf1e49b273f48dc5570f32659 WHIRLPOOL ceea1c1c87c63d6189cb3c509c6dd20e75d609ef055d38531c9eaf7543c68f5fc9f73bbbfd5597bf3b1a7a77b0124c0e0b938be54b38024cc15832c6efcf7935
+DIST firefox-38.1.0esr-son.xpi 449266 SHA256 9fa1b158b3ca08335ca6c9bcf70fd76e6b4baab6cfdb667475188aaacc2f2193 SHA512 e553663ba9aa037f38fa4d6d7d0a8b84102b6125a7ab981ac103f8d75e5b13503cf8c39c1edbb8eb9650afa1579e19aceb7137820bc43f421524e4b9853dc3ba WHIRLPOOL 0ad169698de31cda57dc89c80706930d6904608c285c11bd22d88ed5a0a9f01915bf8162ac4c1e740c3fa1e80a3d25a05bd312c7816c51e9ec2de0495ec8d423
+DIST firefox-38.1.0esr-sq.xpi 486075 SHA256 94d82f9dcf552f6e696e14d17ea9da388de8f5231e72bed6a0eef8b7426f6097 SHA512 841ff9c57be749c31bb153877adce04879a7aeab4b0fd333ef8135278c60e9655eeb68943d0bf9ee86d8db50d8a3aa9343336470cb4fce7d0629f9ceeb48995c WHIRLPOOL c1504b46519cada6c1438bdf25a59c7d8ab9e075c7ffb53667531a0ad0a5f61550a74b4c07be0a48d88390f762ca5419716161babdcf3787a6c177400792d35b
+DIST firefox-38.1.0esr-sr.xpi 479418 SHA256 f63271245f4919db7b86e9740a5128f50db750fe747e98343b1641291e7be1d3 SHA512 de11cd182d1660e45e4cc243198ea78cd075cac289d16f77a4affeebcf1fcd5497576457dcd999e36cb95c91d980732c88309784401a4c96b8b104d8c5941451 WHIRLPOOL 68d060db63956b7c9fe4fa888c692a590513fcca8b168c9a8195b282e8acbc691bc0586af46c57d54c758624f6fa99a976ac48596e49b4ead461230fcb1cea1c
+DIST firefox-38.1.0esr-sv-SE.xpi 452631 SHA256 724e6ed7ad69ea5a612185851d1bcc39eb46e9cdaaee9032609637516b2fb4fc SHA512 b7fba08d210e919f8efc70d521d6a86b953d9333251f1bfe17cc22ee56c45e9dc3a0187deb58a83544cdca0ea4464f3acccdb7958a0c29256a002163371a5654 WHIRLPOOL 621bf8069be7144e84dc23c97697aac00bff166b4d9f502b7e941c32db60bd2178435ec7f7da3b26fa542ecbb4b1bfe5dc4bf976aa5e1ba36edb929fdfbe725e
+DIST firefox-38.1.0esr-ta.xpi 506605 SHA256 f0fc43a9cfde17cb71a3c1adef1ec4ae53201d0246528216f7c62fa93d5ca621 SHA512 d43581469d6696c79b90c7da00a5d92f02943c2663de2db66d3bcb67de91264ecce05e3a68799aab245135ef115dff740d42b8e8696ae8659a24316c169b137b WHIRLPOOL 1803833c7bbdd9115642b9f9a400518d4bfeaf64a3a8540b237e8f2b9d27e901e0f1916cf47c65b8c4580e511c755067565e0b705830351455ea093f0a979ab4
+DIST firefox-38.1.0esr-te.xpi 526252 SHA256 47024b3c034826560b19281b5346d3c79b46b86c308d15c98acc5898545c47a5 SHA512 82f60c5ef042f5443710aaf795e848f488f070cbca7f3526b69c7197d0460d5460072279d1c042b483739373f2f2f04efb914846ce30bad4214a41f36fa14c9b WHIRLPOOL a817b3751a5555d5f0b41da3bacc5c26ccaf54b6ad67687ac12a4d656f3a0a1571225543ce40c9947a83e8d98e428b564094d363fd68e676965ef16073f778f5
+DIST firefox-38.1.0esr-th.xpi 534269 SHA256 f99a2d738ee379bde70fc472626611365054eb25165c613824180d8ee7d53454 SHA512 fc9e8bcde0ba1e49fecf5fba7d27fbdb23a40175b97003b2b19c7e2080c3c63d4bc8def68000768ed095a8aab1c5732c9d9da08f7b2474594d1f5a100d81c6ae WHIRLPOOL 5d14e9cc6e28d79c0c250ee5390310651b88a714999e5c46a097a183845ca413c6fbc7dbbab71f1511b2fb545a45152bb21fdbb5f07f2f636d43e49bed86e96a
+DIST firefox-38.1.0esr-tr.xpi 481075 SHA256 c7eac37f05b3a4afc073e85c9a065f343cc40b0cdba17fb8dd7219bc175c7723 SHA512 2041a274b0955cce698ac147dedcf8d92185bc6a2c7e0b98443a6f030b1a17feab90954ae0cfd1f171d854d840bc7af3ebf7b26281bd1be29ad52b81b78fd962 WHIRLPOOL 1fd60e95e8261c5849058e9ffada7cd2b666ae598933f734095974646c4130836b807c679d635d1799ca640e9dc9cdfbfe4fedd4c8934e737156ddd2b4a4772a
+DIST firefox-38.1.0esr-uk.xpi 493312 SHA256 6c68750ac5d4dab03b6c93d7694d8a8c430e95d9ad103a86c2477089fd678d99 SHA512 414cc821ab76bcc40c3cb16e1d06890c526018ce2a43ded9422c8d1551578fd59215999b7ed9f7986f8e236f5791ed5e403f24e0c3b0be7f67df2567a4dcc7ec WHIRLPOOL 59b274709e05ce75e060894a24aef7553c9b964ca9d2a7a80e3b26b5b1f7fb6bab1a648584b5834d84251396323b92383fe7dc68a008ccb776649551425ad0fd
+DIST firefox-38.1.0esr-vi.xpi 467503 SHA256 874f22b8c19d7fe417496c6916b150c7d51a7021e5e73809a542799238c194fd SHA512 c93b8cfac476626362690812ae4a8810e22f19a8ad91660969c47712d7da8f60e6bce04f22e213731dac26a871ca30b8dfd0a1c108fec207f7b32a5a24a603fe WHIRLPOOL 12671c87cdaaf8835591bab01eeb4d3e36f1105b3234d1de72cf339362189869b2f13a0d286bed5b882192b1aa8a120d795d96ee227740a2dbd0adde961bdd94
+DIST firefox-38.1.0esr-xh.xpi 450241 SHA256 53aca9e35a77091be291a3d2246ada0110d71e0451018c20d9a8c1f40dd2b2ae SHA512 09eab0fb56b0f28c922f497788de2958726cef9d093b8c6dc1089b67b60e25a1de63f2e66d010b3f206d8044aa124bd9919b1f9ef89890fa44b48770fb51d3a3 WHIRLPOOL cc6a6005f4abbc873700659f65d8a42a62874ef3a9a3ceb67fd9531b5137293828943ee1a42ad5ccc405250ba55361151681e3e5f2312ff150a061ca27c439e1
+DIST firefox-38.1.0esr-zh-CN.xpi 488276 SHA256 0dbc3ac200290bdb5514c2076f5a1459442b4e3ee235ef29216384f2ad06d61f SHA512 072de0d8ba3ad5ef428db2ee826428eb217444ab954aa7735cff75c919c5677cfb4417200005501cd171fda430be9387117985bca2ce0be89c3c81ffa33b90eb WHIRLPOOL 390dd5e1d6399ae4c1907d3f2af5e1ab5872efd62c5b72fdb5810f7db2afecc3021fbda234eab2fd83193ab51b1a9f144e66c19290f5b1edefe70d9500fd380b
+DIST firefox-38.1.0esr-zh-TW.xpi 467843 SHA256 e3ec89fe112a80d424e25934d21de61efbde5e6680ce2aece0c37a04d96be91c SHA512 05f291b5be7a0b62ccf6b8330666d6aaae89df6a138ad80cfa0f3194d157a51c5ed7f88de50f19cec3c162e17a726fbfcf6e4c2b1c41be494677945a9728985c WHIRLPOOL 3a8a651f6b8934be6e7ff84f6263bf47f87ae5bf6cbf613c5a47db452a67582602ef05894a089e4fe51228ffb81e8ea7afbd8f174631af051dd4a067f52d19aa
+DIST firefox-38.1.0esr.source.tar.bz2 180392775 SHA256 85eb5f916aa47a92cf50803dcb35e7fa3a9da29abf5fc91cbb6a70bbbc2618ff SHA512 3c1bee7e3d6e3a0d14fe3ea64b06fe52ad9f319630b57d60674b3aa6c45a3abb1b9f62baead6bca29f7af57416658e7575a64f4877d68cdb5ba73d9661909cbc WHIRLPOOL 2a7ee96ac72f5a3949781781b6d561cf88e9b1658b4e9dd6c5daf55cbcdc9a2b86467ba7c851a6f90c0bcc231d8912b26427aa8116ee2e514584bc0db02ece5c
+DIST firefox-38.1.1esr-af.xpi 483326 SHA256 4dafbd9e593df6bd21096e8382d83ede1a34a94fdff3e11412a9e52801f105a9 SHA512 464047fd6984de57eda4d65798968c44d7f84ca82a9fef81b191de51e74e5b545d45343cdab5e742353b7accfa7ff785206d1687f86605fc92978fcba95ca06a WHIRLPOOL c1d8e35c09774021c2b5ac8350b89c3d396d7513b2f64edd35c8a0c0caf736272c5ee30122518f31b6b3c0a7823af2c3f232dc1f1d2e61d91db23e4de37614da
+DIST firefox-38.1.1esr-ar.xpi 516495 SHA256 9c48e16f97cf02db6826f507268024f128f0f136444b4e5093f49fab9cb13ead SHA512 6e6cdcad3ac200e3d274c1539f1f2977566c5b6c7c98df89f19fdd87137e418792b495550b805e76f71a195f7b11a7205ee755e28789403057856fbaf64c056d WHIRLPOOL 8ff28af6c62f4eea0225e4695ca47ff94ac9288aa78e8637b1365ddf4619113f7b15a6b4bcb6ccf4245cbda0ddf28b5c41c7e8b312fe5143ae688dd2d889e131
+DIST firefox-38.1.1esr-as.xpi 509574 SHA256 f69e16f0c888636a9748ed27488518a8901ac125f12e98cc556c8a8183d64837 SHA512 b9ec793c19a572b80502caa269f62465c80e750410b9149716c8c5eb551d42c934bec3a3b6247adc641a169060e2f0a42a544f062065b0a211d0ce1f3ac431d1 WHIRLPOOL c43f25cd6d148f34287c4fe9c338451789215b2af0195aeca75af98f9c7b93565e50c64ad2f561dceb3429a89ff4a7b0c57767001a463ccac03b81968a2f1a50
+DIST firefox-38.1.1esr-ast.xpi 397203 SHA256 6edeac5ad2cc12659492b818024a3252af8a2c708e6f306d43f693518f17fa6b SHA512 b58a6692f0811ca34ba3f7299c0f3d3d6de0201c02edc065253ffcd2ffd98f77c203a7126552c62c4061dd4632d54f9ab8d33165a618c1d6cf92ba38efc9e80d WHIRLPOOL ab797102d247eb09c93c4cd3925b9a81ddf77c78a0ba98bbd3d246100700418bef8b125e00e6fedbd43fa347ddd4a8452c7e00b5ebdc45a5ad5cf18676619ff3
+DIST firefox-38.1.1esr-be.xpi 441057 SHA256 db653c1befe43c7984b1ef9c5412cc3ceee25523cd4abf7534dfcb4cb13f422a SHA512 2c94823a55f21b7105734b1e897f82d41a17cb1968edd6ff4ad33976df7861f91b39d0573b77f1d4fb09447725e82e19ad6c646145f8a982cabfc54c1729cd51 WHIRLPOOL 6a558f1e37991ecc35084a33c6034f35fe8eec83455fab790294485a3d7f0dd4dde5b609e39db2d233c480915a42d5434d6d5b6aa536c8bd610c4da6fdfe0777
+DIST firefox-38.1.1esr-bg.xpi 487819 SHA256 ab2e124660a72ca2aa1648eb3d874ab3cf6d8412885300f37f0741602858a9d5 SHA512 067a3cbc32232714ae0e6cf162a45ee9a82e54ef94314e6a93c503507fda9454250236358f3bb9a09cf3b383c4e70eeda218e17dec27055a8434c08d6816c8e8 WHIRLPOOL e670418b6f75cd559fa7f528c0daaaf3b05eb8f22f20ae9fc7c93988c175e69ca1cc0c50b818ceb92b2f180ec31035e5d689d3b5c13fabfa7eb1f126f678726f
+DIST firefox-38.1.1esr-bn-BD.xpi 528689 SHA256 2fb4eeb9e65e85c19fde95830a8bf6dda429002e652b6da5a2a63fe5b091ce3b SHA512 ba5df34ad8b6eb134e9f814e3888b90f28dea30cd3302ceb8921339b8d51f01e71ba93e49a86ea800a27deea7b2480605fc667f9c035e0407d584f95c86616fb WHIRLPOOL 5b1cb6dad7b696433a7b223f46069be5aa38da8e9156fb86b17e324cbdc0dbcb73721b7300004b6b49f485b77e24bd49f08e7fe95c23ccb7a06c7e580c857f50
+DIST firefox-38.1.1esr-bn-IN.xpi 527927 SHA256 a2afcc3822b0e0c7788d18361132fa23747a4da64a3b6285d2ac12d2a03d68ee SHA512 760ae04352d3ad0c35b25f4a8cc5b5fa1a2e2c3aad273fa6655c9a17d5e06bd02d4607bc54baba988d7277605bd263c27100066af79ecf6b692a4390ed1971d1 WHIRLPOOL 90d192b3486431f3831c83b11fc85ddbd2393eeb5cc540da6334d0276946fbb49c988812b02ab6f70eea7f744b36ebe76c410f76aa64510415f119d5bb68ef51
+DIST firefox-38.1.1esr-br.xpi 441960 SHA256 993bfcd305c7edc8f77798dc7d3ede5f1de882745dd24c157e3eea80d01ec63c SHA512 a2c3ca7393de8cbe12fe3db6900a078f219cadbabee3457495ccefc7d59e78d0e923313fd76ddea23aa0a17c65ab3743a61fa9f41ee14a06dbeee78ba9cae6ea WHIRLPOOL 44c402ed42a3fa41f186d98fcf54b4067c3b509e9c8c0fe8158badf8890d788333ae4552cb611cb0e7f5e58015d3470e4ba313315002644e043b1714d4f5eb5c
+DIST firefox-38.1.1esr-bs.xpi 485304 SHA256 fe9da450d69b1e74c62abbda7dda9a4b7a96d97f2508c67144a854dc13295c85 SHA512 3183cc0afa5d5459b546db92dd3ba5753e4a566917dd18df93e871a2b51f9b15542078bf812659f456cb10c266a84d910445d7e43647f67f193d576700e2d62d WHIRLPOOL 174e767fca89aab22f742d0dd5f8b684f963a35ee28978f62bce1ac43034e152058265fb6cdb347b47823e72ae77b4e48d315ea6ecb106b6e905c9172193d433
+DIST firefox-38.1.1esr-ca.xpi 458091 SHA256 1764219a298d2aa099e2f0c22ee93c839d00c17976bb3b83d74a6b78aed68236 SHA512 ad36e220b583d67bc6da1467ecb6521da99aa1a2ce8907944e5a280540c897cdbd1cf313fc262dd8b8974cc59b56f3ae352bb1d52dd33538dcb4fe7e8c54fe82 WHIRLPOOL d5dde5e9d7cd652cee6d28c6f6f62a315d57ade546f5ff51bb1963533e733d9b4d84be6dace15da03ac83511ee4622beee62f6d8a78aa315e30d44c38e9df6ac
+DIST firefox-38.1.1esr-cs.xpi 446725 SHA256 0d8be64c91b340eeb1d5ac6b7328f9a9855c1395c294013757cf563b97302a6c SHA512 bc7d41c06e2acb1c131ef5614fa2f57cef58ce6753ea472dd929f315d5c8295582772b9a9d1a4bbf5626d3a6913291a907429bfe8b3ab24565cda55fd54d95fc WHIRLPOOL da92ccbb4390a6dea3972dabbe3ea9ef72c1b67227ae208c7aa66ea095a578fb0eeffeabccd54efcb9ffc9e8e87d0100fb51cac21fb15b5b19958da62dd24dd6
+DIST firefox-38.1.1esr-cy.xpi 444385 SHA256 b11ea25e7fb7d1b3cede8e4682f3e95bb1b63f3c56ff2a07fc67455750be03e5 SHA512 e8898212aab3fba6543f24f6223facadcfb0312913818469e6d150918689fa681d2babeafb8e75f003c23ddc890078c2d978ada700a4424c091056e4da16cefb WHIRLPOOL c42accc06e7d772de0e0cae98e23f3c3cc9e0b5db82bd70d4d01172c90e40b5b2a34ee8966b82ac752607c3495422fb49f8ce2fba0bb3823f4cfd33292bba096
+DIST firefox-38.1.1esr-da.xpi 450760 SHA256 3bd7e0f29976ad3ea860f66e50e2cb37c1a17cb471a1274c22ee088d69d90e44 SHA512 32c6097a1260ed454f79922af4e9eb1306e2e8c562ebbd999240b35c1dc00849798473ebb64e4f9783d6c54eafea997f09c4567dca10a891bca2ced509e4d082 WHIRLPOOL 7fab9f37c372d08075602e3d558f9bb64b35dd0f979971158d086b97e686982d97bfb41f7b91c6d6bb2c8b9273bd96fe7dc3be961e4d70f14266fe5a37abd291
+DIST firefox-38.1.1esr-de.xpi 451628 SHA256 f6f7167cae9833802659c9aeb7ad497891a4739a19421adde159b1b1ad8a5b4a SHA512 03ec2dc9736f1430b89cde682a8e335e3fe577d8f5a0dc3052e595be68ad754898b90f1f9d25e96533880166520edab62d7905e734935e9551b4c09ba292b525 WHIRLPOOL f013eec5187edd28dec58efc224f53460209d36dfbfaf3ef408b45e07a84f2be5ab5a1468c90b30f9e0a36e4174d215338b80d8e3c2e16dc7b873bcb75cd538b
+DIST firefox-38.1.1esr-el.xpi 498370 SHA256 2fbcf81cbea4068518b46d9913fd51e28af238efddc335b740b212db0fbd0fdf SHA512 db17c6c9e091ee47594b89367a1a12bb0f4c06dbd372cd9509dc7ad139335e9110414b4c83b5f95b2aa443029b88ae3b800698dee4b5755efe91f032e5a69d17 WHIRLPOOL 72f2ec25279f234a7e7e491d7799b562a0ce8001dd7c6f8b3a07c51110551d3c5fb981e241c975aba1a901ebd6e65a965393dbd36f4fb986032c859c662fd843
+DIST firefox-38.1.1esr-en-GB.xpi 437845 SHA256 41165409bc4fd0f022bd1c2d153fe4de8c84b6d708ab865fdcb24b7d0ae95305 SHA512 31b1c874fc962f448dffc48e3b9c40dc16fae14245a9e5e497e71f6f56b8cf29f5c6dfb0d9865b111a10970d024a50821be8d1171c68f83570c43987c787dc4b WHIRLPOOL ef64ec18a970908fb40843b36471bdf5cbdff99a5c779c397927c9f1342d42d34907893662a95b0abe947424dae8acb4b397378df856ea56c043e0f812894875
+DIST firefox-38.1.1esr-en-ZA.xpi 439926 SHA256 bf793084f6e96b86d2d74e6b18c5ccc71b4ea66f289fffb192ea12a7dd796c30 SHA512 7bff53bf0d4018fcd20f96c89961f4144d1281f8154029ebd5e7fe41deb8b7e4e6e538159e71d3bbbb3f9294e459d1bfd14ced5124b3218e95f1fbc338a24aea WHIRLPOOL fe59dd422f0c899c5082ea1953927bf0c30d80d3fa3fd6a8b207e868f3594fd716519fb2e71ba49a50cec1db8d71ef168156c0b683cbe6f0b52ceabda27ab135
+DIST firefox-38.1.1esr-eo.xpi 488371 SHA256 1557a694592c211961ec5a4fa7b64fa6c7ebc014e0a5591006d29595bd5d32bc SHA512 855f8c6a12e16bf1abed816480e1f955a0a7a2e678f5498f8c3de1d68d10cc35fd9ad89b248d143e6d4d3c3f29c4f95ede473e71f7d4ed68161bf9418dfaa6d7 WHIRLPOOL 070708949b1cbe6e6c564e7a27b51511a7fe2b59a15ef7452cf600e2602a4f448851944ae4e288e32aee2ee20f6cde4ab90c5b427dfb1c022a894c053b0469c9
+DIST firefox-38.1.1esr-es-AR.xpi 453983 SHA256 97cf32673b28c28bae69fae4e179a7d497dee2a817a3f14a613f5da83b7f3ba4 SHA512 154d0a176a92571de01f6c94db82df7eddc9149b69d3b5b02457a8d43ca24aed093140f1854694f279def4def33fc54bfe364e7c5035f26bc5c536fefc946ea4 WHIRLPOOL d9a5c3b7adf40024ae71c6eff27e27fbf9ddd9d6278c8656b9c9e04c0a239067e13ba9fcf20cab104f935ad0423cb54ef598957a96c94d47adefd6fa549ecc16
+DIST firefox-38.1.1esr-es-CL.xpi 384679 SHA256 7c65a4fb1a285554d05b481d6380f0fd3a6659a9c4d38eff92717fc9b8943955 SHA512 dd680e47ca86d2daa4b4c748fe1c3b94cecc499edc1012fed5a99203ce727a2b77090130b698e3addf5a87f943e94e99b249b66200fdada4d439e53bd13213b0 WHIRLPOOL bbc5dc6d31e78f81eba593e0a040b87212f9dcb2c3ac10d75e98140685d375b145efe21bd58af7e4a1d6e2de43940ec9fd40540acf53a173ef1be6486c11d763
+DIST firefox-38.1.1esr-es-ES.xpi 374073 SHA256 63d95bccd59b4eb8c87653e8e2129b215a1be7780830e926eab2f058d5fd1ed3 SHA512 d3056795435ba787f59e276d1db12a25d18c2e3a28e585eae0ec179ebe2c18fc50177d3c3b7dd898e57b266676c384404aeded0d3ad3e645d09347662b4e9f84 WHIRLPOOL 6e1cade6edef11c334dfef38be4a280d9dcafc84f1dead6978e4fecc3b2fbb45ec7c2cbd97d007b5b5cf6d1ce08f7792b8009019a313b4a7d88c46b3aaa904bf
+DIST firefox-38.1.1esr-es-MX.xpi 457049 SHA256 4c2762d22289382daa818eb653c64b12144cf29fbbe8fd0a656b813c4451e924 SHA512 52cac95f138c374e6730857ae947c554015949200b3ec4674723092b55082f5be762368816a434679831f0262b10c46c96615195130a407df33a661158a5cea0 WHIRLPOOL 1d12d138f52c769c23ad180e326da40971afc9c5b895b04f9a9cb9d0b7b0a6ecb9267c0c55e2e9b71f68634aee4452772b284429721e3cf8eb7158848254c0f5
+DIST firefox-38.1.1esr-et.xpi 443228 SHA256 a183855018aee8338d88b09c362f057a3c97b679588f2d2f46dc1c21cb5a90ca SHA512 0f118dfca1df5a006ef0a2a8e0b0016a3795d6aaff7be319209a3a8e057c2d9962b33d5322c118a8c85c623a77434a036715abf8ad93c5ecb2fe4b464f7fd13c WHIRLPOOL 9e64b434a149697c737954c525586045cf593d251f07345244b7a15c24626247ed0074c100a9388ad3fea070ffa346ab050d1066045e1d2378cf8792637731dc
+DIST firefox-38.1.1esr-eu.xpi 466555 SHA256 ac45b7b36bbcc963f36cd547e5d2f6630a2b6a656de0f55c9d3685a5a429b487 SHA512 cd2948a921ee60610f13da3d7052ec06fc276daaf52ab1459838e104469b8b005dd58feccdc2c5443ea95c5f6a955f8f9aef7a237a4d715e5f73b1228b6f5846 WHIRLPOOL 285c605d00707250e46a4b32d801fbe1d4f65c1a0abd675679eb0695184d3de12e5f095ed8c5969b60d3138d514172c71565c5db4519fb1fac308be8f7edf029
+DIST firefox-38.1.1esr-fa.xpi 518281 SHA256 c30881ec0cd080c476504f72a2d25c73ea0a8189e136afa14da1be2fb866ac24 SHA512 182ea87ba4ea21faf1f06ff7ae8762a2030768e9e1a804aef5b93183a32c039294379833ffdd84a2abe8efbe050388660d53d584ed6a387dd5cd3f5879458ba7 WHIRLPOOL 01b9f159522830a59f8b23ce28a561ca55fe9b93e7a474174f400947d718aff3b658e83642a5b559e0d3225e6d5098d792169760555af536113796b33744f475
+DIST firefox-38.1.1esr-fi.xpi 444852 SHA256 2dea720abe29c4ed334b608c561e42b3cbeaeeee5d8011c168151bb3c004fe1a SHA512 e32e616b60edeea74e55e8df312d357a624f1fbead10e0a61f873300684d8b85b90e04f276784e817a8ea60a358cc3d49aed8d0b4fca0d8a8b6535b8093e8d05 WHIRLPOOL 78b37becd10e2135e5255603f2eb54bcf097ed33d398b8d692c25e240a81d2d128ecfc8f31c7f2929ad2b467bf55d6e43f3639813e75403eea2abf38e98cafea
+DIST firefox-38.1.1esr-fr.xpi 461402 SHA256 9a9f5f7f0084165fe3382cb8c6fc5169f69c5eb197df83745f2e10e7be1bfaeb SHA512 a49f53580e1a97d06ece5154e7bc557d833bece64387bf8892e556e2da08f5a403a6ef1f87fcc34a479ca37dfe1fd1caeebb18087ea3773a74a26d51907f4154 WHIRLPOOL 5c1249aadc2f7da23fa09933ce8221cca93f6f3b8daaf8ec1ea040a3647d1554e2caa982e847ebee4ee21499f85136838f4b192901e47058b6d7433ea333f52f
+DIST firefox-38.1.1esr-fy-NL.xpi 455541 SHA256 e69407fd3a290aabe02bd0f0915f34ff43891cf2867361116185471bd93e60c9 SHA512 07bc22f57874df49258fc36ab8674c07c9e73cde27b5ad9205c6d293b66b03b152ef9fd24cd2c7d7e23bea32e1a21b9b721752748b78e4b6ce0bd9d06e925729 WHIRLPOOL 657d7a31819515d0941949ffc1e5d768984e1638e62f6d00a909f2a68754ada7ae361ce1fde7f9d64bb72e88c5a7f63cf2cf3a6beccd61a729b74d39254cb8e1
+DIST firefox-38.1.1esr-ga-IE.xpi 469623 SHA256 c861845bcee5ed9943cd28467cd4a8e2f7936b56d58ffda76a153fbf1da59c4f SHA512 9605eafea1985b71ab7cc94705d8e5018cefe6af90a746af77f15f867916b3e1a79b09642aea89222b3cbf29170b459ad0d8e3516821925ef664c7c16bfdec63 WHIRLPOOL 655428e297701a6ae490ca0cd6f4de96272a97e232a8b5812b1e549e8a850faacb0aacc519bb146c7121f69ca1451a20128dfc3a685f44c0f00317e84d55f210
+DIST firefox-38.1.1esr-gd.xpi 454616 SHA256 7d60dc9805dee5cd25ceafaaace06df32be071aa60f8197f0f66442a27c27c91 SHA512 2057d20046d6d662bb5b492a7f360f0582f5d5e28be654712bce7e5b61a6e337c9839cf13018fe1ddb84405eb896f1b30412a8f97f4805142df7a5785a1a4ed9 WHIRLPOOL 844df6b44706031e370d36b926a1e75090eceb4cbfa4092e85c6739d5a8bad4d699644fc9759b15c2d5255589ccd0e8d4465bf085dcab01090009385f4adf369
+DIST firefox-38.1.1esr-gl.xpi 448923 SHA256 645117e59b6a0136b8c76c15e28bed3200a3d85e37e6d0855141e07ecc35facb SHA512 47c0bdf8ac6cf70ec5f91c7185854bbf9a2a4e66d0907f14adf681d7160851d65843c03935b152d4c6a51f93220a6af66e4713cbdfdb1c14d948233fbbc9b866 WHIRLPOOL 70d1c7115fb814ccc27276cb33b6e12d74759370276f745703e7f666e75aa71dcd74532516024460d579ea2028c823f0d76b26b52924e1fe7f0e081943ec1a58
+DIST firefox-38.1.1esr-gu-IN.xpi 477980 SHA256 752f4c459fa6d4012d9938c9acd56e93fbc6567cc91678c240de3c6dd2f41797 SHA512 57c1b3a106d0559309746b5c05204c281c7ecf00ff7b7e92b12731ba25ca611fd3fca45e515c50aa519967f1a051082e258ab46359d40bd8c61eaeeac74dc0a8 WHIRLPOOL 3bd367319bac67f00643f3e1f25f366976ff67f000abb333625535d33c5eed20c59da224545aaf0fbb15ad24ec0f53993480fe34029ee700503c812d96f3c551
+DIST firefox-38.1.1esr-he.xpi 486784 SHA256 d6a6f9268b1aa026278541a27b2a76d334f703f7b88ae3363096de6ab5917039 SHA512 17d88b455522a673e2a228bc9f4ef98813c7aa506c6aa6f3a20ad70efa891a5bac303e64ae480e7286bc51117ee772a46cb7c98c378b636763e5d9ab9374a448 WHIRLPOOL 5a4a76ab2699e6c127ee50ab67ed24b2247b948d7076fc9d382ca163e15b156619a8432f093cf2c7719b57bbebd4bfce3201b76827097733bffa7f2d2fc8e8c8
+DIST firefox-38.1.1esr-hi-IN.xpi 508166 SHA256 015a5391fc244bdfab858b84fc7865ca8c22838434c20d3bde66de9dc91fcfbd SHA512 1b2200b568e1b9c1a242b8d46bfd10b12d401332ba62a98ee369519c986c5076c0c811c744eda3a29ba83d263739d961c2df5afa30640062e0a07ede24bba3a8 WHIRLPOOL 33fe5f110d4eb90b0b9c1d61acc9a1b537b87e84ce0ae45f082ac8449268ca481aff574d35e8a9609b1c543fe427baf68856723adb4b02cd1a091522b108678c
+DIST firefox-38.1.1esr-hr.xpi 478271 SHA256 b846d40145446a7fce5f19565d06f4781e16b00f4fd7282589d4f91c2d8f6040 SHA512 c5c21fce4443a6713b90f68da0ffc9dad5d23c283accf222300ce6e21eaf97f66df1908fd33ed582915a9058ff3341709ba3ff978dcfb078390fbd6b730212d7 WHIRLPOOL 6beca695a22a0dc3e1448827ece599e12832624e71b58f40ce2f0fb96de315eef478dc976dd2b8ae6c9a4f1652eecf5424aa928c0b08f8fbcaad0e669da4bf98
+DIST firefox-38.1.1esr-hu.xpi 453554 SHA256 d1fb1b50d3c8432e5e584fa5c204841b10172f3513398deb6a9b182527e25ff4 SHA512 1bf3175875732493670231448e26913cfe0319529fc0d7f567afe8dc8ed0f0b8d08f005b2dd9098a06f0a068648800e71787ef0ca66e63eeb8bd9ce7ab10e72b WHIRLPOOL 0ad5fd5d52db8b6390409ac130d3b3b6198a746f5dac96ca754920317345191fcc5f7a7eb0c0049f1a6bab408a111256a4ca7dbf230f5fb6f0199ab792bec26c
+DIST firefox-38.1.1esr-hy-AM.xpi 534264 SHA256 10fbdfbab5c54d68a35a92accb9623d37aacfcaaac2b6373a7459598d4f563aa SHA512 c5115e9b4ca05577daa45b94c461c44a7441347fee47018bdf369e92e2af732dae4da1008b2242be09d3ce29708c71eb9605488efc8aaf048f0b53de6fca202d WHIRLPOOL cf515ccc9672c692428095c2f33afe9a4af11ca0b7b453925344e8da33442e49e025dfc018dd580378febfcad8ab17205b5c47263636b1b0622bdaf3bbaeba0d
+DIST firefox-38.1.1esr-id.xpi 431487 SHA256 4b998a744886c3c4d5db9048013b46227d4fb0cf8be62f9179052aaf79852041 SHA512 b4073a0653f9ed5758d9e2ad645ab4e3951e1d53b3ab91d7adfbc66997e1640f52c8a97a7df9f84ab22a534a6c45a57d8b7ea4835405913a3caa82966d419afc WHIRLPOOL f2d79b3a570d0f93e8ef9429a6efc863f750086c8b8a8a3a25ef4ffde525edcfaaaec0a12ff70566d6e8fa8197d7b1ff9f5a7ea01549988e6f6e8f4f88a2cbc7
+DIST firefox-38.1.1esr-is.xpi 485133 SHA256 48e0ca8182daebd4d8ac25e3cc17c4b3077ba3f644971eb0ddaf96813ccbca9f SHA512 3b730a4d47964fa65ad5192cd8a8ec26cdaf47efb4361a34b8bd8b97648d3745502c223df9018b20002dfb6db047fec77b86050c085c8a42a2dbb7b47260e817 WHIRLPOOL a68260b3b1da4a57844b5b89c66bde3ae5459f22b81b2432bafb5795d3da32e9569ea6ad1e1718d42ed20d9c2a8bb548997c148bbb6bb15ba89be70c0b934907
+DIST firefox-38.1.1esr-it.xpi 368409 SHA256 92b0fec73ed20e04902689e9e482572a07f3fe0c9fd928a22f39484e1e7cb6e8 SHA512 412a85b311d44c6208367352dd13addd924be64c66563e57b4edd99461eafa821c9a3721474b8f80ddc0b7fcd4eb3aa84693e09f42577f9d2396944bef1c9e53 WHIRLPOOL 22945b68fe2d2cc52cb453f31a600bbd398d65bbfdd5ff21d647724b492b2c29b8385b32576e2c4f0c40c0fe43212bc607c64dfe15d786025f498daa12855003
+DIST firefox-38.1.1esr-ja.xpi 479113 SHA256 cced69be8564c4f8f414f043dd965873bb93bf1693b59426fe558f9fa324112d SHA512 cd40b091c97dcc7d28b0046857ec30ccb10435190a12584e9e9c5a3ade48ddfdec769ce18295fef90d69f9c444e602418e3c5542f9a91ccb9b6a0205b18c29bb WHIRLPOOL 36d37e683e6c5a259a512db85ebe5972c79041ecb246da5111d03b3f81c3ed02c24d202786cc4cbfab0b5c78a184d02f3ca5e3047bcd73e394672efbd40066bb
+DIST firefox-38.1.1esr-kk.xpi 503568 SHA256 5ff478df19ef4d80cad295823b10d0ef58329a3648002f4022fc526823de302b SHA512 04551c50ca53ab94190f567dc4e32fe279585673bf4eab5e27566aa8d70520695fae8211c49ab9416450fff12e04707f23cadd13caeba33ffa2569cc5189d7b0 WHIRLPOOL 8cd70c3df39fb00ecd4e3187806eeb695cac11227fe777ebfe55ca2ab75d84d84d8ccea1988e3ee91a434569cc5cc59d3c4f3e66456d06f973315b9cc06635f4
+DIST firefox-38.1.1esr-km.xpi 565673 SHA256 645c2245c9fa12c1f03b750fcee5322eef6642e1cb45eeb9a55441d302166a2a SHA512 33d6b653247790d65068a32fda2d189ac06b8c912db1ce6945d9ff4b0bf0b17876abbca4f99e12fc8c541a3d8205d2ca52ff699a770e5c9a20b69b8a4df34c63 WHIRLPOOL 4908243bb43afe7cc479ce2bbb3a399e420fa9ddf3b74a6da165e90f040b0feb92b21722a063ea2a582f25d3933e6a99a852a2cb5fb8a459d4d3985a81c03e9a
+DIST firefox-38.1.1esr-kn.xpi 533464 SHA256 d7fdb3ee98b22df22c3ceb9de1fe604941697a8e7e43e376716b89678d47739d SHA512 e11fc1b22f4fabcf9e8ed8688f9f4a8039f22c7ceefd73a109fb46741ad6b92d2ebd51abb6a64be48412b56daa7d31b98cea223471dce239f4a02e0b9f430903 WHIRLPOOL c1fdf64f6ff4bc1fca8451e06e5886a2b6485ec42949480784f0dcc0fc343b600f73948684876144d3ab1bf11f0a8d415d9d85f0188128c299445a543f515c53
+DIST firefox-38.1.1esr-ko.xpi 460854 SHA256 819013f9d3546e79ed3f58f1ab3278fa0c366a49ad4171df83f370b2fc993bf0 SHA512 e232a874fdfbb287a983d98c625f472098624a691f17a047bc6f1d68e9bad72fb64c2ce501773da17d383ce67bf24365c254878f8bc126c56834abc1a73f6b85 WHIRLPOOL 1fdb89711e19bfdffdf92cdaf918907e803c1d6ae0be0fe35c978398548a178af18f7e5562689a0052372adbeb8c0aa657a98bae5065cf5cb34b558fc70c6850
+DIST firefox-38.1.1esr-lt.xpi 486452 SHA256 feed6b48a25a162c7afafdd31edd4244ff41c102a329c36d4eb41037376adbcd SHA512 9874cbd5a77633802277d92db7e010f353de2fcb705573dd573d5528476f1569938a0b3b40d51f68250e227917ff3294241b6784f18c41adbf8db4f08c2cfe6e WHIRLPOOL 4986b1f5a3c7a631f8c277f43220623e6a2c2caef1a490602d952cb380ca0550fb8c8a15dd3afa43e62bf66b81d2419bb0d5d8616eb3514b1b00767c840a8ca9
+DIST firefox-38.1.1esr-lv.xpi 467197 SHA256 1f3ea3b9bdfcf5d8973dbc181082d161cf514f7dfb233ea1b7d634aefc7c3a43 SHA512 b4b250be0e0daa647724f86e42d093c87c1267f96f66349b72f3868d82d1ad4abe114908cd7f0620e51ce0a993a9ffb4632e2237f9001c810f86eb28c9b4a496 WHIRLPOOL 026c805b03b0ed3c7b56f5b59af601d05bfd6d3ef96b121d7bfc8ac2cfbe438e7acfe894569f60a8165a5073d31950ee50f14c3e8f4f53579305e4dbcb10f2af
+DIST firefox-38.1.1esr-mai.xpi 514666 SHA256 8fe7ca64b2a301724bef804cce24b5b4108dc3f8c4714e2579ca1d31a1dfa327 SHA512 1ac5591a0b7b8ada4f24f461a52e27def9ba661291b8284024f7bacd6716aab1df72269e816f0ad53346543fb995f7ebc71a4476a2af362cf2fd0ba667709567 WHIRLPOOL e66497823d12f95d3ef11c4d9cd466fd4cbd945811d646effab10f1f211630b76b764dc7b3dda010ef5645d4492eaac6915ac973886550f5a6b994ca0faf3466
+DIST firefox-38.1.1esr-mk.xpi 529205 SHA256 fd736dd8c030e15f0cce86fa8c1b60403cf7a799a518e613c27fe2ed2a0ae6a1 SHA512 19c7f74cd4561fc043fd0bbe62ba8671d20dd16fbfc316ae25c61639b91469790488d75436f2b0124d0f8650409e333ad80b9bfb387846de885789314bad4a31 WHIRLPOOL ec1e520f336c70525a0db87f0ff065324ac46b72b3fb6e017d223d9bb60aa19671b475efa17bb18c57fc9f62ea3335ea53d66b7b589e7ea4e788a0c30c79ec5f
+DIST firefox-38.1.1esr-ml.xpi 528919 SHA256 8412349e51f6dc67af527931dab37e1e35b7218bd5274235a7d8b3b0cccd0b3e SHA512 c4ee3b617be34a4ca0c83615eb531034e3fa7b7159f19f52c982a72bcb527501df7e22289ad3f5bd360a0e23c03925661e12d5d6ad571a750f81ac2c7c128ebb WHIRLPOOL 9128275f94c971bdad0c60c08d6a89ef25a40ca9c54e1875518a7d598accc7692bcd99f98347bdd65fe34ec49da5ed9595eae444e6fadd1c25c3c8c59d7797e1
+DIST firefox-38.1.1esr-mr.xpi 505961 SHA256 95b96d1fda3c0a4079d30b58621a57b81815c7d26a4628ad1f8e32d46070aa28 SHA512 e5838ef2276d6ed0aaf596742e4a97fe39239bdf8911c7d108a928132a2d11fffa6034a100ae387e40b4ac24dcdbd50b1eb338071da658e65c0ff4154a5bb9b3 WHIRLPOOL dc4ddd3bf87dd2eea0c2575c8347c6df6829709b437393eddfcee42752c53606a3840560e26b1e82ead2f8d70c7263b702f8df7a8898f6f3d4a5051225e4f6f7
+DIST firefox-38.1.1esr-nb-NO.xpi 444176 SHA256 f0e583e053e3fd8a622ffde4837c74ae429ded8db4697f87b1484bb4b6da0f1f SHA512 c7e0399c0a2f83840e3d18dd87cf11db9dcc75d3299b83419b7843ea41659bb53f8eda114aa82ea53aa4adc488309e2f324af98d84bb004d5da6ccad7bebbf8e WHIRLPOOL 0ef3e9b55846c8de0968ce852ef3f790717e41795aa7572c76392f278437f8828d6388a38d6d313dc44d9a4c5938548a6929c9ee591bbcdd802c057fe2e94203
+DIST firefox-38.1.1esr-nl.xpi 443995 SHA256 c0ef5921a56295b3335fed929a625d9015bec27dda2bf404eea3f74487d49f2e SHA512 3b6aa126a0cc18543fb54b8cd11e15cad6c0a31a7e70e8d6b58543169b6ce16cceab061eb317dc49dd42a893a0bc0da3de68404183fa5d71118972916f4bfef1 WHIRLPOOL a54ab8f2264047df929c92488bc6ba1ec97fbeb59fbc7e0f6671bd06dfebd09ff861b37382e56f1d1bf22228ab76713ee1f6b36a653d2614849868b0a9da8d0f
+DIST firefox-38.1.1esr-nn-NO.xpi 438452 SHA256 280a4c0ca9c76569fd6464cd89e4d82065db9b3f997b59a3c6831773076050cb SHA512 24d29f1a294faf2640d313b21360e85697755123b6f7984a2e5823a3b705825446c6ae1af91d9bf512dd793c952eb12e64924905a883c49da3d6c66520ffbbe7 WHIRLPOOL 39e134ce171df1a030ef974f07424a307d8e7e1c34ce6ae7643d2d7f480987b9cb4ada6e7337447d51559273cd68094522d4287568db81cd431d7dc5620fe1f8
+DIST firefox-38.1.1esr-or.xpi 527050 SHA256 ddbe8ec30164642bc93e420d31680e493834203b995ce9bf0b19662d8ac69380 SHA512 c4e149a9ffb339187456add9d75176de52d1e883abf7d212502b6ca2d9a82392a757d0dd976328bba3aced37c88750d921a4117ac55d970e13ad123d3a3fe539 WHIRLPOOL 89a9a8e3fe7b7a542536405dc696774a4e2fd3cad23de59e99e97a9f391237ace56eacf42b9aa3710ed5472527f8e47dbbc906912634c682ce8f348247b3b4b3
+DIST firefox-38.1.1esr-pa-IN.xpi 493722 SHA256 cc335a7077cd3a98867e56c85f5febac507ee2cb3575b6f3445d52689840cbb6 SHA512 76d39b0e370a7dcdf4bfc094072fb937235eed3b68fc3b6bbc590ab9daee4c481b16b012e89f6bacddeda1a1b7c86862474aaf8f05c7e2ccf4a97a7d10c7e35e WHIRLPOOL 3604d59eba0cd0781427dce8572de75fe94455b494ea512b66765cbe3456a363ad183042bf8c50d4ad196390d6d63dce59ce5c837249cd336210d160dd8abf28
+DIST firefox-38.1.1esr-pl.xpi 406567 SHA256 0f4e1a4bf56d01bb1598255c24acd2d898e94cdf91648b35bbe9bcc8afbeaf00 SHA512 3ea2c8173e90d0b418986518074fa26532008ca02385809b9eb6f14f29bad7c1af8250f5d5aaab55f76a08d153d82ef8f31076fafdee0809ab8eaeccd887463c WHIRLPOOL 8ccfee7b3ee36796288bea1c95d2a134d144b7c460426b928951fb4cb6c0682d363c4282018af450455b9874dab9b45f06cbbe4f8cf86fd4d7648c65fa072e29
+DIST firefox-38.1.1esr-pt-BR.xpi 459811 SHA256 b289ab743333a903cc8de70fbcda7e14a009b6bed977c7cd22b5d74c9b46ebac SHA512 7aeeaab86a4bc2fec501bcf94e0200935afc7aa24e372ed0f36070b5959087b906b3341e01a7cdebc572f0793b4c298c85cc87f46c5b4bd6bb74e6138bc845a4 WHIRLPOOL d3201131e01e15950e399dbd042f3f9137f0aeea0ea6ce95901f09b62132e77be616709e384cd61937046926306a8c7bbee4fb117bc706b4626c63201427edd9
+DIST firefox-38.1.1esr-pt-PT.xpi 439976 SHA256 b99a95f3e38a3b8294b7882de94e1d7bf9c4b3829ebd45f35e14398db9f1b651 SHA512 2ba544ec2b781e97019bcb3a94b6017ed147ed1ecde9084838c9eb4710467c786d0de98debc782e5d663e2d043da234415e1b95fdeadceaf152df57b21810eed WHIRLPOOL 7535adda14c08088005a8c15c480c171f8b2ba1a70e524489870410b5585b3dcf3f967e99adaf4d23942a5c32620a0e63c0f3e1f381047e2b6ba82b1e6ff8cc2
+DIST firefox-38.1.1esr-rm.xpi 446287 SHA256 5cbe8179f22a52b45af4bce71bc005313c0f360c290ebfca2bd1ed64e3cd1adb SHA512 cc864d8933ad6281ce5cdd2283ffd7cfd281938839775bddca920b80c33135f10fd0687f6cf71f4b8cfb60cf60d14a79c6f1e761e89501f9ecab80ed1627d437 WHIRLPOOL 2982e321a382df37423c556ffe7dbc7f5f5324377c83269890676c6ee68062bcf3abebdf3b81197db98cb433e10fc2334ae7d0bafb7b1f827343277b1b608c5d
+DIST firefox-38.1.1esr-ro.xpi 494079 SHA256 0b577790e1017fffffe882fe508e4bfbec31c987d253389fee8680809152af66 SHA512 b7307e521f1ad47f11a0873ef7cc020651305df92b78d912169cf697c0446895ba071fe1c06786fd68c94b14825da9a7b6e4d4084be8359996670683e3aa71fd WHIRLPOOL 2a0ec024033c1677559e1a04e31b8626d1c663663d4c3d768731ab3a089bea558f6f9167a163db536a3e19847ae266d86df363f6c8205773c29a5e01b585e1c7
+DIST firefox-38.1.1esr-ru.xpi 414419 SHA256 ea274d18ff2abbb20ebf82ff1d95ec4189c683876ea0ef6ab91ee358259e6722 SHA512 a7d80f413fb173946754ece0cae1e513a69d392d5e2c147bee0d11da0e4e9c434ad2bb5966b40b37f56c7b4b54837b92232a95f3e5a59b6278c4a3c0583032ff WHIRLPOOL f3c4fda93c756656cb0d01cbb3cff05027b22e9bf596073d297dc5f5826c6e60139730bbf1071c2db06d4d087ba7ad7c13ca6ea0161d4c51fd4076204e00f62b
+DIST firefox-38.1.1esr-si.xpi 537394 SHA256 10d32d20d93a282313dc4c0368c313567565eed68d3c98965b32cc034c3e1b3c SHA512 a7d4ee183f9c7a9710b735c27be8396bff7ca2445ecb24e004d85b33cba929b12564400044b9063ed669426902178dc3b8690485f3c67b9cd9aa3b1d1c684918 WHIRLPOOL f634a9a4494b12409f6cb69aeca05497e0f862d2d39285e1f085cd8f21bc265cf8b33a34ca20416aa1359d128ed2d732f752b667293ac8704bc5b3c9dd54d580
+DIST firefox-38.1.1esr-sk.xpi 469435 SHA256 11198b290c163734c5b0204fb89f31f7c725a415b539524b02bd9096a5ba20f7 SHA512 6dea0138f06b74a55ef6c1180fe51e45fa8fc957135b1d8aac6cdcfc76ef748aa1747204929bab86d65f5b0d5280dcfdedbcc471a6a559cbb6de819562dc2dd4 WHIRLPOOL 84a7801c876ecdea933dd7faee4df964d683d2c717cf43d8dfc5166e8860756b0853b30bf25f0ff1e346190861c08ee48c0b68d537c0b57ee82d39dcd1915a36
+DIST firefox-38.1.1esr-sl.xpi 441593 SHA256 39f985bf83aeaa405bb39c4352116ddb7a43cd65af03801bde9ca838e5651906 SHA512 cc64c31ebda3f47df3304fff831eb3910303b47df7e3f2b2938ca119c3660b2e83c59f4468da8718aa1639d7c723dfe9cf7c08ddf51cd3946d9dd2bdff239b48 WHIRLPOOL d32ecb84123f7862ec9ba7a294ad2a6c19c2562220d83f4846c31e8377ce2fa6b7dd64e666bdf7c0a038d8c75e7817fe4d5896abf6ba9dc20dc4fc47c07a4f39
+DIST firefox-38.1.1esr-son.xpi 449269 SHA256 82dfbb22ec9efe7a51c4938ae72a871e149efaf43b114336b454df9840969001 SHA512 087a3572fad877d918b42ccf2498c0286ed29b3f58f8ed692a6974763cd7fff9bed9a40c162702716974f5ce356a01e645359a17c7c08647cda4ebbc482cfad9 WHIRLPOOL c712869ac3532a6194bb34697b638e123eaa92469fc007a66680e0899ba36d56532ba421d7f27837394c4f3b2951148db4374a92ce910f7d6d96799a341bc033
+DIST firefox-38.1.1esr-sq.xpi 486076 SHA256 e4fb8f2bb6bbec7d3f578adca74ebe450f8d4ea548be38a53efee439cb05fba0 SHA512 d7c6c0bfc1ae5b909fa0b0f8e32132ec16414923cb5ecb6bac71faa4694eb23eb4f5adcc2a426d0f930f0ea312e97c62f15e0db16d1f7ff71dff2bb31eeae41d WHIRLPOOL 658266ad8f806656c00e80d90ef1185c67944cd3a5a5ee79a2148729df634b23cfc924823a9c69b57d9c57f26b5b222a32348f4fcbe76e33d45ab9fade7a8422
+DIST firefox-38.1.1esr-sr.xpi 479420 SHA256 794e7da155795b108a17e8ad7519e8df67759286be0ea14314bec0fbf5970d86 SHA512 7791bb40a44d5e954347d59e9b0c9011c2dfcad5e4a6ff53fae898616bbd93577e5e739d0c20876055f44628869fecbe8c8b574de1e45a1fa4d4c316df9d6193 WHIRLPOOL 2d2372b1f20fed84b41020219672006d44b634930fbcd91fb51a60a8ba6485129cf74b29aea9cd451fb3e00dde1a6b4ec2ecffd2fe562912b818e76565a130cf
+DIST firefox-38.1.1esr-sv-SE.xpi 452631 SHA256 f888565097ba821bebaa57dde18f25a174b884e963697625c9ecc6b9809c8b43 SHA512 41b0412f15c6d53ad5244d7e8afcb54356da60cd20f4e30e51f0a36e4304d3030efba4b20ce9df81506bcb40c091d9fca513a8e5616befa657947c3258e4b7a6 WHIRLPOOL 0fb0791902b673f04e6c936f5959a60dddfcc856fc15f8a66a80f61e5c6c7be682f9444f6496cfd36899a9384c6ecffc8b71e4ab5aaa22e947d2431f58647ae3
+DIST firefox-38.1.1esr-ta.xpi 506606 SHA256 eeb5f1fcb6cd31d5638737e06437fd3102c0830c90aa5489247ea014fbd8b373 SHA512 175f5ca572ce1a84a85e1b8b174572edf4e32f828f2974cf99c57a17bd5fba2c9a6a06ae1d2e914520990fc63a5f5c5d41cb6b48a07825ed5541d4b4bbe982fd WHIRLPOOL 400ea2a7bb96adc27b34d0d1c0d9a23adfb21468d9d768632e34faff1cdfb3a3ab832b9516445d911ae277eade253c1cce6a5098f3dd6458a6bf00f76e915468
+DIST firefox-38.1.1esr-te.xpi 526250 SHA256 843a2f108a3aaf3bec7fcbc3c2bab10223cc39de727c7a9a005852a282bdcdc0 SHA512 3d9a77e3fddf05616062fba73e5e4056af69ba5d772275a057086201b8ee4b899bb46c7c85dc74b0612d41e5eecbc6286c636b628e2a8362f746933f4f76ec94 WHIRLPOOL d80515b21deccf40832b630cc70b688f3b77af3096d0bbc8ca07115ab8ca773078ef069af8270647b1779de2389a54c1ee1d76e15f7240d08e58b4353c3cf2ea
+DIST firefox-38.1.1esr-th.xpi 534271 SHA256 661de484b4b88fef0916448f0cd3164c9c632d06c04177d2f3998f74b54900c4 SHA512 f6ad2270ac5808a5dc488a86e0eab538c095503f77506da4a0450cbbe9ac3204a7fb208e07bc695d2e125f5560c327499fe9d831e3a3c5b7e606e6bcca43635f WHIRLPOOL f906d03fa78d947263babf2f7490df891bf1aaaa10e14a2b2e6cc385056959cf7e60ea2997334dc3ea2c317eecda3478a5deef6a59a4ebe3f743727461ca3c07
+DIST firefox-38.1.1esr-tr.xpi 481076 SHA256 d7e286b01413e77f4b888fbbe647e33bbfa4c8586288587610c0b0008fc1abd9 SHA512 13bf3aafcf5f052ef2969da09b04650c2a3bae36bd7bbca8802a6843f361af30eaa627f4443b3c882eca6140ab620ef5eb704987438624fc0407100f482c0bf8 WHIRLPOOL 4f054116b5c3f2412d2999724d2fa783fc6f0738959bb1646c20918d3c73d6ed6ba217c3a07ac6eb293afd189b29392b146345011c9905b9af1735a4dcebb3ca
+DIST firefox-38.1.1esr-uk.xpi 493314 SHA256 7f27073d4be9a509305c3ce9c38b36a202f89ae6caa6bce001b8c71c8781a208 SHA512 e19b0c2654c4fb157cca0b7a1bfad952bcbc6929130ca6e1f908fd710e8e240aa157e5cb7f9b2bc8d92fd10de5dc8454d334f2567cff92e62fb5b584a1ab2298 WHIRLPOOL 76a758c9398324e3baa0d3500b4585dc0c4507c4906ee2bf38d66f564c3e8a50a7ee78a02bd19533a439b4e7f021b1d8223cb0b84c92f212cee58004d16570c5
+DIST firefox-38.1.1esr-vi.xpi 467504 SHA256 5dbb33b24492c92913882a36ab14b4ddd4f66ab88a471e632b75d3401b2dc279 SHA512 1ebde2909795e52a83312de7a95d888848a9be5b27763993488277f9ebb4b8659c79b4c449faae23144522150cc4d817aae8732f56456bf7410041bfc8096564 WHIRLPOOL c7b0418a59dd3558dc378fe758913baed566de7eb3b9e73ff78428597451385a56db0e178c62c3fb45a1cc8186f9fee40653749e997ec1e75c0eafcf0e9ec9b7
+DIST firefox-38.1.1esr-xh.xpi 450242 SHA256 d6bc066a87fb477aa70148af6fd54a595759fc73e3567d0db520c7a1053fd6d9 SHA512 35c3e1e8d342b47127ee1f62d803bafb04ff7323522e04fe035b907e33a0486bf9ef6d0c5e13ccc8e0fef3269d72563ee3c630139331c6b72fdea7a41d8fa750 WHIRLPOOL 782b7ea1df96172ed7fa35cd8bf7c9a6c94a7b476424df860ea944fea980e096894b0e187e8aa04de4353315ce3a56d5a32cef12d4abecc2c012279a96e36f35
+DIST firefox-38.1.1esr-zh-CN.xpi 488276 SHA256 7991a882bc8c6f32a7b17ae73f5f9f277ce4721142f43d368635983b94f1af37 SHA512 84e730a41ebccfa506ecedf34ab9178e8f06009ada1df66a416185b37fa95219eb30c4ae1ec5775c2463bec0a54a742e24897bfd1910e1d0b26290f19f482381 WHIRLPOOL c58a0f96c84deef6f0d8cbf67ab5ad4a385024eb1b54aaaf6e94ef2aa250b052141f7e2c5f9b3d355df7c04003861f15449125c4d1a9dc974905484a0da76344
+DIST firefox-38.1.1esr-zh-TW.xpi 467845 SHA256 6cd567d3f080113d38653fc35989ec90023d4a2a55ad383fa1884a32f5322cbf SHA512 e2cd554031764be878913df4f69d7b5a27133abbc1f9aea6e5ce16c67090c96de29ab40d2b0c7af962295c467e2377b3ce8d0e42b37b6f6b8b6a774ac9340392 WHIRLPOOL 385f8e4a6cd49c07638622c767810e668154095e03ddd4041251ef15ecd81b337875386ceb4b05a77412a8b2809e02b8a500aaee5b8e5e28d6472c40e8478765
+DIST firefox-38.1.1esr.source.tar.bz2 180687874 SHA256 020d2733884155b4334b7e3d7f394292d4c2aa567d259cbba8f0835406cd11e6 SHA512 1dff1e96e390a925de5f4e06f3e6953d13d0be14b88b7f4c736e5c3ccb5a5eb27e313bd7fcc4019ea1928e198c3345a5a2ad6a98e0efd355b099eaddfc459645 WHIRLPOOL 431257ecc8888d5c520eb56c58ba011473c19640741172e07c08b6054485e59c05fe1eb4ab652a1e26f18b3462199ba8b36c9bdb1888b50fb9b3a8685b83886b
+DIST firefox-39.0.3-af.xpi 487312 SHA256 636f1008419cdec31803ffec6e4ed1c9b9e5a9f9685b81b0677925284dc0698b SHA512 47351bedde233853b5c3986345de032cb427efb3e25ac0affa491e7b6f21e2a656b6b7583e66752c888e4b4b072b2611f9e9b323b2bce127c949468cebbb5d91 WHIRLPOOL 944b74535bcf88f522a570b3959f840c50acb491ebaca2d5de2b1ab2a86b2ec6b0425585c69ddd00c1f38f3303477759e006205a3051464b9566e0ae798e726e
+DIST firefox-39.0.3-ar.xpi 520324 SHA256 691dc042d849f7191cefd699917983a7f1863afc442f536be8362c0bf7d1ef3a SHA512 0a46c57f77fba374d5b6f965e15d655f4f8677b58afda43fcfe17c44798980a98cd26ca70f5d2daf941c045a065c13888c31687300ed25bf721b345bf2d96ef4 WHIRLPOOL ce6ad287b224cada893d8386b65d9cf7ea151b03ca01501c00382b7401a39dddee5eca5034c3d1742836876bcc1598331362052648f1ebbb720b29237c91873d
+DIST firefox-39.0.3-as.xpi 514545 SHA256 af15e715944304d55854057f28993cda96041576e7a1fb973baeaefbfc969b4d SHA512 d27b7ea53d38ee2e14bf3c02af155f23a5fe1b8b5c17f6d0489bc161b6aafb6c3c7b1787400a471a62fd5ebe9369c717a51d95f0235830e61d19169b6dab1fb0 WHIRLPOOL eb3de4206100f67f3979bd48b73c75c22e484c7b08df6d776abe14344da4907cdd01aa46bd4ce21df4692aef1bab71bfac2299af6cfb59d4147e338461d83b1d
+DIST firefox-39.0.3-ast.xpi 387702 SHA256 56ce0c10165bd56c4b9c822ac32cf542374f7e2ee5680bf01f36fa47ae901f30 SHA512 2c0170dfb8661b26b7ff1046e907514f6276b311bfdd5765582f6b3c2c9ea6d70b0a83a8ddc69c61bca4de6cfef01a91829c29108b95e6b1cb6c4ea48ffd1b93 WHIRLPOOL 63a64a80a47d2c048d5cbeae4e4ff9b86f397886129dfcfad9880e7199cfb7d929a3bcfb45fbf1275dc8ffcaaff57fb692204d8c1d16168019a18d256dfb579d
+DIST firefox-39.0.3-be.xpi 445946 SHA256 d23f672dfc3a9a0378fd00ffdd9a9193c53aaeae204ec0d14eeb817885102d5c SHA512 eb25f7039820b85baf869514de579d0acf2cca007538db075d426e460524d4acc5b26ee66282148e9d83f642dbee0cebedc52c884e262856dc9fbaec88012316 WHIRLPOOL cd51a9dbf51e95af55334ed37e734777aa6710ca19200e5a93ecd18bc950cd4304750c176dcab59a5860a4d0340c15e69d2814144c4d5142920e8f385957d031
+DIST firefox-39.0.3-bg.xpi 491424 SHA256 c8d6e26c13e246c71c00ef0ebcf744a63b3a4bb9611fe3c53c34d30e693f8693 SHA512 37981a182f9c22139a8c49a568a085cb323ce697f7648f5ca0a1558d701daaa0f5bfb7840ace78f0d09d4111e831929188f2abbcdbeaabe12ac86ab9bc970a47 WHIRLPOOL 766c8a441fbba3b99869a4019a6d3e0c910aa5b8f8ba4e3af05b575d3dae02b5059f1d3216830f945ff5fbbfc86fac59eb602dee1ca0a66376547f13a7ebb9b5
+DIST firefox-39.0.3-bn-BD.xpi 533077 SHA256 db3672e6475312810288dcbc51fbdf3361018860df3d7dac49542d0610a95ab8 SHA512 ca1ddf3436e31b1e5bad9718129645e60004545429d94c17f4a8dc52e62814f2a439e2ac43e8e56d6c2fb0b7f2968d4bed2c1f367b03959cffd752d87d98e381 WHIRLPOOL a6e0e12f02deba084072c6559d6d49cd6d028a48f4ba51285f672f12c866d07a5f59f44b033fa6f7f98b0ecc4b022c39fcd0e12f44655fc61cb0dfc0e4471142
+DIST firefox-39.0.3-bn-IN.xpi 532549 SHA256 cf6936517ba55b60fdbf43ea8f58fdbce8715cc1d8b500ea27ac6113ec87d6b1 SHA512 dc0899a2fcc84553358d60129f9f1bd6d897ceb665e337601df2afb443d2ca7d7ff54a21381766a9afa743038e83a36d09ba5d9ec37361dd91ca74c45a586146 WHIRLPOOL 6aafc9363afc50547407d43d2adb8bc4d6e755b588478c79aa142b82763c31e314a0299d4fe10038681e820367624af280c4da4ae295ef1fae93c16385239a18
+DIST firefox-39.0.3-br.xpi 445831 SHA256 ac2901001369078d450ee705c38434056172c14dc4fda04916fc2fee03509c6a SHA512 060cffc2c6a0614739a4808e023d8a44cc10f981843964d4b65e511ebb4490ca24dd8203023037f23aa34ee0edc804afad70592fd095f44153ed88aa7d49e7e9 WHIRLPOOL 73abbf551d3147df21767f7782c2abc7a2cdcfc5c7a622ebf1536276eecc0a4c2417a1faf4f6edf698422c1b1159354c8fdbafa9f6b8624f54d3295b61bfa0c4
+DIST firefox-39.0.3-bs.xpi 489606 SHA256 a5a4392a8c052690075a8d20e06a3033e0ee3d4b084c7a0ae90c17e87a388fc9 SHA512 df8102fbc9c1370e96287cb16fb49e5c88f0e30999b7ce85a044334c26aa27448d0dafed857778d7e78f559e6d6e8fd11641f046750f8ebea0f7b67adff4e214 WHIRLPOOL d3cac4c1613650707490c22fe3bf98fe341a1b550d3f419dc2db69a5c53d9328862fb06f1dcd9aaa13dab84b9e0164a048d4aafa0a22a38f25f754cb9048356e
+DIST firefox-39.0.3-ca.xpi 461924 SHA256 d4cf411e44da8fd0fb5a9db07712314fa40e09b2994f616b79fe84208fb6a991 SHA512 394f708082d3e3d0a414967bb068414aeb2daf7d183c343a0525931ab6862e05c2e5f22b21764db59648897ecf3d50ae674bc28b73c222c4d044be77abfd1930 WHIRLPOOL 2f7f8987f4895a729660c689220e7df63e53bebba91b665d127de0fd051ac8227bb137d50e2f76bbe6efe781c1ab29ca6e52f65989fe3736109d613b9c719c18
+DIST firefox-39.0.3-cs.xpi 450725 SHA256 f8f7b1c132e523a07192f91d86522dc8b34de6741501ceb4c910dec81d86f4ea SHA512 a716d226a51fd61d0837701e729cae82240a1fc03b5ab523a67e8856ea8a4153e442fe705470bc38608b7981267276e120ef3ec068ffcfec3e5b9a424507cd3c WHIRLPOOL 5a1396538b67c7d4d23755c1098ff797b00ec66061b062feaaa1beef4423a6b96593cd54eb33c51fa6a97cca8d2bd3d835714f16a434ed0c33195660351c7cbf
+DIST firefox-39.0.3-cy.xpi 448066 SHA256 64512a5cc9ce05fe19060358ea91b4c783074d0e0c1f33d29a7f6c599c277289 SHA512 aae955f84bd33d66336d90f6184f27ef4b9f8c0452b300b81c64e998ee7d69bfe7b69a01b67d129d928e16dfc2fcbc1de1addaa50acf470a29e119cd3ed85756 WHIRLPOOL 1b18ec5011abf6ac6c33f88b10d28b1e3b98a16eb6dbbf3f98ce083221ea2a61bfce40ba695e4982149ba002717d706be3a1b34576ef9d53209a526897c70f0e
+DIST firefox-39.0.3-da.xpi 454612 SHA256 4efc40b632d0ddf144c4d42d7ab958328e75757ac41383d0d3bf8f25512f4b27 SHA512 fbb0116c54dc0300d25e4f264762c81eef86f98c033d14f5fe03c4832365b48546405252b91b4aafa353b88854b8176f35b48cdf8eb7529baff8c66f9ea1c332 WHIRLPOOL 6961e6a786cafb8c14762fe937ec1231e28423b163b3be69fac2f994d52a62d8084e6163f3964a81ae83a16ff9032abd8560f8f573671299b5e53a20d7414a7c
+DIST firefox-39.0.3-de.xpi 456191 SHA256 e697aba8556a16fb9b64becb68e6772dfd51066d5ad69408aa8e9954ac855091 SHA512 876b844cde645bb0316178d910b702431529be344b1884f17d48a303db3edc72a560f209d29a061138c2745a70d54d0253ec5afc3177932e6b7ef99ee89f79e4 WHIRLPOOL 8bda6e39ea14e8af92358b303d78c4d34afb4ddbf7e0f96b8fad33250114c286ae71f14fc68e0052613036b3ad2cefdb064b018ffd6ce7a6dbff4e2461536a31
+DIST firefox-39.0.3-el.xpi 502654 SHA256 cf02a24d08394acef9768e835f3d291ac8432aff80f8b3bb2f5bf9c0bbb9bca2 SHA512 d19d27db087ef8776b14a2bf941bcfef130ade60113d93da1d921411ead4b976a5615fc67210dca91dce5c5c62e4b660eee90273ec324f0f9cd3824d7c31fe30 WHIRLPOOL 567922813c0169a332be9b96d0505f6fc7c94f9a479313d10828db707088be533d319cbcc39b1defd9b7ce8d708f9d2311652ecbe5d399b255d6b7fbca7be336
+DIST firefox-39.0.3-en-GB.xpi 441233 SHA256 7cb4b871f10400cf3f7e4a919ae1ce0dba4b52a605f80cc7fca761998e0de86f SHA512 6ccbfaac2c274cba193d5b1e48bde49c43bdd545c88edd4859d201a38717654530c1f36f987bca4afac76531eebc37ad8bfdc2e139882226802d096710f86d21 WHIRLPOOL 41c2e8d586513522d971f4814c0e6e58ee70cc0e6ac81447da27d45ee6b215a6699f7683616522e28c7beaafdf40538125650fd6e0e29ee28f1e80ee5c3cb36c
+DIST firefox-39.0.3-en-ZA.xpi 444467 SHA256 16001f64b08f486608602f99b0ad848e34f873807caec707bbf370f7757e80d9 SHA512 a1fa2af0bb25b3e0d8d65e59e5c78ebed809b08e6a7749e550c557a0c0b9505c5783488597bf8079e44d6251c515d0cbb82379d2b69c194e49cf8bbf8ed55cfd WHIRLPOOL e9aa070156dd211b3decdc06a3532f20def620e3f7c0b6f30ccbdef1937242be2427d4cec1af8b4b65d67f060e0a1805d2db058aeb51e6fa7bf62a7fcdf36110
+DIST firefox-39.0.3-eo.xpi 489006 SHA256 818af2981521308baad0374c30e98f41ea0b78d0a1518fe28cc0f1ac2c5bb64c SHA512 2a604f5f2451bf0ddacd6dcece0e20ba1559e1a4ea5440370ca3b106abb2a13069bb81a15b3f0d4fe9634c0db89c0460e2a6504bfba632b37daf3ec004400001 WHIRLPOOL a79f00c14da7bd48795625e3bdb21b4f07b84571180879e39010525d6239503c8d80e7e343717cf52e8e093410b966835381d145a9050820602d0603d159df31
+DIST firefox-39.0.3-es-AR.xpi 457409 SHA256 705def4970aa771e07b79985aedf008df01ec3406539373d0a038485b98263bd SHA512 4bcd64d29545d0c3514b4ab98aa6e5f610ed8ca444192377b22ba24b2f6f8a4e7bea83584408151e7b278384df4bd5df540df2d52d1f2cde62a00638ccf138e1 WHIRLPOOL f26ae55685e957b538a22a62b242174b0b8bb9e1799add1cf73bc9d0fcc9b4a81781dd730f4b7e463aca8c97a9957de0f48e701cf0ae44017b22fa9ca193bf55
+DIST firefox-39.0.3-es-CL.xpi 386703 SHA256 156679aa6852979a39185d556d8722c0cbf2deb7024c21971be6c3f92a2cb60a SHA512 c291446b9596365b657ffa12871118ecfbf6f2f739ea7c146a95021e9a26ecb6cbd974ce49485e1cfdd8dfa3f014c1cdf21b2f1ae279b0da4facd5d01e7ed696 WHIRLPOOL 794e3baf325cd162b52fdf659fe110271b9d8fcd681ce65d51bb9505518a75580eb4c96ccb7befbc73f8a0488eca3d3bb08fe17ac1ece63569a75faf64e090b4
+DIST firefox-39.0.3-es-ES.xpi 376301 SHA256 d6071cf95e71cbcfc92da652b850ecb157b865de372ef3499f982bd75a72ba46 SHA512 d4fc71cc354e490a3818b91280802ae4f576a0821947cec4eef6833196c7ed29714c1f3888e014efd24154e5d04dc981b7f9a7fabad6bf1e06137a136c8648a1 WHIRLPOOL fbf82ed720f5359972262f547f08f426da8b0ce9118a6764d61166dc0b441c586a7be8c2db6e417ff4a677670d9497430cd4cfd8bb004cd6aab021fcacf241da
+DIST firefox-39.0.3-es-MX.xpi 462391 SHA256 dfce4840d66bd581d105e43f2909070449a49bf47e2c7aae823c8b65d726481a SHA512 0138c655196f06c358cf50a6270b469f12d71038ddc55f4d6ae8b412b45a52949d3365e9d2f68a64e856c86a1860578f1f1547525a4c6e707c58497c0ca0c7d0 WHIRLPOOL 56c9afd0d252257556825cd179c6be8ca9058dd907b533ca850ede81532ba32dbb010b55daab00adf308ef5f91ee6c0f0d886227efff722f6ef6c81ea0141240
+DIST firefox-39.0.3-et.xpi 446727 SHA256 e5d388645605030faf36ba69f4f305a58fcbc0ffb423ddcd50ddc639c4f13c0b SHA512 efda9812179b8d5421d486f3146c2a94698029cd75f14b8934f11936a05a68a2c2a86b48bc1c7d2d988a62beb6e608e9bb8d436b74699e1d8f795cbaa3924a43 WHIRLPOOL 26091de9347eeacf5b83f2bdb2bc7e09da5708ec6bc2ddb79e3ca79c5e1fd1008c7c2235d7b7c5ee104763493e07f253e1b9a69a74529342200267ba896d99e1
+DIST firefox-39.0.3-eu.xpi 470412 SHA256 8a2ff73d671eef1c8c7b4b6071bbbfa6b66de411dda3d332f8f69466c5596d47 SHA512 431efd3bc505028d8ad4d18bf0bc20a8402a3d3a28b6c11455e9dd0181ad13405a241960b1d3a80c2ff63aa818091965388562d2c83e29a30f537443040cc6c5 WHIRLPOOL 7ad171f5f8655466a1c147a7a8d52654eca03d9ba542e52521cadf7553cedd7aa8ee2ffafce9346b8271869d7e3f6d1876f7f436292419b3674c1af2eaff870b
+DIST firefox-39.0.3-fa.xpi 520580 SHA256 4cc0e0f00af90d4c00cc4cc4deecc0f51688fb9621befec012cf858b1e763527 SHA512 8f7b76f7b5783b567c23cd9ecdb791ead2ac00916e06d8805c45509bc169a876dc37db8aa958db3c79f4b5b1fc192dee1c64f1929407b879e4e1109822c9e92f WHIRLPOOL dd22550eec25c8efe120abdca151272c9a2440c4ac7a7561feacb66f9d02a2ee7c483e6165c8ced278478bb0042981fba040afda9ad5dda3ef0d5e37a1eb6449
+DIST firefox-39.0.3-fi.xpi 448586 SHA256 21b1d1a0bb4dc5acf1c9a7f84b2273987b0525f796afdb0b3ebf3956a102a842 SHA512 5917737ebee096b148bf1943019f720c1879a4355213074e1a08bcf47c0d368322b180edf37e04452274342d93a2ad820e28bcb822fce742b3aadd39abc1f126 WHIRLPOOL 0e65447cfc7f860be7fac734576f7f833b9f22ee76048ad473febe527cfae27c089eff55a553803facdce9a2b9c13787a84e874cd9e194c16300ae40e883b76e
+DIST firefox-39.0.3-fr.xpi 465589 SHA256 9e158cf27638bc89ab4758e427212ac1efd4b3c0758344db1630df4fc319315b SHA512 1fdb86ac3de96f7e3cef8221a12990d0d91a8bcf529bbffcf8fdb5b73d5a35e96adceb05b778dd696d6ee6b7c1f2a8cb80c193c4bb17524c44ce4180e998ad76 WHIRLPOOL 68d3f771f09013375689ab8119f0db3da4c72d89f85ae3fdc0d342407e1647affcdb97a63a036b6e5e5d552b6fb95788b688d35fd91c8765f5bc790ee3a3ea88
+DIST firefox-39.0.3-fy-NL.xpi 459615 SHA256 043039d1b2f6b8519d5e4751fbac53c6cb339a967bf87e465edb46a77fc71e69 SHA512 cb88a24e9020a84262adc115dc6a31fa9ff77d467a024ead59d0a8bf57eed80d1e32a0265214339b78f3b4c5552517786d6b51c92c711f7ee3f721f7e00722fa WHIRLPOOL 88f1800e508defcc4e286e4c5d432f0d8285b11ea2e53a4f20d38a78c05046cfbf260b43bb9561691e0b89b2eb18091fe4bb7993690a0f3b3b9cf9a63eb68495
+DIST firefox-39.0.3-ga-IE.xpi 473549 SHA256 ceff6d0261008a2ad29c73f7179825edda4965cef8e3b269304e21039ca3d06b SHA512 3b72939f00fcb352d2ff23a20e457e31de5f365efaa2e4b319b18f72cf03029402b5f4ef3aee7b4343e02210c8b0c0f230e05263cec085139770dc9a2ed4b744 WHIRLPOOL c22ee96eb43a613eeaf5378cfbb7445f77e40613c8f0ce1d3282f0a1e49239ffb10090a9234bd60b09b5ff8ef5d149d9fb07d77e7379845ffb62501537e2becd
+DIST firefox-39.0.3-gd.xpi 458523 SHA256 066b1cb207b66c8b7acd342f92bdd724aff9fe89a85263ef4ba58e499af20cca SHA512 a9fd206771293c4dfe02d784fc833d9b1cf627d6b479bed986237f2dc1d59008a16cadece6cba633a3fd30da0492c25e6fa6c9a116f7fdbaf4df6949a0695040 WHIRLPOOL 149cc5270e18bd3b30d34a61efb4aa46030714990385628596704d34b4c8f338703b384a18af578c454c75ea332372bcae9fb96b758d47a9c1ba824abce794d1
+DIST firefox-39.0.3-gl.xpi 453847 SHA256 d95d8201f7170f8d3147b1a576668d8d32d0eff5d79d78231e8ae45c323d8348 SHA512 7095d11f20481eaf84c71dabf5a2d54df5d994d04bfcbbe9ae6196b7fc042ca9da00787379f94b171fafa57620f8a8154f2b4baaa5489a588f2b244c0f2c83e9 WHIRLPOOL 1659edb457f135eee76e18a035e8047ca079aa893c8e9ff5eacc4861428feff69f625414b2e28ce884410e03c3a00d2dc21e8a872a6bed1627b079177e7be258
+DIST firefox-39.0.3-gu-IN.xpi 482871 SHA256 9717f82837e53af7fb46881237cf5f549770fcdc18e72d095df5fcfffd6f03ea SHA512 8d6dc5a125443cda01965309df9a05a2126d88f8c93fe27803e81040319776dd81f3dd6cd923c343ba89eea76e47f8f27d13b42d19c9412d63bf798cdf4aa8db WHIRLPOOL 25704e231ec301e7d8693e24d0a37127bd3519fed2036839eb43499bcb36dcf4431d6ed6aa63c30e803ee0a4f6e6945b656e4450b5d117be49b45bea7537cf9c
+DIST firefox-39.0.3-he.xpi 486476 SHA256 140eba811957fdc4f487629cd747c6e3b8e787e337f371a5fd72d48994720968 SHA512 64bd1f0dd26646d1a55b1381363a5541044d7672f3a8976b11504d625df5f544098546bb8cd54a0b6c7e03484eb98b5e467c8461b934d508a6228c7dfa6f24ad WHIRLPOOL 64932103b39ec865d028220d1c7e3fb27882e7eb49ee32fae62b6a17fc9de593bed2bd0e15f971f6f47a2f2f9a649df4c4842fe0e33c06ab143a8a5ae391df3c
+DIST firefox-39.0.3-hi-IN.xpi 513452 SHA256 a9e4c7e773bd44fee252db5736585b77f39dfeefe3102bac062ac3d5ea7d29c6 SHA512 0983340a06b706ce357440c1422809d62c18afca25d14c20c7a3ae66a72137639e9d1029717b465a760d50a990b598b4a84e17d06c0f4d2ead44a4c9215f0367 WHIRLPOOL 9e3f5e861699aea4b4077f0b7c15377f9c7ba003efb97ca38145d7a2767d086ad9532139cc56025f3560113f28de765d6647137f5c0593fc225bec5bafe0d933
+DIST firefox-39.0.3-hr.xpi 482072 SHA256 c46bd88b7d0246d0579fbf815b5bf91519ee495d03725413da1f103bb66563c8 SHA512 05e0c2a1b6ba6ed47fbb0c20ef5492b1acca8ea724a42ac2ee22200cfe4b851297a32652ac6d93f3a193b967ca1daad20364379e095113de787114063d5fea83 WHIRLPOOL b3fedca192e4f8448eacdac18ef5d7e1fab5ce3c935f52c3e2c9de93be0640bf3274fca8fb3f6a4545b564147938d18464fb4ad98b1938f186fcfc94d399c03d
+DIST firefox-39.0.3-hu.xpi 457442 SHA256 8eae8d1f97a1e74ccd4c841c5a5402fa45dee34fa2caae1570264693fa377ff1 SHA512 759ede436cde44bf4a54a79fafb800be5ff264b607cd5ca32286b0111dde73b289a3b56bd966506f566ed583d1d42de5cd964a46b8cc6609a418c8ce17af2567 WHIRLPOOL cac4b4f59ed9c79b0265c7a25d0496251545c4a2dff753302566f0a7d0134ab996236deff91c91853a551ed78c4602784c5e4c5385de59085fc4c5a2966c0a39
+DIST firefox-39.0.3-hy-AM.xpi 538194 SHA256 4a34273d9893bd6a5bbf7f0ea3326cca4c051bec603db5b6dc3ac42f10a8f70f SHA512 f0364f6ed80c70a5c1db1062356a531bc5fa809a0c6fbfc6022a53d97664308682105c431a200268d3b7eed0e33b11b9433b3b9b2a6b1bb22903efce3fda9d15 WHIRLPOOL 1120c1919d983b0855c220aa66b64cacf488ccc55ebc49a83b5a8670aace10bc6988a83fda1c4086b050a777a5a68f389fffeb261e35333d1c4ed909208c8176
+DIST firefox-39.0.3-id.xpi 435241 SHA256 7b26dbb6360614d0c4e9cd37e771314a6e3f903cb39a6df5d291a330a1845481 SHA512 b425f2535a39cc6ab2f09928bd08cffa279e4e314844aa996e63da1e8164af80fa3ba9025183812a3cbf21d051463f19b44073c5a2b06289eb32227cc183359d WHIRLPOOL e8a13c63cc65b1d1346185f3d24eaaa8473c56609f0413bd148625c5832af96275ee5bec8aede94d24adb007054e6186e03778438f66d7fdd0f2344f07e385cb
+DIST firefox-39.0.3-is.xpi 488864 SHA256 f5a1a14dfaebdb4d8bede2acf9f9ee2a9182c30f51e8fd30ceaa852226e1585a SHA512 fd502151df9606f70d0e11e3d82af7fc7c1510480982084641ec08eaaa764f11221ea3c0b64a922c12ab0e01f13424e8ceb764a71761324e67fdf6f79d791b17 WHIRLPOOL 2920469d682e1cc8fd2a7cba092feb95067010ac37502058f4bb31d2adbed8d16247deeabb49a99fb0b25acb701bffdcccc8852cd3cc9eb736dae5caa3045797
+DIST firefox-39.0.3-it.xpi 370615 SHA256 1a78bfc2318aabee74440522dfd60f178ff06bd952424dd6e8e556f349083fc1 SHA512 e79aaea6c256469fd451585a5bdb03797d0ea8785101d2360abf5eae058a7328772e72d2fa1b33d51444d994eebf88be70f67326a989d480ec33b2ac481ec872 WHIRLPOOL eb811278232612f1e19322559abfb94a2b6bcdde83718d5d8ec4ae35f3da83c7a39ff860b667573f2723123d7283cab4210fe8afea7a9fbc26b20c5e2b760a2f
+DIST firefox-39.0.3-ja.xpi 483151 SHA256 c4e279fe7fb57c670e96d44f88fe48cdc94aaf95accf130faefcba5c3bebd7ec SHA512 8dbf2ccb249db22307781e645387f0c1ed6ec5b03bb790d41a092dd77e6bcab5c0d6168ff25d0d489f35d55c30f09685100573be9fb83544548064990cade694 WHIRLPOOL 0310785dbf478c3ce2905a3ef8ee83a1ad087e4622a173c7f7a9c0c10b96a23236644d72b30912f9b0adba25faf713d84e0e7cbd39c74889732c49477ec9ff0c
+DIST firefox-39.0.3-kk.xpi 507528 SHA256 38d76fc6d29dcbca7fbc5b91a23f79baa4710c9f7a4bbaa58e610270e701c5ce SHA512 e4bac413771e24c711866104969c3f794010bbf8327687cbc984a06512bfa302403284f0adb760a587dc8d4e058d6b03266696a108a4383de566dfdf6766258e WHIRLPOOL 16d0ebd182084c694ae5c9eea20f6cdb327ba9f37552be610e8602ad79c3e25b8125d875735c24ad8014303c4f6ce7e82444e0d9a3bb36a25ae56e83c4999bf0
+DIST firefox-39.0.3-km.xpi 571221 SHA256 1f9c58f0039cf07e1b255d5d3826e4d2034e538db787dfc564fa28bf40bc6248 SHA512 83065a86bf8f0a8aff1eff29a6c78887a28cdffc9a575e4b64c7f1042d94308784eea6aa5c4a028b787e174470ed7bfd595eeae9cb7d3460bb3125b849bde50e WHIRLPOOL 778346803cabd18b5113ad42390f1b9631f4195139aff3d6256ff3ed2e54e86221934aa1675795825d053821d0845941ef438338c7a91391fa34ad0ae9c51017
+DIST firefox-39.0.3-kn.xpi 537656 SHA256 cfa3d9223c361ceafa02a865257e995dce26545b87e31dcd43d809fda123ef14 SHA512 a0b844288da56d6bfc187383e0040c39386092508d335e73902c2b8e449ff4af0638738b0d0d8a56cc7cf27e0876716816db632646348e689afb5d1e7cc7eaf4 WHIRLPOOL 8fee0e7eaf00d19b6a0864e7746890ee61d93a261715a08d59bec973641546544499e53b5609b6e05cf325aa3f9e4881a58c9669bed5f698218c08a242048082
+DIST firefox-39.0.3-ko.xpi 465015 SHA256 e3a7dd8b0243b48da1daa027ea49621ab38d7d0ccedc0f1495216c985e344298 SHA512 9abcc41967699951acdec6679c527226bbf8de27325b490c952a5c9510ffe0758953cb9e1b28e9d5ab893f5633060d37b420d525d9c4d8105af5e4185e0cd4cf WHIRLPOOL 572820618127b88a9c65fdf8ca2f1a2907c733b97d812d6c99304a6a6179dd96f0c160259129852d3de18399f7fdbbffc51716b956af280f1a30e83f9c090543
+DIST firefox-39.0.3-lt.xpi 490582 SHA256 3c26dc16f13b69cf6cc6d254472f33e6d496dd1b34a459cf7464c13a7953ba42 SHA512 69c78ed0ea74b0db76bd9df055ee04db5c7684e647a014b264d9b872bfd087b0752bae06c03beaa87903234057cc311d3888b668e311640dde0b4cda8506e4ef WHIRLPOOL da6c4de47548a676056840715ae2962dd88c655547082d859c5dffe666b8291b5400c1a1a60d76f1778d6e9ef943674cfde364dcda82e49f060f73ea519b5f80
+DIST firefox-39.0.3-lv.xpi 471167 SHA256 a20c29eaa45587c268744744f191c3c189fc2c802162d70fc433e9801ca684c1 SHA512 1f06bf99d47defaec80cca30365ef379a8bd0e4aefc6e679ad3d2dbdfb9ea530a0582cbefffe5ce9561dceb731aba5403b1fc189bc2f6ef16205d401dabfccc2 WHIRLPOOL 94ac7fbecf445844e170b048607ecfd8f8387a4a80d5703c4ea2926daa59c77a2c960375488f8de435672eda6ad933c1451fe9b7bcc10b7b0869b4c72ab6d5c7
+DIST firefox-39.0.3-mai.xpi 520124 SHA256 c8cbc057e1bf7af2fc48a378d271a5c3e840fbd98a249cd40ec5dea9b80e58b3 SHA512 430a7338d376408298ee1fcd538f45a740d97c8f1f0e5924c1b792c56bbcbb19094064a15f54e9519ccc4e8aabad1988752884b017a2c29f2b90238fc11fbf99 WHIRLPOOL d2287ba62f556cb41a25672f674de5c6915952fbe3ebafb78e6da488cdaa8eadc51c8ad3fc56dbf7318389d551829b85817c733148fa391127a866921167d341
+DIST firefox-39.0.3-mk.xpi 533584 SHA256 951cbf1c97e0f8b83037f997337c85bc18061ebfa99c24ba22cbf9b17954b6c8 SHA512 f4d914e8163b5ff994b0e149a6f72f3117f3f417936f72f958c3859184e5379204791ce2e851efc7546177ead9875176ea9f55fd03671261f01533b5fde3dd15 WHIRLPOOL 62486329a1fe61ada0eec5a6d6b94bc043c70bcb431f9184286dcfa86a5748f2e85f5a931579240542e09a89f06692e947e24a0fb3652035bd4039788173e4ef
+DIST firefox-39.0.3-ml.xpi 533594 SHA256 3dce61ed9f96b540c0294f0ce57f3d4bf95a1c357789cb89ae611b6f8568ed07 SHA512 af05ac8f669a2bb1014826466479db216f19c772fc6c78cb8897174001807810ffcdba53588466a50bd25eafc3cbadb56e8bc6b1e6e915a2d81db13d8948239a WHIRLPOOL 76b6494b564804749825701a1ca13d00f84fd345bdac18a840d3040e128b154f6c20ba2fca852eeeeda1e98b6d4fc4439caca12626ea8e73999d7a09a643c0cf
+DIST firefox-39.0.3-mr.xpi 510890 SHA256 0e6daabf0b522a98a5043fd448fdbe8686eec2c506e37c9ef42c5b09662f4c0b SHA512 2d504b81be9448bcaa360d960c7403c265c67ca9cd46927962c5c92ba54979645323564ca08beac7b51c115c302b2dd640e8024c4538d5d4916d88b9f6a88d6e WHIRLPOOL 3b75cea3d7d7d0f57b8954ea60090fe8fc7e9448f781ad21e2dbf7c792daa28febaf683863d4d3a705ced7a352aa239dfa01fc839cbe05e829a06febaf2d152b
+DIST firefox-39.0.3-nb-NO.xpi 447826 SHA256 db306e0a784d8892e53b32be5d24171e0bc9d93b9b0902e3ad0c8d15d32fce05 SHA512 4d8485bd05504ae84c5c9b83a21171ea13a9bd4813a1c7eb17ac2bff85a2b419ea24df4199f3eed619846cf985c536b78c8b38b85d581154645c5c4e39343b8a WHIRLPOOL 062c2060edce3ea0cd036433450465c1962cae119c3317f4df453f681afe104082fd49d71dc57718ff2da605e958e4bbf22190588290ff59cfd0cbe4f9c8ebc8
+DIST firefox-39.0.3-nl.xpi 447541 SHA256 eb7c7fae899d51a4e65c170272de7127a24366926d8bf5e42fb0ea4db92f72cb SHA512 e8b0fb55960f174531bfa3f11e1c011cac3dc02f094dc2dd115af8228dc34b1bcde44559c84d1d06b9c68520e189a73939c17b85ea8b5b30d47dc1fef5070107 WHIRLPOOL 4015c2f2315e905f5bfbdbc2e1a04c266a2fbd15960480fdb5aeb8ef62708b13e3787ab5e8b954472452bef30ebe35b192b80d656ec57a5f2bd68aec1a3f4bbd
+DIST firefox-39.0.3-nn-NO.xpi 442078 SHA256 cd4cb5e85413d2985b2612f2a537e9caf97cfdde81ee55b8e8f07d7be5332edf SHA512 0ee127f79d30b847dae74ff6210fc22cb18b7c476aa58a97c051a5c22d878d8175ef8b3bd2527b322af9ea1948453a7849c56ca20cabbc46ac3c89d45953d328 WHIRLPOOL 8dc65628a9e55f8ef03e00facd2617f70e9c7f18faba63e7d10d393aae861f8ac7f6617cbf524c908ed537eb06d168fee1bbb461ff4bbf2fb3b43d4e5116405d
+DIST firefox-39.0.3-or.xpi 532006 SHA256 81116e4d849abbd6c48ee2549e21d362bf58d2f42f51ed52755ce6ffc57db2fa SHA512 347757157886c6c3127b9c14ea797bb353de47adde32444508c97d741bf48a4244ae285f06f2e870231c8b5882e43a052b8350ec4f4c825c16dad831ae8197ae WHIRLPOOL 6da7f2803d1cfd9365d904161469cc8918b8294522e88f6e77ac4a10f6422051bbeaea05757021044b67b1139be683464b1c80a037aecc37cd70fcc6452e1022
+DIST firefox-39.0.3-pa-IN.xpi 497421 SHA256 a31deb9194383d9020028e1bedd3eb8eaa51c1ffbd184489d6dc726247002695 SHA512 5cf1e49ffeecca1fdcfc45d50205e0bcee730281d3f8fa91eb4f85af4f04aef224245d20ea21dd5292130e5a4d8362c3cb64cba2b4d46e20739a4e270671842a WHIRLPOOL ccd763ece2c7b8e55750f57684cf6dc2c5e80fd1b9ea723d4f2103aaeb70182b2a6bd4f4118b35df2bee8d216d52cf062c6b0986b5832206629af2b75648ca06
+DIST firefox-39.0.3-pl.xpi 408065 SHA256 fbbdbda005b800683e63e495af2a2a81cdef7827da3090e648ebc52eac34c601 SHA512 55ac27bcb31a55987339c6fe4384c92b2bfaf871ccf4c5382ab44604d40ff556fc67898adc86b7c3e2462b969213b1fd65b12b0f7a7067171b48eb84ea53708b WHIRLPOOL 14728f1481e7147298b87f568d653640e8d799cbede26c80e037d1ccddf64b8c33eddac95d258aac6c26edf8e8b186a70fd8811e4fc42d0ccb02c4a9a92d1fa3
+DIST firefox-39.0.3-pt-BR.xpi 463600 SHA256 00e7b5c788fa46c3fc8fa98666d67c971684efdfa957a1005fcced7e6059716e SHA512 964130adb994852e334dbc8bbd72ab661e7a93346e49ae943c106faaf6d6449d06980a61875b7516fb726ed1c9cc40bd22e8141e9bbb20ad9b4be543945f7690 WHIRLPOOL e8e722042c967f992db6d26377b690c83e4b8ea5b324494702e50a74cc38d9b145dd151ee2a446425595caf7e9355810535cd9d187bf42c1cc031dc85500a871
+DIST firefox-39.0.3-pt-PT.xpi 444722 SHA256 404a471d7b2b1f0437231100c84398a961b3849c4e1c880021a0ac943b3d0c45 SHA512 f606e8fa8aa19138a0a341c90e789b590bdcd7c10c2dfaac74c65e3a8706f4955a8137f78198348229c282ce54839a3b91ed10ae45e42ab74fdc651bed401a2e WHIRLPOOL 34ed05ff8351c0f8582a8ecf178b1dd2c93ca59442a58a05f46eece4072d909b43a9b15d394e65c428925d8c1db67859611cf53a187347e597fcaa1546ecf7ed
+DIST firefox-39.0.3-rm.xpi 449716 SHA256 7ef916a3c91539d4a30d6928bd1c78bc4748ab7d2fa35622c8a28db35fb62cc4 SHA512 b5d5086acc75837a6889d9066876056283656669c07e62280476bf633e53020e0ce0535144580258b8458856573dfcf6b3ced3ba5857b81586aa256aacde83c7 WHIRLPOOL 2f31f296467883721ab6fae8a40db3038d948f6eb6162598c206467a27ce41157603936fbc336c2e37fd5b77616d7839b39017c18cf779eb2d37b3f7869039f4
+DIST firefox-39.0.3-ro.xpi 497999 SHA256 994da0e3e34237b970a4c6865dd26c9ef5c67deaddf3de17b39b49fcb66466e9 SHA512 856eda6755152c7ff3a22c47bd9bd5a4d2ec08d4c72d78aea0b8d1ef64c8487420e5d555d3ac6203b03c2c87b411d4ada49d08f4f7dd4ceb402cacac7ffe64c5 WHIRLPOOL 252d8a2f0d2749879fc635e4b4c07cbc73bca2afdc17fba0114fbbd93f16475e0dedaa37f6e7610d91f7ebf4ff5f451ebbbb5e068c3d9070035baf4fc60f4fae
+DIST firefox-39.0.3-ru.xpi 417169 SHA256 f8a9a859d42855a6a5eb0432216ba1e0154f398023e027be8810a6f8795eaed6 SHA512 d5c430bf08aefd418cc0295ddecb5e0aab7fa67a5c97e759729ac8c9609d14ba053b84ea8cefa8057d0fe73728461adfb4a97a10d32eaf3cfbdce8bbe88bd7cd WHIRLPOOL 57344bf5a6d047738fd24485291701a34ffc673994ff984c0827f345e44340dce8131829824a5da9d234c666e3ef53924bfe7a29480603f5ba99c89448868c56
+DIST firefox-39.0.3-si.xpi 542368 SHA256 97682f379d6629952e5711229586d6b0770aaca762f6c43206a5bfa556ba1c7d SHA512 df8b2be2564d1c878f5d6693a6a50f51f4f62a7aab32d90d7023249cb748e98b3d548d987c6a07206a2e565e288ac3f249915a0530778e20596c32d68ed45334 WHIRLPOOL 810b4b1196fde50b4289cde3289714372d252bae66a6f1425192dda6a55e170719a2327e89166e0aadafa05f3d02b01896841e3f869643c3a0f9977846b01a67
+DIST firefox-39.0.3-sk.xpi 473460 SHA256 e4d998a0719d7ff997024242f8da944e7f3a0fe5a3fb8022a3360e0bf04fefd4 SHA512 e7ceeb4e0edb077c646a1d7c35e622058745ff58a1b4bf42d53611be6b09f07f3f36cc49fb05aa1abaea535c41b723a006345928dd8dd635c34ffefb040ed7c7 WHIRLPOOL 19a694b6c8cbe6595e0a5316f40d3c5666912daeb9d8e0ac3de32eb9ace418f1a2a22bca9ddf83fc219edc6b729df101813e25259f1d12bc6b4343df530c7563
+DIST firefox-39.0.3-sl.xpi 445485 SHA256 fd7ac56b390249a88a2d7565d0ff96b1d4cc3aacefd75a38d7b200f4e0c15569 SHA512 c43960abf342d6a42ff31a41abcbae45b0b832fa7acfea776ac15fbb0664941a7762fb803b072d51e66985c08e6e192615f76ddc2154afed3e5d636603e7ada3 WHIRLPOOL 09ff11b99ed0c836f4b502aece1ad53191892331b72e1116f3d4fe78b5ac8b09a419624a3bf315c02d45a6b38ff90f191bd3bd3d18f414c356b61f66df10c214
+DIST firefox-39.0.3-son.xpi 453640 SHA256 37b2fa0f744230fefe332b790b851d990075c5d95923b7c608b2365f381bf4b7 SHA512 d412012ec80011f154d7d45a9523e56586b87746e025776f014cc3ab30a84d1de29602c64027a55df89f4e40bc11257d9519b94f430937ac18e0dfebf3f65180 WHIRLPOOL 2c7fc8a365717155c2c3ac7d2616ad4f1da878be46fb751567e7c2c40f4c556bb0378050bdeae1e9ca21e945ff1ca98c946a233be447fa1ca4f841204ce05cbf
+DIST firefox-39.0.3-sq.xpi 489759 SHA256 49cb2e041ffbcd7b86e31bed2a0070950c15418e1bc5af1bf59b3b700636f4af SHA512 263a291c240457a6f596323ce918226a476e89d802987e9e97cb8875242b22e79ca4e7877de3b87071d95b4f4326d0000993c352eacbce49e0208e196da5d459 WHIRLPOOL 9ef291b167eb44735e9dc8e2c636d83226e84eb2df97b274cd121fd9a15c9bdb9d16f4e521f32e416e4307d9742646eecd24c14abdc0265986311b6bec11796b
+DIST firefox-39.0.3-sr.xpi 483403 SHA256 22bd07ca3505411cbe2a1d8d598f84f584810e89e7de9fae0ed83c54a456897a SHA512 4529f34ac1309e601d08173f168c1ee791cb7115a0317dd7e8a1f4f32f3918b53f74df8b715caccb0cccabacfd8a72bf3b6f1be7deb682b9fe91150caf289991 WHIRLPOOL 464187afd2a2bcb7ea9b12b613219a3e673fb6a8a943d138424cd3df26cb99faa718c9770b98fea71c82041735870fd39565942720607fa100187ef58ef2c72b
+DIST firefox-39.0.3-sv-SE.xpi 456399 SHA256 ec9a1d4323d972519c103076a2c169ec737e664a26837e0a0a1079018944db41 SHA512 8b0aed17ed8d4a03a3b9f823ee7802b953dd3b2d9c36fe9ed88e18aef31dd5f396bb5e16da203adacdc85160e04226edbd0b0cbf811a6c60154223eb5a2b0af7 WHIRLPOOL 64444a659332a006fd1a7a7ce4ca78af120bd9ba0c596cd56b251f38a30cbe84fa3578c72d3717720dbe124ef5f9c10c97a4e81aabfea66c33ed434ce945d3e5
+DIST firefox-39.0.3-ta.xpi 511681 SHA256 b7b8c30b7315e7663306127a9bae08e028cf251e80fac411eb70e750ed149b32 SHA512 45d0df6217e245119841026f56a91881cfd6d4c9110706945ab7d0a86265b235f510ee73a3ae7af1639c4cd4f28d1db0ef1904b75ac706a100b55d055c5c366e WHIRLPOOL 41e687ae18f8f72f3e9ce9ab40f58828d4e4771ab2e8ddafbc96017082e65451d4cea79259e61e236c2bea5afe721233e50f0970ff3d01e7416604ea16c63f0d
+DIST firefox-39.0.3-te.xpi 531783 SHA256 d5da9eb34daddd4ce0052dcb45ddf47fb998602f80080c60f42776c3d8c2ff22 SHA512 69cecbc53883fa1e41de85da344c9cc77b11e8626ed605be21d87b40c2f2397e30b28839f3d395d403ad7b6979508eeec85b884e0bf64d5d02cc63d96810ee78 WHIRLPOOL c6e0f75da97f8c2a70376781e9948d5ea261cdc51cbf5740c0578de008755b7eb3262cdba3d9d79e501c90ba376c0e3f616ca94695546d8c2af9145ce46a5b99
+DIST firefox-39.0.3-th.xpi 539252 SHA256 81582d131a90f97a9f62340c64c2aa9b0a9011f3486266b8cbe997217a1ef745 SHA512 f9bb214867f628b89bc5f49d7b6e207375a27dec63c19ccb38a59fdf80dd75076fdd948f7bd13e78351f32deeb541fed7cc2ef241d2fa47319da5d4fc055210b WHIRLPOOL 5593aedfa51a9db800687f81291d5ff1e1e6c552ad6f7f1cff935c1bcf23525db6702a5323bf9ce13c287ebe98e00127cb277b1e85959746ff78e95c87d1b95e
+DIST firefox-39.0.3-tr.xpi 484957 SHA256 5e3648520c427a05b70a23ba593177ec0667440df97b0680225d3782bd2d8184 SHA512 b6818870fd03d04d15163d6faf8a6a889fc22645cf019af43d5c85bb7b530b2facecbde1ddc912f93a39b1234efdb248f9624006de3d113595b000f73d842649 WHIRLPOOL 7464553a902fcd8cb9aab3495f4fc58c32cb6fff34c1abf933e3ebc4448c60ecf2c6190dbf78f8c602c0cc6b69b27f7d980da12e481f93c4f4759f71d0eeef21
+DIST firefox-39.0.3-uk.xpi 498398 SHA256 dd41a97f505354fd861780955e4e1a5ad410ae7ad6a9c3b7d09f643a99f9797d SHA512 224f4e8fed072f6df2b1e8ac29d0175deacf6998102175498204e570fb7396c707185257a7ab9f2a32cdb18efbab104f814de7eebbb51fe70d0196d8d087b77b WHIRLPOOL b9f64ca3084253043c884750c8127adf7bb82d47b4b6bdc7f1b2b18e368d1b78fa36bae98e2076f2f339342d8dbfae572eb3a4b8dbc43ed9a9c2b0706f1e61b8
+DIST firefox-39.0.3-vi.xpi 471791 SHA256 e131d6f0ee1c332a1c7d4b8cdeec93fcaa571ee2f776e023c414f1459e03d305 SHA512 7f842d16f800f1ec79493845ec43d359090e73da67d2e6d0af1dc6fa80e85cca23f92908007160243c69f66a8ef91cd4915ff82d465eaec50cd8735d17b0d1f6 WHIRLPOOL 17af393d9c264af192dfcd746a51a90b3ad7e79f832282fd59136ec3b7fa92d1f46e63bf4edaf3b018d6ff3c3b1d17704d804247d70450aedbd90141e0bcd202
+DIST firefox-39.0.3-xh.xpi 454918 SHA256 1a39d23045c1b3b6367c00f085df99efb2c6da7ad917aa083d9404b4fb003d7e SHA512 c07a05b58580a39d9db4c4fb5ead8c1f947e96391ec52ae2834fc271a25d3e00cea4cc16757ee8c544e04609062f04e7b867fdef3bce941f4aa834facddbf26c WHIRLPOOL 8aa0012f2d596a75ca691ec31d364457ee5f05df147a2e325befdaa7e498e3421cd671f510f4b9409ea122107dd411b4dfa6f9bd20be27fabbeb57419c9c3033
+DIST firefox-39.0.3-zh-CN.xpi 492381 SHA256 4256b15ce942bb562b17994885cd4779e9549a827aecbf63091a6814c68a8548 SHA512 acb086dd809469067b40b22bd6ece1c906f8e012a559a19ab95d94500919b103d062dcb66b7461c7eef3ae865f87722f364398c09122931c56c546f715382cd1 WHIRLPOOL d9be6550cdc12e2947118b138a3625587c0c59694243e3e3d62f669d6f76073b10905b4c8c0dd1f65f488f10254c5d1143f208846b2f58179d5896b671337c0a
+DIST firefox-39.0.3-zh-TW.xpi 471889 SHA256 976a680743d8af7d08caf20f2f0bcb547eab38cd58b3fc7fa8bbc9cf9ec7804a SHA512 4231406c019c1e53a3d93180827957431c8dfaa0e1db89e8c514c35e03c6442e692d070c7fb37e16ad72179722353a15a093dd9e23cb20083ef92c7cd3a8e087 WHIRLPOOL dcd1a95c35d974047210d06184f0b823f95096d533021a618507f7381de1f6d1740eae5e01f170f9a92fe2454d8585451e09dcc81525c2f233f71ce5c34a1699
+DIST firefox-39.0.3.source.tar.bz2 183131154 SHA256 8c16df4ce94b30f1308655f9ed6ac3e76aaa2eb3643739b9263226c086d0177b SHA512 aebb3cf41f50aa8694e914ab5112e8b9fc0f451948f700d0c245ee2cec714a9311aeccbd26de4eca96c12e13f61b30efa780444bc6316cf1851d72c1d35f46e7 WHIRLPOOL 7d38fe5926b18774c6f33bc5186ea51cb4f091cd1e8a1987bc2585652d8c90da30b1cc328a4d75adfaf1d10f696cf96e161811c7cd772ec156d825de3b2ea366
diff --git a/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch b/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
new file mode 100644
index 000000000000..c37edda29ffb
--- /dev/null
+++ b/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
@@ -0,0 +1,21 @@
+--- a/mozilla-release/js/src/configure.in
++++ b/mozilla-release/js/src/configure.in
+@@ -958,7 +958,7 @@
+     CPU_ARCH=s390x
+     ;;
+ 
+-hppa* | parisc)
++hppa* | parisc*)
+     CPU_ARCH=hppa
+     ;;
+ 
+@@ -2009,6 +2009,9 @@
+     AC_DEFINE(JS_CPU_MIPS)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
++hppa*)
++    AC_DEFINE(JS_NUNBOX32)
++    ;;
+ esac
+ 
+ MOZ_ARG_DISABLE_BOOL(ion,
diff --git a/www-client/firefox/files/firefox-38-hppa-js-syntax-error.patch b/www-client/firefox/files/firefox-38-hppa-js-syntax-error.patch
new file mode 100644
index 000000000000..719732e6ec0a
--- /dev/null
+++ b/www-client/firefox/files/firefox-38-hppa-js-syntax-error.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Ian Stakenvicius <axs@gentoo.org>
+# Parent  2ee9895e032c492705adaf213706d4260ca172c8
+Fix JS_CHECK_STACK_SIZE define for stack-growing-up case (hppa)
+
+Upstream bug 1189011
+Gentoo bug 556196
+
+diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
+--- a/js/src/jsfriendapi.h
++++ b/js/src/jsfriendapi.h
+@@ -15,17 +15,17 @@
+ #include "jsbytecode.h"
+ #include "jspubtd.h"
+ 
+ #include "js/CallArgs.h"
+ #include "js/CallNonGenericMethod.h"
+ #include "js/Class.h"
+ 
+ #if JS_STACK_GROWTH_DIRECTION > 0
+-# define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY(((uintptr_t)(sp) < (limit)))
++# define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY((uintptr_t)(sp) < (limit)))
+ #else
+ # define JS_CHECK_STACK_SIZE(limit, sp) (MOZ_LIKELY((uintptr_t)(sp) > (limit)))
+ #endif
+ 
+ class JSAtom;
+ struct JSErrorFormatString;
+ class JSLinearString;
+ struct JSJitInfo;
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-1 b/www-client/firefox/files/gentoo-default-prefs.js-1
new file mode 100644
index 000000000000..22a51ff7de41
--- /dev/null
+++ b/www-client/firefox/files/gentoo-default-prefs.js-1
@@ -0,0 +1,17 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.link.open_external",         3);
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("browser.tabs.tabMinWidth",           15);
+pref("browser.backspace_action",           0);
+pref("browser.urlbar.hideGoButton",        true);
+pref("accessibility.typeaheadfind",        true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("general.useragent.vendor", "Gentoo");
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("extensions.autoDisableScopes", 0);
+pref("layout.css.dpi", 0);
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
new file mode 100644
index 000000000000..d772c2fedf7e
--- /dev/null
+++ b/www-client/firefox/files/icon/firefox.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=@NAME@
+Comment=Web Browser
+Exec=firefox %u
+Icon=@ICON@
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
diff --git a/www-client/firefox/firefox-31.8.0.ebuild b/www-client/firefox/firefox-31.8.0.ebuild
new file mode 100644
index 000000000000..9536d022d5f4
--- /dev/null
+++ b/www-client/firefox/firefox-31.8.0.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW zu )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-31.0-patches-0.3"
+PATCHFF="${PATCH}"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.31 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist hardened +minimal pgo selinux test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.6
+"
+
+DEPEND="${CDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/mozilla-beta"
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	if [[ ${MOZ_ESR} == 1 ]]; then
+		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+	else
+		S="${WORKDIR}/mozilla-release"
+	fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+
+	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
+		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
+		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
+		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
+		ewarn "emerging the package with USE=-jit"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+
+	epatch "${FILESDIR}"/${PN}-32.0-hppa-js-configure.patch # bug 524556
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		emake -f client.mk
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
+	local obj_dir="$(echo */config.log)"
+	obj_dir="${obj_dir%/*}"
+	cd "${S}/${obj_dir}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	# Required in order for jit to work on hardened, as of firefox-31
+	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin}
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+			|| die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+	doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/firefox-38.1.0.ebuild b/www-client/firefox/firefox-38.1.0.ebuild
new file mode 100644
index 000000000000..eca3dc78fda3
--- /dev/null
+++ b/www-client/firefox/firefox-38.1.0.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=1
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-38.0-patches-0.3"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.38 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.8
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/mozilla-release"
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	if [[ ${MOZ_ESR} == 1 ]]; then
+		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+	else
+		S="${WORKDIR}/mozilla-release"
+	fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	epatch "${FILESDIR}"/${PN}-38-hppa-js-syntax-error.patch #556196
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		mozconfig_annotate '' --enable-skia
+
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	if use jit; then
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+			|| die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+	doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/firefox-38.1.1.ebuild b/www-client/firefox/firefox-38.1.1.ebuild
new file mode 100644
index 000000000000..eb50e9f05f40
--- /dev/null
+++ b/www-client/firefox/firefox-38.1.1.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=1
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-38.0-patches-0.3"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.38 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.8
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/mozilla-release"
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	if [[ ${MOZ_ESR} == 1 ]]; then
+		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+	else
+		S="${WORKDIR}/mozilla-release"
+	fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	epatch "${FILESDIR}"/${PN}-38-hppa-js-syntax-error.patch #556196
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		mozconfig_annotate '' --enable-skia
+
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	if use jit; then
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+			|| die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+	doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/firefox-39.0.3.ebuild b/www-client/firefox/firefox-39.0.3.ebuild
new file mode 100644
index 000000000000..742a4bee66c1
--- /dev/null
+++ b/www-client/firefox/firefox-39.0.3.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-38.0-patches-0.3"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.39 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.8
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	pgo? (
+		>=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	CHANGESET="8a3042764de7"
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/mozilla-release"
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	if [[ ${MOZ_ESR} == 1 ]]; then
+		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+	else
+		S="${WORKDIR}/mozilla-release"
+	fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	EPATCH_EXCLUDE="8010_bug114311-freetype26.patch" \
+	epatch "${WORKDIR}/firefox"
+	epatch "${FILESDIR}"/${PN}-38-hppa-js-syntax-error.patch #556196
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+
+	# Need to update jemalloc's configure
+	cd "${S}"/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		mozconfig_annotate '' --enable-skia
+
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	emake -f client.mk configure
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -z "${cards}"; then
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+		addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		emake -f client.mk realbuild
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	if use jit; then
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+			|| die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+					|| die "sparc sed failed"; }
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+	doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
new file mode 100644
index 000000000000..7c281db4e75d
--- /dev/null
+++ b/www-client/firefox/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mozilla</herd>
+<use>
+	<flag name="bindist">Disable official Firefox branding (icons, name) which 
+		are not binary-redistributable according to upstream.</flag>
+	<flag name="custom-optimization">Fine-tune custom compiler
+		optimizations (-Os, -O0, -O1, -O2, -O3)</flag>
+	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
+		downloaded and kept up-to-date in user profiles</flag>
+	<flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
+	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
+	<flag name="minimal">Prevent sdk and headers from being installed</flag>
+	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
+		for faster binaries. This option will double the compile time.</flag>
+	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
+		instead of bundled.</flag>
+	<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
+		instead of bundled.</flag>
+	<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
+		instead of bundled.</flag>
+	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
+		instead of bundled.</flag>
+	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
+		installation with secure-delete enabled</flag>
+	<flag name="egl">Enable EGL provider</flag>
+</use>
+</pkgmetadata>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
new file mode 100644
index 000000000000..508bf7e516b2
--- /dev/null
+++ b/www-client/google-chrome-beta/Manifest
@@ -0,0 +1,2 @@
+DIST google-chrome-beta_45.0.2454.26-1_amd64.deb 48036388 SHA256 58b0744d59966cfe15d8c8897ff77a71a6be6bb0a7e31e9c04d20a9c0fbd952f SHA512 8945c1b47066fe4f429f10aac8becfe7077cbd64215d716ed7574f430246c496543b9c9a8c90f475ba1a44ce4cb8da5b8cc07adb9eeba9138ce7f0ec22cc3ec1 WHIRLPOOL 8a5ecfc6f125d938cde9a63b305be87880432abb47f183304462f378f61dca9448b1cc08bff63198dbd135521bc095ec23b30683a25a7bcb31adf428d7a09013
+DIST google-chrome-beta_45.0.2454.26-1_i386.deb 46977744 SHA256 7341988b778654c3b49e89e9a52c4b6d062449668d3209e207936d0144532118 SHA512 10e17fec4f6108f189b19d27ad863598d563cd5d9d11fa031afcec1790fed459c8703d775d8a9e50215a61ea1cdff719e5bbedad498711b82c0f648ae53cc474 WHIRLPOOL 0d95a617d199367f855adabc3fbd3afdf0d9ee7628e3df55d0bf02cd5378815ab6e5a550bb9b0458341dde7a3f98b71d8151f730b7b5b1525f124d1aa9eb7f4e
diff --git a/www-client/google-chrome-beta/google-chrome-beta-45.0.2454.26_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-45.0.2454.26_p1.ebuild
new file mode 100644
index 000000000000..e1f41ae5a685
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-45.0.2454.26_p1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit readme.gentoo chromium eutils multilib pax-utils unpacker
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="http://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV/_p/-}"
+
+SRC_URI="
+	amd64? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-arch/bzip2
+	app-misc/ca-certificates
+	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:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	>=x11-libs/libX11-1.5.0
+	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/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-base/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	rm -r usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	insinto /
+	doins -r opt usr
+
+	find "${ED}" -type d -empty -delete || die
+	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
+	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_preinst() {
+	chromium_pkg_preinst
+	if any_cpu_missing_flag sse2; then
+		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
+		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
+		ewarn "support this feature. Disabling PepperFlash."
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
+			-i "${ED}${CHROME_HOME}/google-chrome" || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-beta/metadata.xml b/www-client/google-chrome-beta/metadata.xml
new file mode 100644
index 000000000000..b6a2d8a0f044
--- /dev/null
+++ b/www-client/google-chrome-beta/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>chromium</herd>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>
+		Google Chrome is a browser that combines a minimal design with
+		sophisticated technology to make the web faster, safer, and easier.
+	</longdescription>
+	<use>
+		<flag name="plugins">Add system plugins path to launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
new file mode 100644
index 000000000000..1baabe72e3ab
--- /dev/null
+++ b/www-client/google-chrome-unstable/Manifest
@@ -0,0 +1,2 @@
+DIST google-chrome-unstable_46.0.2471.2-1_amd64.deb 47352022 SHA256 13f5c6cfece24c849f743a797556cf11ea10f6dc36aad030dedde47a065d11f7 SHA512 3e435573cdad1f7972893f14748e497311a67f450f81244c2620d841909eba4d27926a79b5a438ece7bf5a9c14ce44cdbc2a93219e35c622a858dd0ba3692936 WHIRLPOOL 0187f601db519cccd02f2e14be556bc4ac31f0100e4b049955aebd6c2ead7281393d608f5e0d3ac40ef8690ba4c25422cf8375894ec4cc6cda7181c79670b81f
+DIST google-chrome-unstable_46.0.2471.2-1_i386.deb 46699784 SHA256 a9e332ef3d16601ae3481793d7754d3c119f8a05c8d07869dffb27c467262f87 SHA512 8f1e502214dbea7650a2221589f488c6cd1bd4532469ab6ed00bacbf823795a11815c21413031e7f54452f0fd905587b104fb4fb01b2ae58997ecab830822aa1 WHIRLPOOL 9b85a2f5b676e6cb7500d679c0b0184b0f7cfdacb8b1e364f01f42b10035ffcea74cdd4058a4c8108b259773435640e5e981a979dd0b24afeab243211e43d240
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-46.0.2471.2_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-46.0.2471.2_p1.ebuild
new file mode 100644
index 000000000000..1834b22d6552
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-46.0.2471.2_p1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit readme.gentoo chromium eutils multilib pax-utils unpacker
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="http://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV/_p/-}"
+
+SRC_URI="
+	amd64? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-arch/bzip2
+	app-misc/ca-certificates
+	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:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	>=x11-libs/libX11-1.5.0
+	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/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	rm -r usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	insinto /
+	doins -r opt usr
+
+	find "${ED}" -type d -empty -delete || die
+	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
+	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_preinst() {
+	chromium_pkg_preinst
+	if any_cpu_missing_flag sse2; then
+		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
+		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
+		ewarn "support this feature. Disabling PepperFlash."
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
+			-i "${ED}${CHROME_HOME}/google-chrome" || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-unstable/metadata.xml b/www-client/google-chrome-unstable/metadata.xml
new file mode 100644
index 000000000000..b6a2d8a0f044
--- /dev/null
+++ b/www-client/google-chrome-unstable/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>chromium</herd>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>
+		Google Chrome is a browser that combines a minimal design with
+		sophisticated technology to make the web faster, safer, and easier.
+	</longdescription>
+	<use>
+		<flag name="plugins">Add system plugins path to launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
new file mode 100644
index 000000000000..a93b9f669b6e
--- /dev/null
+++ b/www-client/google-chrome/Manifest
@@ -0,0 +1,2 @@
+DIST google-chrome-stable_44.0.2403.130-1_amd64.deb 47572650 SHA256 0b29ab582fd82a1587626f33025a50d4748df7ddea0eca6e36df63bb5ba6fcb7 SHA512 000f0ac68e83e1b6b7a09d2bf3b681a5771ecf0fba68a6d4c472d31f527f57144201093191b74f200f1906cef5343e53aefa5e65cb59bed1d4ebcae36663c31e WHIRLPOOL 18074f8f2fda1d04e396528a629246cd7486533bf35e49c7287294f43a69cbe26aa3588a7ad2b45d000460d570df488408a3f4e30a1d49220176abad35519c21
+DIST google-chrome-stable_44.0.2403.130-1_i386.deb 46630472 SHA256 bb041e86d8ccc571c5c4f327bb8643e2b11fb72a879534b6e35129c13d86f27b SHA512 840b2dd9ed32b5e28897251566b742d348138a998b8cad145c286d8b016316a019dd3ee7434c0efd015dd146e81c0798dcf0938aa7f228e2368442516443ce8a WHIRLPOOL 7dad7f4920cdce5ceb3a5a62301f33d8bad440b50de803519ef92141c158762960857babce098a988436b1f5ff935bf7c321ff3a6ce7d3df4f00cd805cab8ad6
diff --git a/www-client/google-chrome/google-chrome-44.0.2403.130_p1.ebuild b/www-client/google-chrome/google-chrome-44.0.2403.130_p1.ebuild
new file mode 100644
index 000000000000..1834b22d6552
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-44.0.2403.130_p1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit readme.gentoo chromium eutils multilib pax-utils unpacker
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="http://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV/_p/-}"
+
+SRC_URI="
+	amd64? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-arch/bzip2
+	app-misc/ca-certificates
+	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:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	>=x11-libs/libX11-1.5.0
+	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/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	rm -r usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	insinto /
+	doins -r opt usr
+
+	find "${ED}" -type d -empty -delete || die
+	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
+	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_preinst() {
+	chromium_pkg_preinst
+	if any_cpu_missing_flag sse2; then
+		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
+		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
+		ewarn "support this feature. Disabling PepperFlash."
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
+			-i "${ED}${CHROME_HOME}/google-chrome" || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome/metadata.xml b/www-client/google-chrome/metadata.xml
new file mode 100644
index 000000000000..b6a2d8a0f044
--- /dev/null
+++ b/www-client/google-chrome/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>chromium</herd>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>
+		Google Chrome is a browser that combines a minimal design with
+		sophisticated technology to make the web faster, safer, and easier.
+	</longdescription>
+	<use>
+		<flag name="plugins">Add system plugins path to launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
new file mode 100644
index 000000000000..f68dd002ea18
--- /dev/null
+++ b/www-client/httrack/Manifest
@@ -0,0 +1,6 @@
+DIST httrack-3.45.4.tar.gz 1699651 SHA256 715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b WHIRLPOOL 58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7
+DIST httrack-3.47.27.tar.gz 1778104 SHA256 7c96bfb63dab9e55efea89d0408e3743115e524c688545b94f9b60dc78d2f9e1 SHA512 69f5e3e5bb7389d5442e5513e99ec065d45bc4083d737e0fc33698b1dc0716e9bd29fb707d6f6af8b829e1961e811530ad9add34dad334d8f4e9ab25b249a7f1 WHIRLPOOL 6cdfd3b0d199e37e64e5e154ad391d030b7d9bf1133373f6193fdd1dbff56f0b319c16fcdf2c3eb247a17a167cb70f733741e52074bd7c189a28e7a1ef18c387
+DIST httrack-3.48.13.tar.gz 1790992 SHA256 02c34571e974605b0a0398c1c65336bbe94142391d61a9be4234c2d19b09e947 SHA512 c6770f911c2349aaf9f1216df902648578f9a21bd572b2523918fc7737f6fcf6ab260a47bff7b8b5e170ad731401e73c2500c71237d88dc61ee6ada8e4906bec WHIRLPOOL 1a1ce6cb4e26624639b069ef536c2ba843fd04d109f6acfbc6419bae329222a704fe1e6095f85caa6c5b1e0bdc87f05036cad07e5552070d7d4307c0634e0ccb
+DIST httrack-3.48.19.tar.gz 1818985 SHA256 16f0cd0ea21042106879238fe4892b56018e106347d69dcb0b93816ee8f68afe SHA512 c7202c4d86963fe935ce1f1a81f43f47544e03e4743528f52acd541ba87d6ef47d9e691b432f9bebedbf06e764bd67fe85748762b6ec3c09491b7528957cda8b WHIRLPOOL c250ab2d7e8e1ec8cdfb3f86bb8e21ff7d4d583d0c6adba3f1f4448cc60304b6e572fe9d760322094affebe45f7f9eee1c1a6f94332ae83d01b7d91132274e77
+DIST httrack-3.48.20.tar.gz 1821746 SHA256 3156515e9ecd949851ffc1e3e83e30ef046a959378ee5d11eb18462286bb2c89 SHA512 45fc348f9bece70044102fc374f391362f57ef680b14635dd30bf69008d30b04cd54b87297f738eee821e5e54031365d6ff66300cd3f9d67bd35ed7851b5b086 WHIRLPOOL 6dfac187859d1afc6049a61017f88d0f18f1e8ac61f661ff55a34c01bac4ce687857d843d9db1abcf4ffd4b563934322cd8560b3f33670da789ab527f4073ec3
+DIST httrack-3.48.21.tar.gz 1805754 SHA256 871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246 WHIRLPOOL 3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252
diff --git a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
new file mode 100644
index 000000000000..cadaa8c0a174
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
@@ -0,0 +1,21 @@
+--- httrack-3.44.1/src/minizip/ioapi.h
++++ httrack-3.44.1/src/minizip/ioapi.h
+@@ -9,6 +9,7 @@
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
++#define OF(x) x
+ 
+ #define ZLIB_FILEFUNC_SEEK_CUR (1)
+ #define ZLIB_FILEFUNC_SEEK_END (2)
+--- httrack-3.44.1/src/minizip/zip.h
++++ httrack-3.44.1/src/minizip/zip.h
+@@ -42,6 +42,8 @@
+       ftp://ftp.pkware.com/probdesc.zip
+ */
+ 
++#define OF(x) x
++
+ #ifndef _zip_H
+ #define _zip_H
+ 
diff --git a/www-client/httrack/files/httrack-3.45.4-cflags.patch b/www-client/httrack/files/httrack-3.45.4-cflags.patch
new file mode 100644
index 000000000000..a84c499f9d88
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-cflags.patch
@@ -0,0 +1,12 @@
+--- /configure.in	2012-07-10 20:19:09.958552772 +0200
++++ /configure.in	2012-07-10 20:19:39.011189564 +0200
+@@ -13,8 +13,7 @@
+ AC_PROG_LN_S
+ 
+ ### Default CFLAGS
+-DEFAULT_CFLAGS=""
+-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
++DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+ -Wnested-externs -D_REENTRANT"
+ AC_SUBST(DEFAULT_CFLAGS)
diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
new file mode 100644
index 000000000000..d13fe14ddc61
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
@@ -0,0 +1,35 @@
+--- html/Makefile.am	2012-07-10 19:54:41.844906721 +0200
++++ html/Makefile.am	2012-07-10 19:54:47.885831199 +0200
+@@ -1,13 +1,13 @@
+ 
+-HelpHtmlrootdir = $(datadir)/doc/httrack
+-HelpHtmldir = $(datadir)/doc/httrack/html
+-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
+-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
+-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
+-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
+-WebHtmldir = $(datadir)/doc/httrack/html/server
+-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
+-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
++HelpHtmlrootdir = $(docdir)
++HelpHtmldir = $(htmldir)
++HelpHtmlimgdir = $(HelpHtmldir)/img
++HelpHtmldivdir = $(HelpHtmldir)/div
++HelpHtmlimagesdir = $(HelpHtmldir)/images
++HelpHtmlTxtdir = $(HelpHtmldir)
++WebHtmldir = $(HelpHtmldir)/server
++WebHtmlimagesdir = $(HelpHtmldir)/server/images
++WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
+ WebPixmapdir = $(datadir)/pixmaps
+ WebGPixmapdir = $(datadir)/httrack/icons
+ VFolderEntrydir = $(prefix)/share/applications
+@@ -36,8 +36,6 @@
+ install-data-hook:
+ 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
+ 		( cd $(DESTDIR)$(prefix)/share/httrack \
+-			&& mv -f ../doc/httrack/html html \
+-			&& cd ../doc/httrack/ \
+-			&& $(LN_S) ../../httrack/html html \
++			&& $(LN_S) $(htmldir) html \
+ 		) \
+ 	fi
diff --git a/www-client/httrack/files/httrack-3.45.4-install-once.patch b/www-client/httrack/files/httrack-3.45.4-install-once.patch
new file mode 100644
index 000000000000..0590db59a9e2
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-install-once.patch
@@ -0,0 +1,32 @@
+From 1022a4f21ef2c4c7dc671261aa24e33d8e1223e0 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 22 Jun 2012 22:38:21 +0200
+Subject: [PATCH] Make sure that files example.{c,h} are matched once
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise "make install" dies with this error:
+
+/usr/bin/install: will not overwrite just-created ‘[..]/example.c’ with ‘example.c’
+/usr/bin/install: will not overwrite just-created ‘[..]/example.h’ with ‘example.h’
+make[2]: *** [install-exemplesDATA] Error 1
+---
+ libtest/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index 7e90ba0..4be2158 100644
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -1,6 +1,6 @@
+ 
+ exemplesdir = $(datadir)/httrack/libtest
+-exemples_DATA = example.* *.c *.h *.txt
++exemples_DATA = *.c *.h *.txt
+ EXTRA_DIST = $(exemples_DATA)
+ 
+ INCLUDES = \
+-- 
+1.7.10.2
+
diff --git a/www-client/httrack/files/httrack-3.45.4-parallel.patch b/www-client/httrack/files/httrack-3.45.4-parallel.patch
new file mode 100644
index 000000000000..72424639c41e
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-parallel.patch
@@ -0,0 +1,68 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,8 @@ INCLUDES = \
+ 
+ bin_PROGRAMS = proxytrack httrack htsserver
+ 
+-httrack_LDADD = $(THREADS_LIBS) -lhttrack
+-htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++httrack_LDADD = $(THREADS_LIBS) libhttrack.la
++htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
+ proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
+ proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
+ 
+@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
+ libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
+ libhtsjava_la_SOURCES = htsjava.c htsjava.h
+-libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
++libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
+ libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
+ EXTRA_DIST = httrack.h webhttrack \
+--- a/libtest/Makefile.am	2012-06-19 21:41:25.913281858 +0200
++++ b/libtest/Makefile.am	2012-06-19 21:42:25.864532364 +0200
+@@ -18,33 +18,33 @@
+ 
+ # Examples
+ libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
+-libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libbaselinks_la_LDFLAGS = -version-info 1:0:0
+ libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
+-libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libchangecontent_la_LDFLAGS = -version-info 1:0:0
+ libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
+-libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+ libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
+-libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+ libfilename2_la_SOURCES =  callbacks-example-filename2.c
+-libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename2_la_LDFLAGS = -version-info 1:0:0
+ libfilename_la_SOURCES =  callbacks-example-filename.c
+-libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename_la_LDFLAGS = -version-info 1:0:0
+ libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
+-libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+ liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
+-liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblistlinks_la_LDFLAGS = -version-info 1:0:0
+ liblog_la_SOURCES =  callbacks-example-log.c
+-liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblog_la_LDFLAGS = -version-info 1:0:0
+ libsimple_la_SOURCES =  callbacks-example-simple.c
+-libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libsimple_la_LDFLAGS = -version-info 1:0:0
+ pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/files/httrack-3.46.1-parallel.patch b/www-client/httrack/files/httrack-3.46.1-parallel.patch
new file mode 100644
index 000000000000..97623299bae9
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.46.1-parallel.patch
@@ -0,0 +1,48 @@
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index d7c8309..4be2158 100644
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -18,33 +18,33 @@ AM_LDFLAGS = -L../src
+ 
+ # Examples
+ libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
+-libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libbaselinks_la_LDFLAGS = -version-info 1:0:0
+ libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
+-libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libchangecontent_la_LDFLAGS = -version-info 1:0:0
+ libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
+-libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+ libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
+-libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+ libfilename2_la_SOURCES =  callbacks-example-filename2.c
+-libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename2_la_LDFLAGS = -version-info 1:0:0
+ libfilename_la_SOURCES =  callbacks-example-filename.c
+-libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename_la_LDFLAGS = -version-info 1:0:0
+ libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
+-libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+ liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
+-liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblistlinks_la_LDFLAGS = -version-info 1:0:0
+ liblog_la_SOURCES =  callbacks-example-log.c
+-liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblog_la_LDFLAGS = -version-info 1:0:0
+ libsimple_la_SOURCES =  callbacks-example-simple.c
+-libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libsimple_la_LDFLAGS = -version-info 1:0:0
+ pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch b/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch
new file mode 100644
index 000000000000..83b12cbff934
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch
@@ -0,0 +1,24 @@
+From c56dfdd0f208a5a9413ad90f40c4a25ebb961598 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 25 Apr 2013 22:35:09 +0200
+Subject: [PATCH] Replace deprecated AM_CONFIG_HEADER by AC_CONFIG_HEADERS
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index e132eef..71b3458 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ AC_INIT(src/httrack.c)
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE(httrack, 3.47.2)
+ VERSION_INFO="2:47:0"
+ AM_MAINTAINER_MODE
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/files/httrack-3.47.26-desktop.patch b/www-client/httrack/files/httrack-3.47.26-desktop.patch
new file mode 100644
index 000000000000..fd9174363fdf
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.26-desktop.patch
@@ -0,0 +1,37 @@
+From 48500945ca9717907189389d0a57e6df5f09a82c Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 8 Sep 2013 22:34:13 +0200
+Subject: [PATCH] Fix .desktop files validation
+
+---
+ html/server/div/WebHTTrack-Websites.desktop | 2 +-
+ html/server/div/WebHTTrack.desktop          | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop
+index 6efcab8..d36a4f9 100644
+--- a/html/server/div/WebHTTrack-Websites.desktop
++++ b/html/server/div/WebHTTrack-Websites.desktop
+@@ -5,6 +5,6 @@ Categories=Network;
+ Terminal=false
+ Name=Browse Mirrored Websites
+ Comment=Browse Websites Mirrored by WebHTTrack
+-Keywords=browse mirrored
++Keywords=browse mirrored;
+ Exec=webhttrack browse
+ Icon=httrack
+diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop
+index 984f4c7..28591f2 100644
+--- a/html/server/div/WebHTTrack.desktop
++++ b/html/server/div/WebHTTrack.desktop
+@@ -5,6 +5,6 @@ Categories=Network;
+ Terminal=false
+ Name=WebHTTrack Website Copier
+ Comment=Copy websites to your computer
+-Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation
++Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation;
+ Exec=webhttrack
+ Icon=httrack
+-- 
+1.8.2.1
+
diff --git a/www-client/httrack/files/httrack-3.47.7-cflags.patch b/www-client/httrack/files/httrack-3.47.7-cflags.patch
new file mode 100644
index 000000000000..aa414b96402f
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.7-cflags.patch
@@ -0,0 +1,27 @@
+From f780de5a662deeea66df4dc9056ac642c447bbaf Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 3 May 2013 00:58:15 +0200
+Subject: [PATCH] Fix CFLAGS
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c956081..7ceeb39 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,9 +14,8 @@ AM_PROG_LIBTOOL
+ AC_PROG_LN_S
+ 
+ ### Default CFLAGS
+-DEFAULT_CFLAGS=""
+-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
++DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+ -Wnested-externs -D_REENTRANT"
+ AC_SUBST(DEFAULT_CFLAGS)
+ 
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/files/httrack-3.47.7-warnings.patch b/www-client/httrack/files/httrack-3.47.7-warnings.patch
new file mode 100644
index 000000000000..9f6ba964800b
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.7-warnings.patch
@@ -0,0 +1,41 @@
+From 80d9d1b3003ff79ddee26e9fd09eb1b746b6bf5c Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 4 May 2013 00:14:32 +0200
+Subject: [PATCH] Fix GCC warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+httrack.c: In function ‘htsshow_loop’:
+httrack.c:446:21: warning: the address of ‘tempo’ will always evaluate as ‘true’
+httrack.c:480:19: warning: the address of ‘s’ will always evaluate as ‘true’
+httrack.c:484:19: warning: the address of ‘s’ will always evaluate as ‘true’
+---
+ src/httrack.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/httrack.h b/src/httrack.h
+index 8b049a1..90ca9d5 100644
+--- a/src/httrack.h
++++ b/src/httrack.h
+@@ -129,7 +129,7 @@ extern FILE* ioinfo;
+ } while(0)
+ #define strncatbuff(A, B, N) do { \
+   assertf( (A) != NULL ); \
+-  if ( ! (B) ) { assertf( 0 ); } \
++  if ( (B) == NULL ) { assertf( 0 ); } \
+   if (htsMemoryFastXfr) { \
+     if (sizeof(A) != sizeof(char*)) { \
+       (A)[sizeof(A) - 1] = '\0'; \
+@@ -158,7 +158,7 @@ extern FILE* ioinfo;
+ } while(0)
+ #define strcpybuff(A, B) do { \
+   assertf( (A) != NULL ); \
+-  if ( ! (B) ) { assertf( 0 ); } \
++  if ( (B) == NULL ) { assertf( 0 ); } \
+   if (htsMemoryFastXfr) { \
+     if (sizeof(A) != sizeof(char*)) { \
+       (A)[sizeof(A) - 1] = '\0'; \
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/files/httrack-3.48.13-minizip.patch b/www-client/httrack/files/httrack-3.48.13-minizip.patch
new file mode 100644
index 000000000000..af1610c60dae
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.48.13-minizip.patch
@@ -0,0 +1,74 @@
+From 51bbb53d5805bfa5a4530b8706e2b7f77555016d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 9 Jun 2014 15:34:43 +0200
+Subject: [PATCH] Fix minizip fork compilation
+
+---
+ src/minizip/ioapi.h   | 4 ++++
+ src/minizip/iowin32.h | 3 +++
+ src/minizip/unzip.h   | 4 ++++
+ src/minizip/zip.h     | 4 ++++
+ 4 files changed, 15 insertions(+)
+
+diff --git a/src/minizip/ioapi.h b/src/minizip/ioapi.h
+index e4462b8..75cc097 100644
+--- a/src/minizip/ioapi.h
++++ b/src/minizip/ioapi.h
+@@ -21,6 +21,10 @@
+ #ifndef _ZLIBIOAPI64_H
+ #define _ZLIBIOAPI64_H
+ 
++
++#define OF(x) x
++
++
+ #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+ 
+   // Linux needs this to support file operation on files larger then 4+GB
+diff --git a/src/minizip/iowin32.h b/src/minizip/iowin32.h
+index 0ca0969..71244d6 100644
+--- a/src/minizip/iowin32.h
++++ b/src/minizip/iowin32.h
+@@ -14,6 +14,9 @@
+ #include <windows.h>
+ 
+ 
++#define OF(x) x
++
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff --git a/src/minizip/unzip.h b/src/minizip/unzip.h
+index 2104e39..0b54c40 100644
+--- a/src/minizip/unzip.h
++++ b/src/minizip/unzip.h
+@@ -43,6 +43,10 @@
+ #ifndef _unz64_H
+ #define _unz64_H
+ 
++
++#define OF(x) x
++
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff --git a/src/minizip/zip.h b/src/minizip/zip.h
+index 16dea6b..906ba53 100644
+--- a/src/minizip/zip.h
++++ b/src/minizip/zip.h
+@@ -40,6 +40,10 @@
+ #ifndef _zip12_H
+ #define _zip12_H
+ 
++
++#define OF(x) x
++
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-- 
+1.9.3
+
diff --git a/www-client/httrack/httrack-3.45.4.ebuild b/www-client/httrack/httrack-3.45.4.ebuild
new file mode 100644
index 000000000000..8d289030bbc2
--- /dev/null
+++ b/www-client/httrack/httrack-3.45.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+AT_M4DIR='m4'
+inherit autotools eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://download.httrack.com/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=421499
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-install-once.patch
+
+	epatch "${FILESDIR}"/${P}-htmldir.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/httrack-3.47.27.ebuild b/www-client/httrack/httrack-3.47.27.ebuild
new file mode 100644
index 000000000000..937f170813fe
--- /dev/null
+++ b/www-client/httrack/httrack-3.47.27.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/httrack-3.48.13.ebuild b/www-client/httrack/httrack-3.48.13.ebuild
new file mode 100644
index 000000000000..462eae3f3cab
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-minizip.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/httrack-3.48.19.ebuild b/www-client/httrack/httrack-3.48.19.ebuild
new file mode 100644
index 000000000000..4d302b466d29
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.19.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/httrack-3.48.20.ebuild b/www-client/httrack/httrack-3.48.20.ebuild
new file mode 100644
index 000000000000..4d302b466d29
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.20.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/httrack-3.48.21.ebuild b/www-client/httrack/httrack-3.48.21.ebuild
new file mode 100644
index 000000000000..3134384ed67d
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.21.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/www-client/httrack/metadata.xml b/www-client/httrack/metadata.xml
new file mode 100644
index 000000000000..12da43283ea5
--- /dev/null
+++ b/www-client/httrack/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>sping@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/www-client/jd/Manifest b/www-client/jd/Manifest
new file mode 100644
index 000000000000..ab8b7e48ab2c
--- /dev/null
+++ b/www-client/jd/Manifest
@@ -0,0 +1 @@
+DIST jd-2.8.5-120826.tgz 784657 SHA256 494a190ae64c222cd7080cb121f23043bd231829572cd685258185a9b5dfff32 SHA512 0c4aa0845aca71f1172a565d7b9e4a7099fa27c221b452c623b818144b958c8b042e5ab00582eee07bc8d44186a172c9abb750550ae3293851e03382e527e11b WHIRLPOOL d1a02eb054c94533ba8b7de0d0ef1a4ffed3f3cb8528784004f5ac68983e5f59b14c4898f11676ee8d111d0303fa4e21cde6f14c6d5ad46d64c27abfc69d3dc2
diff --git a/www-client/jd/jd-2.8.5_p120826.ebuild b/www-client/jd/jd-2.8.5_p120826.ebuild
new file mode 100644
index 000000000000..e21b80c489d9
--- /dev/null
+++ b/www-client/jd/jd-2.8.5_p120826.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools autotools-utils
+
+MY_P="${P/_p/-}"
+MY_P="${MY_P/_/-}"
+
+DESCRIPTION="gtk2 based 2ch browser written in C++"
+HOMEPAGE="http://jd4linux.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/jd4linux/56721/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa gnome gnutls migemo"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-libs/glib:2
+	x11-misc/xdg-utils
+	alsa? ( >=media-libs/alsa-lib-1 )
+	gnome? ( >=gnome-base/libgnomeui-2 )
+	!gnome? (
+		x11-libs/libSM
+		x11-libs/libICE
+	)
+	gnutls? ( >=net-libs/gnutls-1.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9 )
+	migemo? ( app-text/cmigemo )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+AUTOTOOLS_AUTORECONF=1
+
+src_configure() {
+	# use gnomeui sm instead of Xorg SM/ICE
+	local myeconfargs=(
+		--with-xdgopen
+		$(use_with gnome sessionlib gnomeui)
+		$(use_with !gnome sessionlib xsmp)
+		$(use_with alsa)
+		$(use_with !gnutls openssl)
+		$(use_with migemo)
+		$(use_with migemo migemodict /usr/share/migemo/migemo-dict)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	#dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/www-client/jd/metadata.xml b/www-client/jd/metadata.xml
new file mode 100644
index 000000000000..8aa71b38e8dd
--- /dev/null
+++ b/www-client/jd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge-jp">jd4linux</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/jumanji/Manifest b/www-client/jumanji/Manifest
new file mode 100644
index 000000000000..e28e1132fdc2
--- /dev/null
+++ b/www-client/jumanji/Manifest
@@ -0,0 +1,3 @@
+DIST jumanji-0.0.0_p20111209.tar.gz 33002 SHA256 0c3631bc213c8c7c8c208a557b12b6a1f99b2d3c2558b7d9ac433f802aa36781 SHA512 92f84a4d30261f5a1aaeb583be5b2bb28c9f3dd9c1c31176711e809a40cb406160fd563afc7e25cbf6e2e3b3822c2932915cec234e389bd6e85308bbe772ef0e WHIRLPOOL b291e1a4db44c43139695dc07da548f1633ce38e1e62a4299fbdb72a7266ef160e939ce1ebed28f0cd89a8d5af9522f64bb8fa421b6afd568b45a8d9f7726fe2
+DIST jumanji-0.0.0_p20130103.tar.gz 41811 SHA256 40622e73f2725f731a673aa8a1f010ba31e1b9044da26bd7738709884a9eacca SHA512 18de040acbacd8a285c6b959ad3a8857ba6265e6c1541ed05e4f35ce33b9ebd0c85e0d37ec1a71f725ca5621a0f913f207ea77e56e94d8689137963f42ce776f WHIRLPOOL 529ecc4a2762fd6f561480da7113ec689e79cc0b75a74a7ab1da8a69f4e5ffad0a7f5d946c90eb34b16105e47a5aada4044d09010bab5218454acec9832efebc
+DIST jumanji-0.0.0_p20150527.tar.gz 42011 SHA256 bb242cb5cffc8feacc2ef14deda7f8da35edcccc3218f30cb3a21ffe8b79bede SHA512 2779d0a4ac408636c40d81daa5bc7d9c952a1002a46b3bb6944dae6ac3880f922a3cb3229f7276b9c3a645ff9d6ce87f9bad4dc6494fcec10b2d78240ae4e8c4 WHIRLPOOL 383ffacf17146afe6712f486b8a1abd72a2980012dc75bbed2da2113ac793b07f9c5125a2660447f7645fe8e46796d9da6b329738a17e21d6e88031a379aed2f
diff --git a/www-client/jumanji/files/jumanji-0.0.0_p20111209-buildsystem.patch b/www-client/jumanji/files/jumanji-0.0.0_p20111209-buildsystem.patch
new file mode 100644
index 000000000000..f2a8aa43d42b
--- /dev/null
+++ b/www-client/jumanji/files/jumanji-0.0.0_p20111209-buildsystem.patch
@@ -0,0 +1,94 @@
+--- jumanji-0_p20111209/config.mk
++++ jumanji-0_p20111209/config.mk
+@@ -3,6 +3,12 @@
+ 
+ VERSION = 0.0.0
+ 
++ifeq ($(V),)
++	Q := @
++else
++	Q :=
++endif
++
+ # paths
+ PREFIX ?= /usr
+ MANPREFIX ?= ${PREFIX}/share/man
+--- jumanji-0_p20111209/Makefile
++++ jumanji-0_p20111209/Makefile
+@@ -19,11 +19,11 @@
+ 
+ %.o: %.c
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} -o $@ $<
++	$(Q)${CC} -c ${CFLAGS} -o $@ $<
+ 
+ %.do: %.c
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} ${DFLAGS} -o $@ $<
++	$(Q)${CC} -c ${CFLAGS} ${DFLAGS} -o $@ $<
+ 
+ ${OBJECTS}:  config.h config.mk
+ ${DOBJECTS}: config.h config.mk
+@@ -38,18 +38,18 @@
+ 
+ ${PROJECT}: ${OBJECTS}
+ 	@echo CC -o $@
+-	@${CC} ${SFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
++	$(Q)${CC} ${SFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
+ 
+ clean:
+-	@rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
++	$(Q)rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
+ 		${DOBJECTS} ${PROJECT}-debug
+ 
+ distclean: clean
+-	@rm -rf config.h
++	$(Q)rm -rf config.h
+ 
+ ${PROJECT}-debug: ${DOBJECTS}
+ 	@echo CC -o ${PROJECT}-debug
+-	@${CC} ${LDFLAGS} -o ${PROJECT}-debug ${DOBJECTS} ${LIBS}
++	$(Q)${CC} ${LDFLAGS} -o ${PROJECT}-debug ${DOBJECTS} ${LIBS}
+ 
+ debug: ${PROJECT}-debug
+ 
+@@ -61,25 +61,25 @@
+ 	cgdb ${PROJECT}-debug
+ 
+ dist: clean
+-	@mkdir -p ${PROJECT}-${VERSION}
+-	@cp -R LICENSE Makefile config.mk config.def.h README \
++	$(Q)mkdir -p ${PROJECT}-${VERSION}
++	$(Q)cp -R LICENSE Makefile config.mk config.def.h README \
+ 			${PROJECT}.1 ${SOURCE} ${PROJECT}-${VERSION}
+-	@tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
+-	@gzip ${PROJECT}-${VERSION}.tar
+-	@rm -rf ${PROJECT}-${VERSION}
++	$(Q)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
++	$(Q)gzip ${PROJECT}-${VERSION}.tar
++	$(Q)rm -rf ${PROJECT}-${VERSION}
+ 
+ install: all
+ 	@echo installing executable file
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f ${PROJECT} ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin/${PROJECT}
+-	@echo installing manual page
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < ${PROJECT}.1 > ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
++	$(Q)mkdir -p ${DESTDIR}${PREFIX}/bin
++	$(Q)cp -f ${PROJECT} ${DESTDIR}${PREFIX}/bin
++	$(Q)chmod 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin/${PROJECT}
++	$(Q)echo installing manual page
++	$(Q)mkdir -p ${DESTDIR}${MANPREFIX}/man1
++	$(Q)sed "s/VERSION/${VERSION}/g" < ${PROJECT}.1 > ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
++	$(Q)chmod 644 ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
+ 
+ uninstall:
+ 	@echo removing executable file
+-	@rm -f ${DESTDIR}${PREFIX}/bin/${PROJECT}
++	$(Q)rm -f ${DESTDIR}${PREFIX}/bin/${PROJECT}
+ 	@echo removing manual page
+-	@rm -f ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
++	$(Q)rm -f ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
diff --git a/www-client/jumanji/jumanji-0.0.0_p20111209.ebuild b/www-client/jumanji/jumanji-0.0.0_p20111209.ebuild
new file mode 100644
index 000000000000..3c9ed9bcfbaf
--- /dev/null
+++ b/www-client/jumanji/jumanji-0.0.0_p20111209.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils savedconfig toolchain-funcs vcs-snapshot
+
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
+HOMEPAGE="http://pwmt.org/projects/jumanji"
+SRC_URI="https://git.pwmt.org/?p=jumanji.git;a=snapshot;h=614511550b5e4633397f3c26297d5995a5236766;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libunique:1
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	!${CATEGORY}/${PN}:develop"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SFLAGS="" V=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
+}
diff --git a/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild b/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild
new file mode 100644
index 000000000000..2dd217c87842
--- /dev/null
+++ b/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils savedconfig toolchain-funcs vcs-snapshot
+
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
+HOMEPAGE="http://pwmt.org/projects/jumanji"
+SRC_URI="https://git.pwmt.org/?p=jumanji.git;a=snapshot;h=963b309e9f91c6214f36c729514d5a08e7293310;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="develop"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	<dev-libs/girara-0.2.4:3
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	!${CATEGORY}/${PN}:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SFLAGS="" VERBOSE=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
+}
diff --git a/www-client/jumanji/jumanji-0.0.0_p20150527.ebuild b/www-client/jumanji/jumanji-0.0.0_p20150527.ebuild
new file mode 100644
index 000000000000..9abe7ba15685
--- /dev/null
+++ b/www-client/jumanji/jumanji-0.0.0_p20150527.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils savedconfig toolchain-funcs vcs-snapshot
+
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
+HOMEPAGE="http://pwmt.org/projects/jumanji"
+SRC_URI="https://git.pwmt.org/?p=jumanji.git;a=snapshot;h=618488c960aa4613e1b5bed4f864d0438f669b98;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="develop"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	>=dev-libs/girara-0.2.4:3
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	!${CATEGORY}/${PN}:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SFLAGS="" VERBOSE=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
+}
diff --git a/www-client/jumanji/jumanji-9999.ebuild b/www-client/jumanji/jumanji-9999.ebuild
new file mode 100644
index 000000000000..b866af14f4ca
--- /dev/null
+++ b/www-client/jumanji/jumanji-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils savedconfig git-2 toolchain-funcs
+
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
+HOMEPAGE="http://pwmt.org/projects/jumanji"
+EGIT_REPO_URI="git://pwmt.org/jumanji.git"
+EGIT_BRANCH=develop
+
+LICENSE="ZLIB"
+SLOT="develop"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/girara:3
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	!${CATEGORY}/${PN}:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SFLAGS="" VERBOSE=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
+}
diff --git a/www-client/jumanji/metadata.xml b/www-client/jumanji/metadata.xml
new file mode 100644
index 000000000000..ea66a4b19921
--- /dev/null
+++ b/www-client/jumanji/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+</upstream>
+<longdescription>
+jumanji is a highly customizable and functional web browser based on the libwebkit web content engine and the gtk+ toolkit. The idea behind jumanji is a web browser that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction like vimperator does.
+</longdescription>
+</pkgmetadata>
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
new file mode 100644
index 000000000000..b05484526074
--- /dev/null
+++ b/www-client/links/Manifest
@@ -0,0 +1,5 @@
+DIST links-2.10.tar.bz2 6230715 SHA256 840e0b0cc804a58567bdfed1fa8012c9ea2d34a853d4e90f857786ab4b791d53 SHA512 7963d95d48496087c8e3a30bcf5827bdebd0831184a168696220b4cd598a8242a0b815523a36474282e749b68bf6c046615bde9cb6d463cc0de8ef67a0f48f3f WHIRLPOOL b993e82f2d6fff156d18b30df919787da1eb95eac7920d17939da79e15eab08dcf2ff7ffb3032b066f4b608e2236d2354ccb6058c2f8c29375ea92655e2d6cdd
+DIST links-2.8.tar.bz2 4102643 SHA256 7950da386fa2014d75edc23abfaeed1b1f171ebc73bf0f557352948f12390096 SHA512 e6325be0bb81a9f4dc602f9c05150ebc3c4e16373767c284c02a87bd6b89b9a28ff409c175695542277faa361b71151c5c619135f36a59a04558fc3426c4b30a WHIRLPOOL d5233857bb057279b54883fc9026b5a35e22116ba9f9bb00971872d8a4a658c9fc20b765abd50328c5f1e835ab03e32f9432115671a74c729510d46b53f5d0eb
+DIST links-2.9.tar.bz2 4111393 SHA256 4360ead54d5f41da16b2f4c0033317ca775f40c1e658a29e9e7f8ce4bc23878f SHA512 386f53e8a8eac78b5f1a85277d449f2cc23e96dbc505c776fa5123c3c4ee34916c9da867766849fb71ff7701df161bd1906a34468bd9c31183abdce1d03819a7 WHIRLPOOL b3f4e88df0df05c20c8915ebb30b81aa0aef519ef09fff0f6528c787174adcd003b68b2374851b7b37d4329ea6b4766f6a2a6145703a1d8ce338dbaf1a57dab6
+DIST links2_2.8-1.debian.tar.gz 12121 SHA256 878529c4f93c934c1821edc3576ca6219bc4018f4e29866d6ffa469681a0bd80 SHA512 134fb292c88ec4d36529886d0e5d12083b773f38b89cb90b471b5f6b11d7f8d990de0a57ade5eb5f887cf1c4398687a6e81aed4a660959e81219c675c1de6af2 WHIRLPOOL e9c362de5874ca8de96a2ef184c81e40fa365e9d4e20c4a902845749946a438060ef2784e87972d40c459d4979e0e0ffc8158a5dcab1e02fc3980413c79edfc4
+DIST links2_2.9-2.debian.tar.xz 12708 SHA256 ec074c302da1cd7410a8af3414e2b600653e89ad874937deb37f00dd98428a55 SHA512 9663145a1ec5de7b17b6805d2051a6259c2a80502b7c9742d265863a961dba76caff170af9088bbc9ff4b0353a8d2fba3e87f67d7c99df2e91ff7d919d3c9964 WHIRLPOOL 505a8c6e9af35161ef4430f5b7f73027d615e9d87b575ea382ed2ab235388bc6df29771be1b0d736d1d91e99e2e17a461923e6415cf63fe9688ab376afc9d281
diff --git a/www-client/links/links-2.10.ebuild b/www-client/links/links-2.10.ebuild
new file mode 100644
index 000000000000..5ccc14f9d959
--- /dev/null
+++ b/www-client/links/links-2.10.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime
+
+DEBIAN_REVISION=2.9-2
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	bzip2? ( app-arch/bzip2 )
+	directfb? (
+		${GRAPHICS_DEPEND}
+		dev-libs/DirectFB
+		)
+	fbcon? ( ${GRAPHICS_DEPEND} )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg:0 )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+		)
+	lzma? ( app-arch/xz-utils )
+	ssl? ( dev-libs/openssl:0 )
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+		)
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
+
+	if use unicode; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
+		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop
+	fi
+
+	dohtml doc/links_cal/*
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}
diff --git a/www-client/links/links-2.8-r1.ebuild b/www-client/links/links-2.8-r1.ebuild
new file mode 100644
index 000000000000..e943b347506c
--- /dev/null
+++ b/www-client/links/links-2.8-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime
+
+DEBIAN_REVISION=2.8-1
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	bzip2? ( app-arch/bzip2 )
+	directfb? (
+		${GRAPHICS_DEPEND}
+		dev-libs/DirectFB
+		)
+	fbcon? ( ${GRAPHICS_DEPEND} )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg:0 )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+		)
+	lzma? ( app-arch/xz-utils )
+	ssl? ( dev-libs/openssl:0 )
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+		)
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
+
+	if use unicode; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
+		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop
+	fi
+
+	dohtml doc/links_cal/*
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}
diff --git a/www-client/links/links-2.9-r1.ebuild b/www-client/links/links-2.9-r1.ebuild
new file mode 100644
index 000000000000..5ccc14f9d959
--- /dev/null
+++ b/www-client/links/links-2.9-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime
+
+DEBIAN_REVISION=2.9-2
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	bzip2? ( app-arch/bzip2 )
+	directfb? (
+		${GRAPHICS_DEPEND}
+		dev-libs/DirectFB
+		)
+	fbcon? ( ${GRAPHICS_DEPEND} )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg:0 )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+		)
+	lzma? ( app-arch/xz-utils )
+	ssl? ( dev-libs/openssl:0 )
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+		)
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
+
+	if use unicode; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
+		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop
+	fi
+
+	dohtml doc/links_cal/*
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}
diff --git a/www-client/links/links-2.9.ebuild b/www-client/links/links-2.9.ebuild
new file mode 100644
index 000000000000..60532f5aedcb
--- /dev/null
+++ b/www-client/links/links-2.9.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime
+
+DEBIAN_REVISION=2.9-2
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	bzip2? ( app-arch/bzip2 )
+	directfb? (
+		${GRAPHICS_DEPEND}
+		dev-libs/DirectFB
+		)
+	fbcon? ( ${GRAPHICS_DEPEND} )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg:0 )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+		)
+	lzma? ( app-arch/xz-utils )
+	ssl? ( dev-libs/openssl:0 )
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+		)
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
+
+	if use unicode; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
+		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop
+	fi
+
+	nonfatal dohtml doc/links_cal/*
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}
diff --git a/www-client/links/metadata.xml b/www-client/links/metadata.xml
new file mode 100644
index 000000000000..7cbb110101dc
--- /dev/null
+++ b/www-client/links/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
new file mode 100644
index 000000000000..68c612757191
--- /dev/null
+++ b/www-client/luakit/Manifest
@@ -0,0 +1 @@
+DIST luakit-2012.09.13_p1.tar.gz 215431 SHA256 688950fda11f032976998b52ba6505fc1bf5bba40552293f9ddc748b00f76132 SHA512 429f2911e6c0e28966579721925d3f9bf492461b3f43cecb07df5f2a7ee5e791d30885c50039da6849ec8d16e8b042286482966c036089e87c568fb394aade09 WHIRLPOOL de90607402cc13eab7a84a3f9f75edaca976f444aabccd1391f7c7f20fe0211d78d8d4c3d3685bcabb84622556617411c9778eaf6abb23ca826992c4914f0064
diff --git a/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch b/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch
new file mode 100644
index 000000000000..71eba8942bfc
--- /dev/null
+++ b/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch
@@ -0,0 +1,25 @@
+Change handling of "argument table" in `lousy/util.lua` from
+deprecated (Lua 5.0) to modern (5.1 and up) syntax.
+
+written by Stjujsckij Nickolaj
+
+https://bugs.gentoo.org/show_bug.cgi?id=354355
+https://github.com/mason-larobina/luakit/commit/99b1bb394beff0dd872dd822c930d412b98d00a9
+--- a/lib/lousy/util.lua
++++ b/lib/lousy/util.lua
+@@ -98,9 +98,9 @@ end
+ -- @return A new table containing all keys from the arguments.
+ function table.join(...)
+     local ret = {}
+-    for i = 1, arg.n do
+-        if arg[i] then
+-            for k, v in pairs(arg[i]) do
++    for i, tbl in pairs({...}) do
++        if tbl then
++            for k, v in pairs(tbl) do
+                 if type(k) == "number" then
+                     rtable.insert(ret, v)
+                 else
+-- 
+1.7.4.rc3
+
diff --git a/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild b/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild
new file mode 100644
index 000000000000..ae17604f88d4
--- /dev/null
+++ b/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+IUSE="luajit vim-syntax"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/mason-larobina/${PN}.git
+		https://github.com/mason-larobina/${PN}.git"
+	EGIT_BRANCH="develop"
+	KEYWORDS=""
+	SRC_URI=""
+else
+	inherit vcs-snapshot
+	MY_PV="${PV/_p/-r}"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
+HOMEPAGE="http://mason-larobina.github.com/luakit/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+COMMON_DEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libunique:1
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+"
+
+DEPEND="
+	virtual/pkgconfig
+	sys-apps/help2man
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lua/luafilesystem
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/s/-ggdb//" config.mk || die
+}
+
+src_compile() {
+	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
+	if use luajit; then
+		myconf+=" USE_LUAJIT=1"
+	else
+		myconf+=" USE_LUAJIT=0"
+	fi
+
+	if [[ ${PV} != *9999* ]]; then
+		myconf+=" VERSION=${PV}"
+	fi
+
+	tc-export CC
+	emake ${myconf}
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install
+
+	if use vim-syntax; then
+		local t
+		for t in $(ls "${S}"/extras/vim/); do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/extras/vim/"${t}"/luakit.vim
+		done
+	fi
+}
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
new file mode 100644
index 000000000000..fa62202a80bd
--- /dev/null
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+IUSE="luajit pax_kernel vim-syntax"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/mason-larobina/${PN}.git
+		https://github.com/mason-larobina/${PN}.git"
+	EGIT_BRANCH="develop"
+	KEYWORDS=""
+	SRC_URI=""
+else
+	inherit vcs-snapshot
+	MY_PV="${PV/_p/-r}"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
+HOMEPAGE="http://mason-larobina.github.com/luakit/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+COMMON_DEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1 )
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libunique:1
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+"
+
+DEPEND="
+	virtual/pkgconfig
+	sys-apps/help2man
+	pax_kernel? ( sys-apps/elfix )
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lua/luafilesystem
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/s/-ggdb//" config.mk || die
+	# bug 385471
+	use pax_kernel && sed "s,@\$(CC) -o \$@ \$(OBJS) \$(LDFLAGS),@\$(CC) \
+		-o \$@ \$(OBJS) \$(LDFLAGS)\n\tpaxmark.sh -m luakit,g" -i Makefile
+}
+
+src_compile() {
+	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
+	if use luajit; then
+		myconf+=" USE_LUAJIT=1"
+	else
+		myconf+=" USE_LUAJIT=0"
+	fi
+
+	if [[ ${PV} != *9999* ]]; then
+		myconf+=" VERSION=${PV}"
+	fi
+
+	tc-export CC
+	emake ${myconf}
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install
+
+	if use vim-syntax; then
+		local t
+		for t in $(ls "${S}"/extras/vim/); do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/extras/vim/"${t}"/luakit.vim
+		done
+	fi
+}
diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
new file mode 100644
index 000000000000..9156b89c7a5d
--- /dev/null
+++ b/www-client/luakit/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="luajit">Use the lua just-in-time compiler
+		<pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg>, which
+		should make luakit faster.</flag>
+		<flag name="pax_kernel">Use paxctl to mark the luakit binary.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mason-larobina/luakit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
new file mode 100644
index 000000000000..3619f51755d5
--- /dev/null
+++ b/www-client/lynx/Manifest
@@ -0,0 +1,2 @@
+DIST lynx2.8.8rel.2.tar.bz2 2587120 SHA256 6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7 SHA512 a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362 WHIRLPOOL 0b2ee48796fded1be52a097148ca7eaa20e8af6ae316e58e39ecca9814b4b4fc926b0d8f1bf0ffc3c5f78a8923df30abed873c92f6039423e8a442dd2dfe97d5
+DIST lynx2.8.9dev.4.tar.bz2 2584900 SHA256 86b06175e6cf7ce3084538f638a5fc1ef02ef32a5a563c5f5241dc3ff277586f SHA512 37f59872ba99730499d443b02e3da081bb63524fc5834d5d70c6d0dceaeab5232aa624eff139230f93c7b36898c7cd4ad6233694b03b6f131a03c6719c0c5f18 WHIRLPOOL e1544cbf7094425a61b60590a92299ad86bcd9b14de8bd851eabb7010e9baaffe24d962c5d1d3dd32bf1dc99d43707d4146070775629be3778ec5898f77aa7c0
diff --git a/www-client/lynx/files/lynx-2.8.6-mint.patch b/www-client/lynx/files/lynx-2.8.6-mint.patch
new file mode 100644
index 000000000000..3c7987718c64
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.6-mint.patch
@@ -0,0 +1,32 @@
+--- lynx2-8-6/src/UCdomap.h.old	2009-03-18 08:16:12.000000000 +0000
++++ lynx2-8-6/src/UCdomap.h	2009-03-18 08:15:12.000000000 +0000
+@@ -172,6 +172,18 @@
+        0, 128,UCT_ENC_UTF8,-4)
+ #endif
+ 
++#ifndef NO_CHARSET_windows_1250
++#define NO_CHARSET_windows_1250 !ALL_CHARSETS
++#endif
++
++#if NO_CHARSET_windows_1250
++#define UC_CHARSET_SETUP_windows_1250	/* nothing */
++#else
++/* Is this right ??? */
++#define UC_CHARSET_SETUP_x_transparent UC_Charset_NoUctb_Setup("windows-1250","windows-1250",\
++       0, 128,UCT_ENC_8BIT,0)
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
+--- lynx2-8-6/WWW/Library/Implementation/www_tcp.h.old	2009-03-18 06:45:10.000000000 +0000
++++ lynx2-8-6/WWW/Library/Implementation/www_tcp.h	2009-03-18 06:45:22.000000000 +0000
+@@ -94,7 +94,7 @@
+ # endif
+ #endif /* HAVE_DIRENT_H */
+ 
+-#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__))
++#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__) || defined(__MINT__))
+ #define STRUCT_DIRENT__D_INO 1
+ #endif
+ 
diff --git a/www-client/lynx/files/lynx-2.8.8_p1-parallel.patch b/www-client/lynx/files/lynx-2.8.8_p1-parallel.patch
new file mode 100644
index 000000000000..a674520f7159
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.8_p1-parallel.patch
@@ -0,0 +1,57 @@
+--- lynx2-8-8/makefile.in
++++ lynx2-8-8/makefile.in
+@@ -215,10 +215,10 @@
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
+ @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR)
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
+-	cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS)
+-	cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(CHR_DIR) all $(CHR_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS)
+ 
+ lint:
+ 	cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
+@@ -258,8 +258,8 @@
+ 	rm -f core *.core
+ 
+ depend: cfg_defs.h LYHelp.h
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $@
+-	cd $(SRC_DIR) && $(MAKE_RECUR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@
+ 
+ distclean: clean
+ 	-rm -f WWW/Library/*/*~
+@@ -337,7 +337,7 @@
+ 	@echo Full installation complete.
+ 
+ install-bin: $(BINDIR) lynx$x
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) install
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
+ 	@ECHO_CC@$(SHELL) -c \
+ 	'if test -f $(BINDIR)/$(binary_PROG) ; then \
+ 	      mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi'
+--- lynx2-8-8/src/makefile.in
++++ lynx2-8-8/src/makefile.in
+@@ -118,7 +118,7 @@
+ 	@echo "Compiling Lynx sources"
+ 
+ do_chartrans_stuff:
+-	-cd chrtrans && $(MAKE_RECUR) \
++	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \
+ 		SITE_DEFS="$(SITE_DEFS)" \
+ 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+ 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+@@ -209,7 +209,7 @@
+  $(CHRTR)viscii_uni.h
+ 
+ $(TABLES):
+-	-cd chrtrans && $(MAKE_RECUR) tables
++	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables
+ 
+ UCdomap$o :	UCdomap.c \
+ 		chrtrans/UCkd.h \
diff --git a/www-client/lynx/lynx-2.8.8_p2.ebuild b/www-client/lynx/lynx-2.8.8_p2.ebuild
new file mode 100644
index 000000000000..e5624d6a6635
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.8_p2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator
+
+# VERSIONING SCHEME TRANSLATION
+# Upstream	:	Gentoo
+# rel.		:	_p
+# pre.		:	_rc
+# dev.		:	_pre
+
+case ${PV} in
+	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
+	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
+	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
+esac
+
+DESCRIPTION="An excellent console-based web browser with ssl support"
+HOMEPAGE="http://lynx.isc.org/"
+SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+
+RDEPEND="sys-libs/ncurses[unicode?]
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8 )
+		gnutls? (
+			dev-libs/libgcrypt:0
+			>=net-libs/gnutls-2.6.4
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))"
+
+pkg_setup() {
+	! use ssl && elog "SSL support disabled; you will not be able to access secure websites."
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch
+	epatch "${FILESDIR}"/${PN}-2.8.8_p1-parallel.patch
+}
+
+src_configure() {
+	econf \
+		--enable-nested-tables \
+		--enable-cgi-links \
+		--enable-persistent-cookies \
+		--enable-prettysrc \
+		--enable-nsl-fork \
+		--enable-file-upload \
+		--enable-read-eta \
+		--enable-color-style \
+		--enable-scrollbar \
+		--enable-included-msgs \
+		--enable-externs \
+		--with-zlib \
+		$(use_enable nls) \
+		$(use_enable idn idna) \
+		$(use_enable ipv6) \
+		$(use_enable cjk) \
+		$(use_enable unicode japanese-utf8) \
+		$(use_with bzip2 bzlib) \
+		$(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "") \
+		$(usex unicode "--with-screen=ncursesw" "")
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
+			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	if use unicode ; then
+		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	fi
+
+	dodoc CHANGES COPYHEADER PROBLEMS README
+	docinto docs
+	dodoc docs/*
+	docinto lynx_help
+	dodoc lynx_help/*.txt
+	dohtml -r lynx_help/*
+}
diff --git a/www-client/lynx/lynx-2.8.9_pre4.ebuild b/www-client/lynx/lynx-2.8.9_pre4.ebuild
new file mode 100644
index 000000000000..ae32b1e4bef0
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.9_pre4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator
+
+# VERSIONING SCHEME TRANSLATION
+# Upstream	:	Gentoo
+# rel.		:	_p
+# pre.		:	_rc
+# dev.		:	_pre
+
+case ${PV} in
+	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
+	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
+	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
+esac
+
+DESCRIPTION="An excellent console-based web browser with ssl support"
+HOMEPAGE="http://lynx.isc.org/"
+SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+
+RDEPEND="sys-libs/ncurses[unicode?]
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8 )
+		gnutls? (
+			dev-libs/libgcrypt:0
+			>=net-libs/gnutls-2.6.4
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))"
+
+pkg_setup() {
+	! use ssl && elog "SSL support disabled; you will not be able to access secure websites."
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch
+	epatch "${FILESDIR}"/${PN}-2.8.8_p1-parallel.patch
+}
+
+src_configure() {
+	econf \
+		--enable-nested-tables \
+		--enable-cgi-links \
+		--enable-persistent-cookies \
+		--enable-prettysrc \
+		--enable-nsl-fork \
+		--enable-file-upload \
+		--enable-read-eta \
+		--enable-color-style \
+		--enable-scrollbar \
+		--enable-included-msgs \
+		--enable-externs \
+		--with-zlib \
+		$(use_enable nls) \
+		$(use_enable idn idna) \
+		$(use_enable ipv6) \
+		$(use_enable cjk) \
+		$(use_enable unicode japanese-utf8) \
+		$(use_with bzip2 bzlib) \
+		$(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "") \
+		$(usex unicode "--with-screen=ncursesw" "")
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
+			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	if use unicode ; then
+		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	fi
+
+	dodoc CHANGES COPYHEADER PROBLEMS README
+	docinto docs
+	dodoc docs/*
+	docinto lynx_help
+	dodoc lynx_help/*.txt
+	dohtml -r lynx_help/*
+}
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
new file mode 100644
index 000000000000..5fe596d66290
--- /dev/null
+++ b/www-client/lynx/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name='ssl'>Enable HTTPS support.</flag>
+		<flag name='gnutls'>Use gnutls library for HTTPS support (openssl is the default library for HTTPS support).</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/metadata.xml b/www-client/metadata.xml
new file mode 100644
index 000000000000..2a25c55a7ed9
--- /dev/null
+++ b/www-client/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The www-client category contains world wide web clients.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie www-client enthält verschiedene Clientprogramme für
+		das WWW wie z.B. Browser, Download-Utilities und RSS-Aggregatoren.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría www-client contiene clientes del world wide web (WWW).
+	</longdescription>
+	<longdescription lang="ja">
+		www-clientカテゴリーには様々なワールド・ワイド・ウェブの
+		クライアントが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De www-client categorie bevat verschillende client voor het WWW zoals
+		browsers, download-hulpmiddelen en RSS-aggregators.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm www-client chứa các client duyệt web.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria www-client contiene client per il world wide web (WWW) come browsers, utilità per il download e RSS aggregators.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria www-client contém clientes de world wide web (WWW).
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria www-client zawiera przeglądarki internetowe.
+	</longdescription>
+</catmetadata>
+
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
new file mode 100644
index 000000000000..a78e4e529052
--- /dev/null
+++ b/www-client/midori/Manifest
@@ -0,0 +1,3 @@
+DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
+DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7
+DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07
diff --git a/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch
new file mode 100644
index 000000000000..3c6059c229b6
--- /dev/null
+++ b/www-client/midori/files/midori-0.5.10-fix-webkit2-build-breakage.patch
@@ -0,0 +1,22 @@
+https://launchpadlibrarian.net/204464340/0002-fix-webkit2-build-breakage.patch
+
+webkit_web_view_get_main_frame() is a webkit1 API function.
+Using it without a check breaks webkit2 builds.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura midori-0.5.10.orig/midori/midori-view.c midori-0.5.10.wk2/midori/midori-view.c
+--- midori-0.5.10.orig/midori/midori-view.c	2015-04-24 08:50:24.940501790 -0300
++++ midori-0.5.10.wk2/midori/midori-view.c	2015-04-25 07:19:21.707132362 -0300
+@@ -1256,9 +1256,11 @@
+                                         message, error->message, NULL,
+                                         _("Try Again"), web_frame);
+ 
++#ifdef WEBKIT2
+     /* if the main frame for the whole tab has a network error, set tab error status */
+     if (web_frame == webkit_web_view_get_main_frame (web_view))
+         midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
++#endif
+ 
+     g_free (message);
+     g_free (title);
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
new file mode 100644
index 000000000000..bb27af6e2e8d
--- /dev/null
+++ b/www-client/midori/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+  <use>
+    <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
+    <flag name='granite'>Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
+    <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
+    <flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
+  </use>
+</pkgmetadata>
diff --git a/www-client/midori/midori-0.5.10.ebuild b/www-client/midori/midori-0.5.10.ebuild
new file mode 100644
index 000000000000..7667988fb9f4
--- /dev/null
+++ b/www-client/midori/midori-0.5.10.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd"
+	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.32.3
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4
+	>=net-libs/libsoup-gnome-2.38:2.4
+	>=x11-libs/libnotify-0.7
+	x11-libs/libXScrnSaver
+	deprecated? (
+		>=net-libs/webkit-gtk-1.8.1:2[jit=]
+		>=x11-libs/gtk+-2.24:2
+		)
+	!deprecated? (
+		x11-libs/gtk+:3
+		webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+		)
+	granite? ( >=dev-libs/granite-0.2 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/intltool
+	gnome-base/librsvg
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+"
+REQUIRED_USE="
+	granite? ( !deprecated )
+	introspection? ( deprecated )
+	webkit2? ( !deprecated )
+"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-webkit2-build-breakage.patch"
+	vala_src_prepare
+	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		$(cmake-utils_use_use doc APIDOCS)
+		$(cmake-utils_use_use introspection GIR)
+		$(cmake-utils_use_use granite)
+		$(cmake-utils_use_use zeitgeist)
+		-DVALA_EXECUTABLE="${VALAC}"
+		)
+
+	if use deprecated; then
+		mycmakeargs+=(
+			-DUSE_GTK3=OFF
+			-DHALF_BRO_INCOM_WEBKIT2=OFF
+			)
+	else
+		mycmakeargs+=(
+			-DUSE_GTK3=ON
+			$(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local jit_is_enabled
+	if use deprecated; then
+		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+	else
+		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+	fi
+	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/www-client/midori/midori-0.5.8-r1.ebuild b/www-client/midori/midori-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..3ddbd49f17c4
--- /dev/null
+++ b/www-client/midori/midori-0.5.8-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.16
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2
+		http://dev.gentoo.org/~ssuominen/${P}-save_as.patch.xz"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND=">=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.32.3
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4
+	>=net-libs/libsoup-gnome-2.38:2.4
+	>=x11-libs/libnotify-0.7
+	x11-libs/libXScrnSaver
+	deprecated? (
+		>=net-libs/webkit-gtk-1.8.1:2[jit=]
+		>=x11-libs/gtk+-2.24:2
+		)
+	!deprecated? (
+		>=app-crypt/gcr-3
+		x11-libs/gtk+:3
+		webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+		)
+	granite? ( >=dev-libs/granite-0.2 )
+	introspection? ( dev-libs/gobject-introspection )
+	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/intltool
+	gnome-base/librsvg
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )"
+REQUIRED_USE="granite? ( !deprecated )
+	introspection? ( deprecated )
+	webkit2? ( !deprecated )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-save_as.patch #498898
+	vala_src_prepare
+	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		$(cmake-utils_use_use doc APIDOCS)
+		$(cmake-utils_use_use introspection GIR)
+		$(cmake-utils_use_use granite)
+		$(cmake-utils_use_use zeitgeist)
+		-DVALA_EXECUTABLE="${VALAC}"
+		)
+
+	if use deprecated; then
+		mycmakeargs+=(
+			-DUSE_GTK3=OFF
+			-DHALF_BRO_INCOM_WEBKIT2=OFF
+			)
+	else
+		mycmakeargs+=(
+			-DUSE_GTK3=ON
+			$(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local jit_is_enabled
+	if use deprecated; then
+		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+	else
+		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+	fi
+	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/www-client/midori/midori-0.5.8.ebuild b/www-client/midori/midori-0.5.8.ebuild
new file mode 100644
index 000000000000..91481280d44c
--- /dev/null
+++ b/www-client/midori/midori-0.5.8.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.16
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND=">=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.32.3
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4
+	>=net-libs/libsoup-gnome-2.38:2.4
+	>=x11-libs/libnotify-0.7
+	x11-libs/libXScrnSaver
+	deprecated? (
+		>=net-libs/webkit-gtk-1.8.1:2[jit=]
+		>=x11-libs/gtk+-2.24:2
+		)
+	!deprecated? (
+		>=app-crypt/gcr-3
+		x11-libs/gtk+:3
+		webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+		)
+	granite? ( >=dev-libs/granite-0.2 )
+	introspection? ( dev-libs/gobject-introspection )
+	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/intltool
+	gnome-base/librsvg
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )"
+REQUIRED_USE="granite? ( !deprecated )
+	introspection? ( deprecated )
+	webkit2? ( !deprecated )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	vala_src_prepare
+	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		$(cmake-utils_use_use doc APIDOCS)
+		$(cmake-utils_use_use introspection GIR)
+		$(cmake-utils_use_use granite)
+		$(cmake-utils_use_use zeitgeist)
+		-DVALA_EXECUTABLE="${VALAC}"
+		)
+
+	if use deprecated; then
+		mycmakeargs+=(
+			-DUSE_GTK3=OFF
+			-DHALF_BRO_INCOM_WEBKIT2=OFF
+			)
+	else
+		mycmakeargs+=(
+			-DUSE_GTK3=ON
+			$(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local jit_is_enabled
+	if use deprecated; then
+		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+	else
+		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+	fi
+	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/www-client/netrik/Manifest b/www-client/netrik/Manifest
new file mode 100644
index 000000000000..971ab21db123
--- /dev/null
+++ b/www-client/netrik/Manifest
@@ -0,0 +1 @@
+DIST netrik-1.16.1.tar.gz 476669 SHA256 3e742d9ef866c12075e7771148e39a6892d0dcdf70f43aecafa09e0ed925b78a SHA512 73e754f8ce34226446b47c9438fb45dcc094c19ca8a2933a6cc68ed32e9cf40c9ace3189c8e63bd4537d286b608c515efd8433f795d4238ad30bd6612dd850e7 WHIRLPOOL 3492775e3f48b3cda7b7ff660d67a37397e007c074fdd647d72b1f41f93a3e5dd6cd8842d6ca84fb8ddfb9386e8d1e10cbb7054119736f3f53acf40e918b3e45
diff --git a/www-client/netrik/files/netrik-1.16.1-configure.patch b/www-client/netrik/files/netrik-1.16.1-configure.patch
new file mode 100644
index 000000000000..45a0368d69d7
--- /dev/null
+++ b/www-client/netrik/files/netrik-1.16.1-configure.patch
@@ -0,0 +1,67 @@
+--- configure.ac.orig	2013-04-12 08:56:35.279744148 +0400
++++ configure.ac	2013-04-12 08:57:09.576747084 +0400
+@@ -1,6 +1,3 @@
+-dnl preserve initial CFLAGS
+-CFLAGS_OLD="$CFLAGS"
+-
+ dnl initialize
+ AC_INIT(main.c)
+ VER=`head -1 $srcdir/README |sed 's/ *netrik \([[^ ]]*\).*/\1/'`
+@@ -56,10 +53,6 @@
+ 	      [AC_HELP_STRING([--disable-debug],
+ 			      [do not include debug options and sanity checks])])
+ 
+-AC_ARG_ENABLE(optimization,
+-	      [AC_HELP_STRING([[--enable-optimization[[[=LEVEL]]]]],
+-			      [use compiler optimization with -OLEVEL (default: -O2 if CFLAGS not set)])])
+-
+ dnl process results
+ dnl define
+ if test x"$enable_debug" != "xno"; then
+@@ -67,46 +60,5 @@
+ 	    [Define if debug options and sanity checks are desired.])
+ fi
+ 
+-dnl restore CFLAGS
+-CFLAGS="$CFLAGS_OLD"
+-
+-dnl set default CFLAGS
+-if test -z "$CFLAGS_OLD" ; then
+-  CFLAGS="$CFLAGS -g"
+-
+-  dnl set warning options for GCC
+-  if test x"$GCC" = "xyes"; then
+-    CFLAGS="$CFLAGS -W -Wall -Wstrict-prototypes -Wmissing-prototypes"
+-  fi
+-fi
+-
+-dnl adjust optimization options
+-case x"$enable_optimization" in
+-  dnl option given but no argument specified
+-  xyes)
+-    CFLAGS="$CFLAGS -O2"
+-    ;;
+-
+-  dnl chosen not to optimize
+-  xno)
+-    dnl use -O0 to make sure no optimization is performed
+-    CFLAGS="$CFLAGS -O0"
+-    ;;
+-
+-  dnl option not given
+-  x)
+-    dnl optimize if CFLAGS not specified
+-    if test -z "$CFLAGS_OLD"; then
+-      CFLAGS="$CFLAGS -O2"
+-    fi
+-    ;;
+-
+-  dnl argument given
+-  *)
+-    dnl use argument to optimize
+-    CFLAGS="$CFLAGS -O${enable_optimization}"
+-    ;;
+-esac
+-
+ dnl generate Makefiles
+ AC_OUTPUT(Makefile doc/Makefile debian/Makefile)
diff --git a/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch b/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch
new file mode 100644
index 000000000000..193b0af5cd0b
--- /dev/null
+++ b/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2013-04-10 13:39:02.514339066 +0400
++++ configure.ac	2013-04-10 13:39:28.607341140 +0400
+@@ -18,8 +18,9 @@
+ AC_HEADER_STDC
+ 
+ dnl check for ncurses
++AC_CHECK_LIB(tinfo, tparm)
+ AC_CHECK_LIB(ncursesw,
+-	     tparm,
++	     printw,
+ 	     [NCURSES="yes"],
+ 	     AC_MSG_ERROR([ncursesw is absolutely required!]))
+ 
diff --git a/www-client/netrik/metadata.xml b/www-client/netrik/metadata.xml
new file mode 100644
index 000000000000..a56e3cab00e2
--- /dev/null
+++ b/www-client/netrik/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">netrik</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=23183</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/netrik/netrik-1.16.1-r1.ebuild b/www-client/netrik/netrik-1.16.1-r1.ebuild
new file mode 100644
index 000000000000..775e9e9b0f20
--- /dev/null
+++ b/www-client/netrik/netrik-1.16.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A text based web browser with no ssl support"
+HOMEPAGE="http://netrik.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1[unicode]
+	sys-libs/readline"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^doc_DATA/s/COPYING LICENSE //" \
+		Makefile.am || die 'sed on Makefile.am failed'
+
+	# bug #467812
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		configure.ac || die 'sed on configure.ac failed'
+
+	# bug #459660
+	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	epatch "${FILESDIR}/${P}-configure.patch"
+	epatch_user
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+}
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
new file mode 100644
index 000000000000..a66925b4075e
--- /dev/null
+++ b/www-client/netsurf/Manifest
@@ -0,0 +1,5 @@
+DIST netsurf-3.2-src.tar.gz 3232987 SHA256 04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213 SHA512 d1ef15503bd7f59bea6a0bf41333e5da7a8657ab1cd6412b7cb9588b4d6e17908bd5f9b22e71c9e72574df9bb1aa5413a6ccd79a6bdd62ea5ff63c15876f1b60 WHIRLPOOL 98f343fefa39ab5f7f4e1d7e97305323d57bd4f0c1c97cee35e94f7d485d25b86b7012c95bfd2db88620f334ca2ce7cbe6eb4975cda7ac98a99f531bd10ed70b
+DIST netsurf-3.3-src.tar.gz 3198799 SHA256 23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686 SHA512 5796ce007d438309ef809dbb972cafab29efce04a22912bb3318a1cd93f6cca73ddb6ab2f7916c6819f7f63378a27180b380759611a3c88bf00d705a1dd9c5a6 WHIRLPOOL fb5793a7502c27a7adf6cfdcaa029be19e7d750039f7a901b9004cb2a6ea390cd76d1e3bec0598d9986ea4c0203bbb6dabbe8d71955c30becb827753d20f5156
+DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
+DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767
diff --git a/www-client/netsurf/files/netsurf-2.9-buildsystem.patch b/www-client/netsurf/files/netsurf-2.9-buildsystem.patch
new file mode 100644
index 000000000000..14c0070cf599
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-2.9-buildsystem.patch
@@ -0,0 +1,13 @@
+--- netsurf-2.9/framebuffer/Makefile.target
++++ netsurf-2.9/framebuffer/Makefile.target
+@@ -39,6 +39,10 @@
+ $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
+ $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
+ $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
++$(eval $(call pkg_config_find_and_add,NSSVG,libsvgtiny,NSSVG))
++$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,RSVG))
++$(eval $(call pkg_config_find_and_add,WEBP,libwebp,WEBP))
++$(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,VIDEO))
+ 
+ CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) 	\
+ 	  -D_BSD_SOURCE \
diff --git a/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch
new file mode 100644
index 000000000000..6520c7608a60
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch
@@ -0,0 +1,63 @@
+From 7abd1c708d894a67617e60c2f85d6db355a713bb Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Sat, 18 Aug 2012 16:10:23 +0100
+Subject: [PATCH] Conditionally include image headers to allow building
+ without some dependencies.
+
+---
+ image/image.c |   32 +++++++++++++++++++++++++++++---
+ 1 files changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/image/image.c b/image/image.c
+index becf221..70b981b 100644
+--- a/image/image.c
++++ b/image/image.c
+@@ -27,16 +27,42 @@
+ #include "desktop/plotters.h"
+ #include "image/bitmap.h"
+ 
++#ifdef WITH_BMP
+ #include "image/bmp.h"
+-#include "image/gif.h"
+ #include "image/ico.h"
++#endif
++
++#ifdef WITH_GIF
++#include "image/gif.h"
++#endif
++
++#ifdef WITH_JPEG
+ #include "image/jpeg.h"
++#endif
++
++#ifdef WITH_MNG
+ #include "image/mng.h"
+-#include "image/nssprite.h"
++#endif
++
++#ifdef WITH_PNG
+ #include "image/png.h"
+-#include "image/rsvg.h"
++#endif
++
++#ifdef WITH_NSSPRITE
++#include "image/nssprite.h"
++#endif
++
++#ifdef WITH_NS_SVG
+ #include "image/svg.h"
++#endif
++
++#ifdef WITH_RSVG
++#include "image/rsvg.h"
++#endif
++
++#ifdef WITH_WEBP
+ #include "image/webp.h"
++#endif
+ 
+ #include "image/image.h"
+ 
+-- 
+1.7.8.6
+
diff --git a/www-client/netsurf/files/netsurf-2.9-includes.patch b/www-client/netsurf/files/netsurf-2.9-includes.patch
new file mode 100644
index 000000000000..ca1a7c95fff8
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-2.9-includes.patch
@@ -0,0 +1,10 @@
+--- netsurf-2.9/framebuffer/font_internal.c
++++ netsurf-2.9/framebuffer/font_internal.c
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <inttypes.h>
++#include <string.h>
+ 
+ #include <assert.h>
+ #include "css/css.h"
diff --git a/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch
new file mode 100644
index 000000000000..065148ba15df
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch
@@ -0,0 +1,77 @@
+--- netsurf-3.0/Makefile.defaults
++++ netsurf-3.0/Makefile.defaults
+@@ -93,7 +93,6 @@
+ NETSURF_USE_LIBICONV_PLUG := YES
+ 
+ # Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+ 
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+--- netsurf-3.0/framebuffer/Makefile.defaults
++++ netsurf-3.0/framebuffer/Makefile.defaults
+@@ -3,7 +3,6 @@
+ # ----------------------------------------------------------------------------
+ 
+   # Optimisation levels
+-  CFLAGS += -O2
+ 
+   # Framebuffer default surface provider.
+   # Valid values are: x, sdl, linux, vnc, able, 
+--- netsurf-3.0/framebuffer/Makefile.target
++++ netsurf-3.0/framebuffer/Makefile.target
+@@ -47,12 +47,12 @@
+ $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
+-CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) 	\
++CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) 	\
+ 	  -D_BSD_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+ 	  -D_POSIX_C_SOURCE=200112L \
+ 	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
+-	  $(shell xml2-config --cflags)
++	  $(shell ${PKG_CONFIG} libxml-2.0 --cflags)
+ 
+ LDFLAGS += -lm -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive 
+ 
+--- netsurf-3.0/gtk/Makefile.defaults
++++ netsurf-3.0/gtk/Makefile.defaults
+@@ -31,4 +31,3 @@
+   NETSURF_GTK_MAJOR := 2
+ 
+   # Optimisation levels
+-  CFLAGS += -O2
+--- netsurf-3.0/gtk/Makefile.target
++++ netsurf-3.0/gtk/Makefile.target
+@@ -51,7 +51,7 @@
+ 		-D_POSIX_C_SOURCE=200112L \
+ 		-D_NETBSD_SOURCE \
+ 		-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
+-		$(WARNFLAGS) -g
++		$(WARNFLAGS)
+ 
+ # non optional pkg-configed libs
+ $(eval $(call pkg_config_find_and_add,libcss,CSS))
+--- netsurf-3.0/test/Makefile
++++ netsurf-3.0/test/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
+ 		$(shell pkg-config --cflags libcurl)
+ LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+ 
+-llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
++llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom)
+ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
+ 
+ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
+@@ -19,7 +19,7 @@
+ 		utils/filename.c utils/nsurl.c utils/corestrings.c \
+ 		test/urldbtest.c
+ 
+-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
++urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
+ urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+ 
+ nsurl_SRCS := utils/log.c utils/nsurl.c test/nsurl.c
diff --git a/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch b/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch
new file mode 100644
index 000000000000..50c9f8b8a832
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch
@@ -0,0 +1,29 @@
+--- netsurf-3.0/framebuffer/Makefile.target
++++ netsurf-3.0/framebuffer/Makefile.target
+@@ -13,12 +13,16 @@
+ 
+ # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
+ NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
++NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
+ NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
+ NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
+ NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
+ NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
++NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
++NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP
+ NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
+ NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
++NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
+ 
+ CFLAGS += -Dnsframebuffer 
+ 
+@@ -41,6 +45,9 @@
+ $(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
+ $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
+ $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
++$(eval $(call pkg_config_find_and_add_enabled,RSVG,librsvg-2.0,SVG))
++$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
++$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
+ $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
diff --git a/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch
new file mode 100644
index 000000000000..3d5b8668f531
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch
@@ -0,0 +1,77 @@
+--- netsurf-3.2/Makefile.defaults
++++ netsurf-3.2/Makefile.defaults
+@@ -91,9 +91,6 @@
+ # Valid options: YES, NO
+ NETSURF_FS_BACKING_STORE := NO
+ 
+-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+-
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+ 
+--- netsurf-3.2/framebuffer/Makefile.defaults
++++ netsurf-3.2/framebuffer/Makefile.defaults
+@@ -2,9 +2,6 @@
+ # Framebuffer-target-specific options
+ # ----------------------------------------------------------------------------
+ 
+-# Optimisation levels
+-CFLAGS += -O2
+-
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+ NETSURF_FB_FRONTEND := sdl
+--- netsurf-3.2/framebuffer/Makefile.target
++++ netsurf-3.2/framebuffer/Makefile.target
+@@ -42,7 +42,7 @@
+ $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
+-CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) 	\
++CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) 	\
+ 	  -D_BSD_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+ 	  -D_POSIX_C_SOURCE=200112L \
+--- netsurf-3.2/gtk/Makefile.defaults
++++ netsurf-3.2/gtk/Makefile.defaults
+@@ -38,6 +38,3 @@
+ 
+ # Set default GTK version to build for (2 or 3)
+ NETSURF_GTK_MAJOR := 2
+-
+-# Optimisation levels
+-CFLAGS += -O2
+--- netsurf-3.2/gtk/Makefile.target
++++ netsurf-3.2/gtk/Makefile.target
+@@ -51,7 +51,7 @@
+ 		-D_POSIX_C_SOURCE=200809L \
+ 		-D_NETBSD_SOURCE \
+ 		-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
+-		$(WARNFLAGS) -g
++		$(WARNFLAGS)
+ 
+ # non optional pkg-configed libs
+ $(eval $(call pkg_config_find_and_add,libcss,CSS))
+--- netsurf-3.2/test/Makefile
++++ netsurf-3.2/test/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
+ 		$(shell pkg-config --cflags libcurl)
+ LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+ 
+-llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
++llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom)
+ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
+ 
+ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
+@@ -19,7 +19,7 @@
+ 		utils/filename.c utils/nsurl.c utils/corestrings.c \
+ 		test/urldbtest.c
+ 
+-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
++urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
+ urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+ 
+ nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c utils/utf8proc.c test/nsurl.c
diff --git a/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch
new file mode 100644
index 000000000000..9c73c233eff7
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch
@@ -0,0 +1,67 @@
+--- netsurf-3.2/image/image.c
++++ netsurf-3.2/image/image.c
+@@ -28,15 +28,42 @@
+ #include "content/content.h"
+ #include "image/bitmap.h"
+ 
++#ifdef WITH_BMP
+ #include "image/bmp.h"
+-#include "image/gif.h"
+ #include "image/ico.h"
++#endif
++
++#ifdef WITH_GIF
++#include "image/gif.h"
++#endif
++
++#ifdef WITH_JPEG
+ #include "image/jpeg.h"
+-#include "image/nssprite.h"
++#endif
++
++#ifdef WITH_MNG
++#include "image/mng.h"
++#endif
++
++#ifdef WITH_PNG
+ #include "image/png.h"
+-#include "image/rsvg.h"
++#endif
++
++#ifdef WITH_NSSPRITE
++#include "image/nssprite.h"
++#endif
++
++#ifdef WITH_NS_SVG
+ #include "image/svg.h"
++#endif
++
++#ifdef WITH_RSVG
++#include "image/rsvg.h"
++#endif
++
++#ifdef WITH_WEBP
+ #include "image/webp.h"
++#endif
+ 
+ #include "image/image.h"
+ 
+@@ -73,7 +100,18 @@
+ 		return error;
+ #endif
+ 
++#ifdef WITH_MNG
++	error = nsmng_init();
++	if (error != NSERROR_OK)
++		return error;
++
++	error = nsjpng_init();
++	if (error != NSERROR_OK)
++		return error;
++#endif
++
+ #ifdef WITH_PNG
++	/* Prefer libpng over libmng for pngs by registering later */
+ 	error = nspng_init();
+ 	if (error != NSERROR_OK)
+ 		return error;
diff --git a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
new file mode 100644
index 000000000000..e63ec70540a7
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
@@ -0,0 +1,30 @@
+--- netsurf-3.2/framebuffer/Makefile.target
++++ netsurf-3.2/framebuffer/Makefile.target
+@@ -43,7 +43,7 @@
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
+ CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) 	\
+-	  -D_BSD_SOURCE \
++	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+ 	  -D_POSIX_C_SOURCE=200112L \
+ 	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
+--- netsurf-3.2/gtk/Makefile.target
++++ netsurf-3.2/gtk/Makefile.target
+@@ -46,7 +46,7 @@
+ 
+ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+-		-D_BSD_SOURCE \
++		-D_DEFAULT_SOURCE \
+ 		-D_XOPEN_SOURCE=600 \
+ 		-D_POSIX_C_SOURCE=200809L \
+ 		-D_NETBSD_SOURCE \
+--- netsurf-3.2/test/Makefile
++++ netsurf-3.2/test/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
+ 		$(shell pkg-config --cflags libcurl)
+ LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+ 
diff --git a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
new file mode 100644
index 000000000000..3f1c21645d21
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
@@ -0,0 +1,85 @@
+--- netsurf-3.3/Makefile.defaults
++++ netsurf-3.3/Makefile.defaults
+@@ -91,12 +91,6 @@
+ # Valid options: YES, NO
+ NETSURF_FS_BACKING_STORE := NO
+ 
+-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+-
+-# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
+-CXXFLAGS :=
+-
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+ 
+--- netsurf-3.3/framebuffer/Makefile.defaults
++++ netsurf-3.3/framebuffer/Makefile.defaults
+@@ -2,9 +2,6 @@
+ # Framebuffer-target-specific options
+ # ----------------------------------------------------------------------------
+ 
+-# Optimisation levels
+-CFLAGS += -O2
+-
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+ NETSURF_FB_FRONTEND := sdl
+--- netsurf-3.3/framebuffer/Makefile.target
++++ netsurf-3.3/framebuffer/Makefile.target
+@@ -42,8 +42,8 @@
+ $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
+-CFLAGS += -std=c99 -g -Dsmall \
+-	  -D_BSD_SOURCE \
++CFLAGS += -std=c99 -Dsmall \
++	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+ 	  -D_POSIX_C_SOURCE=200112L \
+ 	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
+--- netsurf-3.3/gtk/Makefile.defaults
++++ netsurf-3.3/gtk/Makefile.defaults
+@@ -26,6 +26,3 @@
+ 
+ # Set default GTK version to build for (2 or 3)
+ NETSURF_GTK_MAJOR ?= 2
+-
+-# Optimisation levels
+-CFLAGS += -O2
+--- netsurf-3.3/gtk/Makefile.target
++++ netsurf-3.3/gtk/Makefile.target
+@@ -46,9 +46,9 @@
+ # libsexy currently means we cannot enable this
+ #		-DGDK_DISABLE_DEPRECATED 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+-		-D_BSD_SOURCE \
++		-D_DEFAULT_SOURCE \
+ 		-D_XOPEN_SOURCE=600 \
+ 		-D_POSIX_C_SOURCE=200809L \
+ 		-D_NETBSD_SOURCE \
+--- netsurf-3.3/test/Makefile
++++ netsurf-3.3/test/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
+ 		$(shell pkg-config --cflags libcurl)
+ LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+ 
+-llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
++llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom)
+ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
+ 
+ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
+@@ -19,7 +19,7 @@
+ 		utils/filename.c utils/nsurl.c utils/corestrings.c \
+ 		test/urldbtest.c
+ 
+-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
++urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
+ urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+ 
+ nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c utils/utf8proc.c test/nsurl.c
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
new file mode 100644
index 000000000000..207a83b9d326
--- /dev/null
+++ b/www-client/netsurf/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
+</upstream>
+<use>
+	<flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
+	<flag name="fbcon_frontend_able" >Use framebuffer frontend able</flag>
+	<flag name="fbcon_frontend_linux">Use framebuffer frontend linux</flag>
+	<flag name="fbcon_frontend_sdl"  >Use framebuffer frontend sdl</flag>
+	<flag name="fbcon_frontend_vnc"  >Use framebuffer frontend vnc</flag>
+	<flag name="fbcon_frontend_x"    >Use framebuffer frontend X</flag>
+	<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
+	<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
+	<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
+	<flag name="webp">WebP image support (media-libs/libwebp)</flag>
+</use>
+<longdescription lang="en">
+NetSurf is a free, open source web browser. It is written in C, has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today.
+Whether you want to check your webmail, read the news or post to discussion forums, NetSurf is your lightweight gateway to the world wide web. Actively developed, NetSurf is continually evolving and improving.
+</longdescription>
+</pkgmetadata>
+
diff --git a/www-client/netsurf/netsurf-3.2-r1.ebuild b/www-client/netsurf/netsurf-3.2-r1.ebuild
new file mode 100644
index 000000000000..b8ef15ed96a2
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.2-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.2
+inherit netsurf
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
+	http://xmw.de/mirror/netsurf-fb.modes-example.gz
+	${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="+bmp fbcon truetype +gif gstreamer gtk javascript +jpeg +mng pdf-writer
+	+png +rosprite +svg +svgtiny +webp fbcon_frontend_able fbcon_frontend_linux
+	fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk )
+	amd64? ( abi_x86_32? (
+		!gstreamer !javascript !pdf-writer svg? ( svgtiny ) !truetype ) )
+	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+		fbcon_frontend_vnc fbcon_frontend_x ) )"
+
+RDEPEND="dev-libs/libxml2
+	net-misc/curl
+	>=dev-libs/libcss-0.4.0[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3.0-r1[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1.1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.1.2[${MULTILIB_USEDEP}]
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	)
+	gif? ( >=media-libs/libnsgif-0.1.1[${MULTILIB_USEDEP}] )
+	gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+		gnome-base/libglade:2.0
+		>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	javascript? ( >=dev-libs/nsgenbind-0.1.1[${MULTILIB_USEDEP}]
+		dev-lang/spidermonkey:0= )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu )
+	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.2[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2 ) )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	rosprite? ( >=media-libs/librosprite-0.1.1[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
+	"${FILESDIR}"/${P}-conditionally-include-image-headers.patch
+	"${FILESDIR}"/${P}-glibc2.20.patch )
+DOCS=( fb.modes README Docs/USING-Framebuffer
+	Docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	rm -rf amiga atari beos cocoa monkey riscos windows  || die
+
+	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_GIF=$(usex gif YES NO)
+		NETSURF_USE_JPEG=$(usex jpeg YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
+		NETSURF_USE_VIDEO=$(usex gstreamer YES NO)
+		NETSURF_USE_MOZJS=$(usex javascript YES NO)
+		NETSURF_USE_JS=NO
+		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
+		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+		$(usex fbcon_frontend_able  NETSURF_FB_FRONTEND=able  "")
+		$(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+		$(usex fbcon_frontend_sdl   NETSURF_FB_FRONTEND=sdl   "")
+		$(usex fbcon_frontend_vnc   NETSURF_FB_FRONTEND=vnc   "")
+		$(usex fbcon_frontend_x     NETSURF_FB_FRONTEND=x     "")
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+		TARGET=dummy
+	)
+}
+
+src_compile() {
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_compile
+	fi
+	if use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_compile
+	fi
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		mv -v "${ED}"usr/bin/netsurf{,-fb} || die
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+
+		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+		elog "Please make /etc/input/mice readable to the account using netsurf-fb."
+		elog "Either use chmod a+r /etc/input/mice (security!!!) or use an group."
+	fi
+	if use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_install
+		elog "netsurf gtk version has been installed as netsurf-gtk"
+		mv -v "${ED}"/usr/bin/netsurf{,-gtk} || die
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+	fi
+
+	insinto /usr/share/pixmaps
+	doins gtk/res/netsurf.xpm
+}
diff --git a/www-client/netsurf/netsurf-3.3-r1.ebuild b/www-client/netsurf/netsurf-3.3-r1.ebuild
new file mode 100644
index 000000000000..bcbee5107e47
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.3-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.3
+inherit netsurf
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
+	http://xmw.de/mirror/netsurf-fb.modes-example.gz
+	${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="+bmp fbcon truetype +gif gstreamer gtk javascript +jpeg +mng pdf-writer
+	+png +rosprite +svg +svgtiny +webp fbcon_frontend_able fbcon_frontend_linux
+	fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk )
+	amd64? ( abi_x86_32? ( !javascript ) )
+	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+		fbcon_frontend_vnc fbcon_frontend_x ) )"
+
+RDEPEND="=dev-libs/libnsutils-0.0.1-r1[${MULTILIB_USEDEP}]
+	=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+	net-misc/curl[${MULTILIB_USEDEP}]
+	>=dev-libs/libcss-0.5.0-r1[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
+	net-libs/libdom[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	)
+	gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
+	gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+		gnome-base/libglade:2.0[${MULTILIB_USEDEP}]
+		>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
+	javascript? ( >=dev-libs/nsgenbind-0.1.2-r1[${MULTILIB_USEDEP}]
+		dev-lang/spidermonkey:0= )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
+	"${FILESDIR}"/${PN}-3.2-conditionally-include-image-headers.patch )
+DOCS=( fb.modes README Docs/USING-Framebuffer
+	Docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	rm -rf amiga atari beos cocoa monkey riscos windows  || die
+
+	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_GIF=$(usex gif YES NO)
+		NETSURF_USE_JPEG=$(usex jpeg YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
+		NETSURF_USE_VIDEO=$(usex gstreamer YES NO)
+		NETSURF_USE_MOZJS=$(usex javascript YES NO)
+		NETSURF_USE_JS=NO
+		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
+		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+		$(usex fbcon_frontend_able  NETSURF_FB_FRONTEND=able  "")
+		$(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+		$(usex fbcon_frontend_sdl   NETSURF_FB_FRONTEND=sdl   "")
+		$(usex fbcon_frontend_vnc   NETSURF_FB_FRONTEND=vnc   "")
+		$(usex fbcon_frontend_x     NETSURF_FB_FRONTEND=x     "")
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+		TARGET=dummy
+	)
+}
+
+src_compile() {
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_compile
+	fi
+	if use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_compile
+	fi
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		pushd "${ED}"usr/bin >/dev/null || die
+		for f in netsurf{,.*} ; do
+			mv -v $f ${f/netsurf/netsurf-fb} || die
+			make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-fb} NetSurf-framebuffer${f/netsurf} netsurf "Network;WebBrowser"
+		done
+		popd >/dev/null || die
+		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+		elog "Please make /etc/input/mice readable to the account using netsurf-fb."
+		elog "Either use chmod a+r /etc/input/mice (security!!!) or use an group."
+	fi
+	if use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_install
+		elog "netsurf gtk version has been installed as netsurf-gtk"
+		pushd "${ED}"usr/bin >/dev/null || die
+		for f in netsurf{,.*} ; do
+			mv -v $f ${f/netsurf/netsurf-gtk} || die
+			make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-gtk} NetSurf-gtk${f/netsurf} netsurf "Network;WebBrowser"
+		done
+		popd >/dev/null || die
+	fi
+
+	insinto /usr/share/pixmaps
+	doins gtk/res/netsurf.xpm
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
new file mode 100644
index 000000000000..502471c381ab
--- /dev/null
+++ b/www-client/opera-beta/Manifest
@@ -0,0 +1,2 @@
+DIST opera-beta_31.0.1889.92_amd64.deb 42585836 SHA256 e5863aef9027fbdf57e23b563bf3cb8ec9c8e64a53f89e74a53e1b1a9f609179 SHA512 064875435e1e5fe617cd6d87ad9ea84a29c0bdfceae2f64067291c43cb08af409f26c9b59d4aed723c36e8e5812be9af3c698ca8e359e7933bab2a7204bb878d WHIRLPOOL e53c1870a9eca52abd6faa739ef0a25720641fba75cafa0e854e447a02cb9f47e7dc0420ec787c61b3f27d9f560afe504ac89926da3d8c6e8fff7a7ee7d2e82b
+DIST opera-beta_31.0.1889.98_amd64.deb 42652746 SHA256 95ab02349b3c6a609b778a268c4d31f25fd0cfd7dfa0d255a85ea46fdbfdfcab SHA512 ad5cf86e976e73892d89a0c8a9d1c02bb64e2fd9ec80047a347a9c875287df7555ecd9475f1f852fd41e90751da4de59f3fae8488b5e2e072e9dc7f86db265a0 WHIRLPOOL 5946c4d3d91dcb5f85a8a2d39ec5559e5acc0f4d4d60a18988948facf87a4eaf38ad0a75ff9e360fccc8a1804b8033ce1452acdc093376dd62b1e042437b1996
diff --git a/www-client/opera-beta/metadata.xml b/www-client/opera-beta/metadata.xml
new file mode 100644
index 000000000000..ef0483f9ff68
--- /dev/null
+++ b/www-client/opera-beta/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-client/opera-beta/opera-beta-31.0.1889.92.ebuild b/www-client/opera-beta/opera-beta-31.0.1889.92.ebuild
new file mode 100644
index 000000000000..6333a1c91c46
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-31.0.1889.92.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	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
+}
diff --git a/www-client/opera-beta/opera-beta-31.0.1889.98.ebuild b/www-client/opera-beta/opera-beta-31.0.1889.98.ebuild
new file mode 100644
index 000000000000..6333a1c91c46
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-31.0.1889.98.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	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
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
new file mode 100644
index 000000000000..42b9ecb402da
--- /dev/null
+++ b/www-client/opera-developer/Manifest
@@ -0,0 +1,4 @@
+DIST opera-developer_32.0.1926.0_amd64.deb 42322380 SHA256 b022885ce976e22d163f785e86ce1b19c707670150a5860f3f502c19026b56b3 SHA512 5296d21c0ab5bf9e5916e5adc15641a1deb82418ca2340fa32df336a750cbba8dcaa70809374f23058db359cc675bf0161ec8907629e32caff723bd3ea8a994d WHIRLPOOL 3a9acba2ce47aff3f2c123d63e1482091921d48cfaa1bb8e8cfa06dcd6844b192439a5861885a6e929163573df3a2b5167e6a5de62a81fe0d2f5f5b1d182792e
+DIST opera-developer_32.0.1926.0_i386.deb 43688592 SHA256 80f3def59b9d1a92479377834bcb4f6ed2bde765084c9b02de5b368e8fa0e997 SHA512 7f697b0c5f0e5d101f5821663c602e769402babf75b5e2934b764b01ddb0fc65b029ff6cd77a44bade3a35be91ba92d6092cea6a7953a580dbf4a9c6f43f61d8 WHIRLPOOL 678e00700e745388aee483451c66f805935a23438d86b00d39596c18a84ba8f2a00e45e895c78091e21b3fc950fb9f28e974cd6685c531c6598bcdeef8a9bcc2
+DIST opera-developer_32.0.1933.0_amd64.deb 41876712 SHA256 36e153c3778ab543ea0b0921534f42dd689aaadd1fe0aac43d5e5fcb832a8a58 SHA512 b8269841d7c40c62a0ca83d2b0cbbf2099b967f23ac604e51b3a8aec880e9614955ae2b3f64a36d3171f4d48c09295df519a0a580aeec77cb634f61adfa0b7ca WHIRLPOOL c961f07f3391c944d8b1197e7ae7757c1b20f812877ab45bdbb391dcb1fb94183ae18296580660bd4ba43707006b428d891d7fb0ce14c8fff7ca878566924e2b
+DIST opera-developer_32.0.1933.0_i386.deb 43936830 SHA256 be60c87212307a06d7628761b9bb16e15c2bc7d711957467b4c55e2f7f868b32 SHA512 bd6c6c659c89d5666665e89216a3b5f188a25e0e5ede89cc3673efc5347d6e88376a751820003ac7417a729da643a69b549259cfc6a74e3f1324011e5a865a9c WHIRLPOOL af169d9669aad3e2f47b6c6b074d74ed7e3e5eba184a56d91a5ea7e833eed3bc902eba365f056aec8127ef5a61185f14f0941af7d0737eb855cd10ecb5f09155
diff --git a/www-client/opera-developer/metadata.xml b/www-client/opera-developer/metadata.xml
new file mode 100644
index 000000000000..ef0483f9ff68
--- /dev/null
+++ b/www-client/opera-developer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-client/opera-developer/opera-developer-32.0.1926.0.ebuild b/www-client/opera-developer/opera-developer-32.0.1926.0.ebuild
new file mode 100644
index 000000000000..bfeded8ebfc9
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-32.0.1926.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/opera-developer/opera-developer-32.0.1933.0.ebuild b/www-client/opera-developer/opera-developer-32.0.1933.0.ebuild
new file mode 100644
index 000000000000..bfeded8ebfc9
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-32.0.1933.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
new file mode 100644
index 000000000000..752e5059d8a4
--- /dev/null
+++ b/www-client/opera/Manifest
@@ -0,0 +1,6 @@
+DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60e0182fb85df9011b2c0c1c34cc73f377f25c9110a59 SHA512 e08547a8c966ec64c00e7058cb17856c9e2174b8b6e327d3e8b4c69226c9d1a1ff98f07557b607d8db68811b8a4f94a349ec9c882b480a706d3f28f7430e5ff8 WHIRLPOOL 83241aa6eab0a646292fdbfe497e227b24e1c8122b6f61f6d47dc81597f07db25d73bd58c1e7ac1fe4455d7387afd99b0ffc8e2e7a995653ea96e0fa20db234b
+DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
+DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
+DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
+DIST opera-stable_30.0.1835.125_amd64.deb 42222316 SHA256 762d1bfb8575c66d9528ebe77dd83c264c59598b9f972143f8c8d18aa9195a45 SHA512 c2c081b225fd327ad1697c52308dfc474ace6c692a94290079ef4f88262e59aae20cd93a7306a34abac96d0b226539b20d8a4a038f39c841e615f0bd20a68bcc WHIRLPOOL ddee6f69ebfa06434175530db7acbf8f08d323277ff84b27cb5ad6e008aa5c1922f84134edf9e627b8fb713a3efe77d2fabceaba900c455a294bd13ece477110
+DIST opera-stable_31.0.1889.99_amd64.deb 42518088 SHA256 51dc961957cd1b7169c6922f5433feee2320300f7c52f96bf349fa478b2b9745 SHA512 7acb4b03850925b1b3d9083cdb436f7d3de13d73e95baf68294343cc0af9da2e6217d6cd685cdc0acdea1bb1173fe06065d9c7f1eedde98b4c0e8e14cc196656 WHIRLPOOL 83e2af8acafd9ad0c69b8b667fadcb34c9b6a0cabcacfa8adcc1a1f96d9680395d9190c3319e27d4b205eea5e27f018bb862110e6a96f0d7da68cf92b7ac52f3
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
new file mode 100644
index 000000000000..30de8e3d5ae7
--- /dev/null
+++ b/www-client/opera/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<longdescription>
+Opera is a graphical Web browser available on several platforms. The desktop
+version runs on GNU/Linux and FreeBSD. Versions for Macintosh and
+Windows are also available.
+</longdescription>
+<use>
+<flag name='gtk'>Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration</flag>
+<flag name='kde'>Install support libraries and runtime dependencies to support KDE desktop integration</flag>
+</use>
+</pkgmetadata>
diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild
new file mode 100644
index 000000000000..b206145f294c
--- /dev/null
+++ b/www-client/opera/opera-12.16_p1860-r1.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-12 LGPL-2 LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
+
+O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
+O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
+
+# == Variables that often change ==
+# All other variables should be accounted for by _pre/_p
+
+O_K="noserch" # The key to the snapshot URL
+
+O_LINGUAS="
+	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
+	hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
+	sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+" # Supported linguas
+
+# == End of variables that often change ==
+
+if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then	# snapshot: _pre
+	HOMEPAGE="http://my.opera.com/desktopteam/blog/"
+
+	O_D="${O_K}_${O_V}-${O_B/pre}"			# directory string
+	O_P="${PN}-${O_V}-${O_B/pre}"			# package string
+	O_U="http://snapshot.opera.com/unix/"	# base URI
+
+	SRC_URI="
+		amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+		amd64-fbsd? ( ${O_U}${O_D}/${O_P}.amd64.freebsd.tar.xz )
+		x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+		x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+	"
+else							# release: _p
+	O_D="${O_V/./}"				# directory string
+	O_P="${PN}-${O_V}-${O_B/p}"	# package string
+	O_U="mirror://opera/"		# base URI
+
+	SRC_URI="
+		amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+		amd64-fbsd? ( ${O_U}unix/${O_D}/${O_P}.amd64.freebsd.tar.xz )
+		x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+		x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
+	"
+fi
+
+for O_LINGUA in ${O_LINGUAS}; do
+	IUSE+=" linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+	>=sys-apps/sed-4
+	app-arch/xz-utils
+"
+GTKRDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk? ( x11-libs/gtk+:2 )
+	x11-libs/pango
+	x11-libs/pixman
+"
+KDERDEPEND="
+	kde-base/kdelibs
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+GSTRDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
+	media-plugins/gst-plugins-meta:0.10
+"
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-misc/xdg-utils
+	gtk? ( ${GTKRDEPEND} )
+	kde? ( ${KDERDEPEND} )
+	gstreamer? ( ${GSTRDEPEND} )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+	local LNGDIR="share/${PN}/locale"
+
+	# Count linguas
+	count() { echo ${#}; }
+	local lingua_count=$(count ${O_LINGUAS} en)
+	local locale_count=$(count ${LNGDIR}/*)
+	[[ ${lingua_count} = ${locale_count} ]] \
+		|| die "Number of LINGUAS does not match number of locales"
+	unset count
+
+	# Remove unwanted linguas
+	for LINGUA in ${O_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+		fi
+	done
+
+	# Remove doc directory but keep the LICENSE under another name (bug #315473)
+	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+	rm -rf share/doc
+	for locale in share/${PN}/locale/*; do
+		rm -f "${locale}/license.txt"
+		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+			|| die
+	done
+
+	# Remove package directory
+	rm -rf share/${PN}/package
+
+	# Optional libraries
+	if ! use gtk; then
+		rm lib/${PN}/liboperagtk2.so || die
+	fi
+	if ! use kde; then
+		rm lib/${PN}/liboperakde4.so || die
+	fi
+	if ! use gstreamer; then
+		rm -r lib/${PN}/gstreamer || die
+	fi
+	if use amd64 && ! use multilib; then
+		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+	fi
+
+	# Unzip the man pages before sedding
+	gunzip share/man/man1/* || die
+
+	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
+	if [[ ${PN} = opera-next ]]; then
+		OPERA_SUFFIX="-next"
+		OPERA__SUFFIX=" Next"
+		OPERA_USUFFIX="-NEXT"
+	fi
+
+	# Replace PREFIX, SUFFIX and PN in various files
+	sed -i \
+		-e "s:@@{PREFIX}:/usr:g" \
+		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
+		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
+		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
+		share/man/man1/* \
+		share/mime/packages/* \
+		share/applications/${PN}-*.desktop \
+		|| die
+
+	# Create /usr/bin/opera wrapper
+	echo '#!/bin/sh' > ${PN}
+	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+		>> ${PN}
+	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+	# Change libfreetype.so.9 to libfreetype.so.6 for Gentoo/FreeBSD, bug #477594
+	if use elibc_FreeBSD; then
+		scanelf -qR -N libfreetype.so.9 -F "#N" lib/${PN}/ | \
+		while read i; do
+			if [[ $(strings "$i" | fgrep -c libfreetype.so.9) -ne 1 ]];
+			then
+				export SANITY_CHECK_LIBFREETYPE_FAILED=1
+				break
+			fi
+			sed -i \
+				"$i" \
+				-e 's/libfreetype\.so\.9/libfreetype.so.6/g'
+		done
+		[[ "$SANITY_CHECK_LIBFREETYPE_FAILED" = "1" ]] && die
+	fi
+}
+
+src_install() {
+	# We install into usr instead of opt as Opera does not support the latter
+	dodir /usr
+	if ! use elibc_FreeBSD; then
+		rm lib/${PN}/opera_autoupdatechecker || die
+	fi
+	mv lib/ "${D}/${OPREFIX}" || die
+	mv share/ "${D}/usr/" || die
+
+	# Install startup scripts
+	dobin ${PN}
+
+	# Stop revdep-rebuild from checking opera binaries
+	dodir /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+		> "${D}"/etc/revdep-rebuild/90${PN}
+
+	# Set PaX markings for hardened/PaX (bug #344267)
+	pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/opera/opera-30.0.1835.125.ebuild b/www-client/opera/opera-30.0.1835.125.ebuild
new file mode 100644
index 000000000000..cc6ee2635ac7
--- /dev/null
+++ b/www-client/opera/opera-30.0.1835.125.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable 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
+}
diff --git a/www-client/opera/opera-31.0.1889.99.ebuild b/www-client/opera/opera-31.0.1889.99.ebuild
new file mode 100644
index 000000000000..cc6ee2635ac7
--- /dev/null
+++ b/www-client/opera/opera-31.0.1889.99.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable 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
+}
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
new file mode 100644
index 000000000000..d6e577e6c414
--- /dev/null
+++ b/www-client/otter/Manifest
@@ -0,0 +1,2 @@
+DIST otter-0.9.06.tar.gz 2484916 SHA256 05ad64329e72c9a6a098a172e8060786b9e8ee5f24909a6714f8f665dc097d22 SHA512 793334e3b3a50fa6f8d0c45f28a1cd47c3a092d16ea0ad4fc26e96e661e2499d37114518dd399e16a3bae4640d61fffa9ab31bf0ceb1c8231286dc88c5284fe6 WHIRLPOOL 07ec17286e6981ffb8a8b77e9d25ba846a8aa776d2f1f723d5397f84926d4bf335fc1ed969757ecf28002e1caf9ea7896802959783873b4b45bf56c15b8d64b6
+DIST otter-0.9.07_p81.tar.gz 2577678 SHA256 e52be272085686b2172ea5b36dbfb1ff84ece46bb9e2f1691a67d5b96fa768f9 SHA512 1e9e5e4b64bd21f46b83984f26dd788f0e79ca3d9640f0789fd2da6cf3f79a8f233247874391f06d9c91f99e8072e509b79c2cfd37c87fa5e98dc7980bb8a26f WHIRLPOOL c7d10bad7cefbfd01eec7ffe1faa0a7a47689a8a58feb93c572bd255b69409338ad5606fead33b7d7b094b0e849a3737f0f2c63000162a36317eef6d18ccbd3c
diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
new file mode 100644
index 000000000000..ef0483f9ff68
--- /dev/null
+++ b/www-client/otter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-client/otter/otter-0.9.06.ebuild b/www-client/otter/otter-0.9.06.ebuild
new file mode 100644
index 000000000000..2a267ea2ab5c
--- /dev/null
+++ b/www-client/otter/otter-0.9.06.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_CMAKE="always"
+inherit eutils cmake-utils
+
+DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
+HOMEPAGE="http://otter-browser.org/"
+SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S=${WORKDIR}/${PN}-browser-${PV}
+DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+
+src_prepare() {
+	if [[ -n ${LINGUAS} ]]; then
+		local lingua
+		for lingua in resources/translations/*.qm; do
+			lingua=$(basename ${lingua})
+			lingua=${lingua/otter-browser_/}
+			lingua=${lingua/.qm/}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm resources/translations/otter-browser_${lingua}.qm || die
+			fi
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	domenu ${PN}-browser.desktop
+}
diff --git a/www-client/otter/otter-0.9.07_p81.ebuild b/www-client/otter/otter-0.9.07_p81.ebuild
new file mode 100644
index 000000000000..bda1f5e25e1f
--- /dev/null
+++ b/www-client/otter/otter-0.9.07_p81.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_CMAKE="always"
+inherit eutils cmake-utils
+
+DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
+HOMEPAGE="http://otter-browser.org/"
+SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
+DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+
+src_prepare() {
+	if [[ -n ${LINGUAS} ]]; then
+		local lingua
+		for lingua in resources/translations/*.qm; do
+			lingua=$(basename ${lingua})
+			lingua=${lingua/otter-browser_/}
+			lingua=${lingua/.qm/}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm resources/translations/otter-browser_${lingua}.qm || die
+			fi
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	domenu ${PN}-browser.desktop
+}
diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild
new file mode 100644
index 000000000000..1ad2bad3987f
--- /dev/null
+++ b/www-client/otter/otter-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_CMAKE="always"
+inherit eutils cmake-utils git-r3
+
+DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
+HOMEPAGE="http://otter-browser.org/"
+EGIT_REPO_URI="https://github.com/Emdek/otter"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+
+src_prepare() {
+	if [[ -n ${LINGUAS} ]]; then
+		local lingua
+		for lingua in resources/translations/*.qm; do
+			lingua=$(basename ${lingua})
+			lingua=${lingua/otter-browser_/}
+			lingua=${lingua/.qm/}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm resources/translations/otter-browser_${lingua}.qm || die
+			fi
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	domenu ${PN}-browser.desktop
+}
diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
new file mode 100644
index 000000000000..9463346672a5
--- /dev/null
+++ b/www-client/phantomjs/Manifest
@@ -0,0 +1,2 @@
+DIST phantomjs-1.9.8-source.zip 40965044 SHA256 37e53b2907bf37d2b6a43f08d38bb4a15596bba337822179e647efd60c2261bf SHA512 3692268a2706b097484ade500a2b24ce33d243b8ebbdf5ae8dea4b5e37adea5a84c11528e2862b9da71deb53cd14a985f1878d190a91c440632dd22cbfaf78fb WHIRLPOOL 71b4b24858b4c7916865bc89417399f08bcfdde30bfcfccacccb4dce86e014a46b9e313d93a34ca2d82001ce926281c7ff1c97cef8a91856acb57e96f3556af4
+DIST phantomjs-2.0.0-source.zip 110092872 SHA256 cc81249eaa059cc138414390cade9cb6509b9d6fa0df16f4f43de70b174b3bfe SHA512 c8262353ee4daa842ef891b41e006baccf1815a99cf3262aeba457cfc37bbef6cb2ca234e69bd33a5446014fe802b3e35591e2eb0d49d8483c1f75bacf9d6f42 WHIRLPOOL b26c70d92d3c06a6688f27ae0376c0af226f4a6c6e345d87041fda9a7095fdb9665d11fc250cd4a721da47825a7080e66558d3b033332b08f6300a8ab0525d22
diff --git a/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch b/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch
new file mode 100644
index 000000000000..7c67e6b8ece0
--- /dev/null
+++ b/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch
@@ -0,0 +1,12 @@
+--- a/phantomjs-2.0.0/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/itab.py	2015-01-24 11:19:52.000000000 +0900
++++ b/phantomjs-2.0.0/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/itab.py	2015-03-17 16:20:04.580191055 +0900
+@@ -314,8 +314,7 @@
+         self.ItabH.write( "\n" )
+ 
+         self.ItabH.write("\n/* itab entry operand definitions */\n");
+-        operands = self.OperandDict.keys()
+-        operands.sort()
++        operands = sorted(self.OperandDict)
+         for o in operands:
+             self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" %
+                     (o, self.OperandDict[o][0] + ",", self.OperandDict[o][1]));
diff --git a/www-client/phantomjs/metadata.xml b/www-client/phantomjs/metadata.xml
new file mode 100644
index 000000000000..cd80b9a9dcee
--- /dev/null
+++ b/www-client/phantomjs/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">phantomjs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/phantomjs/phantomjs-1.9.8.ebuild b/www-client/phantomjs/phantomjs-1.9.8.ebuild
new file mode 100644
index 000000000000..57e8c0221db9
--- /dev/null
+++ b/www-client/phantomjs/phantomjs-1.9.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs pax-utils multiprocessing
+
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
+HOMEPAGE="http://phantomjs.org/"
+SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+RDEPEND="dev-libs/icu:=
+	dev-libs/openssl
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e '/^# CONFIG += text_breaking_with_icu/s:#::' \
+		src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri \
+		|| die
+
+	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+	sed -i \
+		-e "/^SYSTEM_VARIABLES=/i \
+		CC='$(tc-getCC)'\n\
+		CXX='$(tc-getCXX)'\n\
+		CFLAGS='${CFLAGS}'\n\
+		CXXFLAGS='${CXXFLAGS}'\n\
+		LDFLAGS='${LDFLAGS}'\n\
+		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
+		src/qt/configure \
+		|| die
+
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find src/qt/config.tests/unix -name '*.test' -type f -exec \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		{} + || die
+}
+
+src_compile() {
+	./build.sh \
+		--confirm \
+		--jobs $(makeopts_jobs) \
+		--qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
+		|| die
+}
+
+src_test() {
+	./bin/phantomjs test/run-tests.js || die
+}
+
+src_install() {
+	pax-mark m bin/phantomjs || die
+	dobin bin/phantomjs
+	dodoc ChangeLog README.md
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/www-client/phantomjs/phantomjs-2.0.0.ebuild b/www-client/phantomjs/phantomjs-2.0.0.ebuild
new file mode 100644
index 000000000000..977809b507fb
--- /dev/null
+++ b/www-client/phantomjs/phantomjs-2.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit eutils toolchain-funcs pax-utils multiprocessing ruby-single
+
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
+HOMEPAGE="http://phantomjs.org/"
+SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-libs/icu:=
+	dev-libs/openssl
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/libpng:0=
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	${RUBY_DEPS}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/phantomjs-python3-udis86-itab.patch"
+
+	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+	sed -i \
+		-e "/^SYSTEM_VARIABLES=/i \
+		CC='$(tc-getCC)'\n\
+		CXX='$(tc-getCXX)'\n\
+		CFLAGS='${CFLAGS}'\n\
+		CXXFLAGS='${CXXFLAGS}'\n\
+		LDFLAGS='${LDFLAGS}'\n\
+		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
+		src/qt/qtbase/configure \
+		|| die
+
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		{} + || die
+}
+
+src_compile() {
+	./build.sh \
+		--confirm \
+		--jobs $(makeopts_jobs) \
+		--qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
+		|| die
+}
+
+src_test() {
+	./bin/phantomjs test/run-tests.js || die
+}
+
+src_install() {
+	pax-mark m bin/phantomjs || die
+	dobin bin/phantomjs
+	dodoc ChangeLog README.md
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
new file mode 100644
index 000000000000..a4ce5bcbc626
--- /dev/null
+++ b/www-client/pybugz/Manifest
@@ -0,0 +1 @@
+DIST pybugz-0.11.1.tar.gz 23787 SHA256 05b2cef8a655ab34d9279e6341d16a803af07958e72320125cb30a3fd6bc8eec SHA512 bc2277a8e900765bf1799e5de65de5df8184bf50b6ca7c78478a9f43ceb78aa66bcb53c3fd89f7b194b13fa14ad162291d559554a8cb073c071104e2b0978c61 WHIRLPOOL cb8f9a36cac6ae7a42e43d6d9489e2593c8ae76153b769bf04f269967e6477e37b1633d30969c4d7c6d0bcd816aff7bd189a1754c06769e3ea0f761eda3c16db
diff --git a/www-client/pybugz/metadata.xml b/www-client/pybugz/metadata.xml
new file mode 100644
index 000000000000..acc1dbc07272
--- /dev/null
+++ b/www-client/pybugz/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>williamh@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">williamh/pybugz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-client/pybugz/pybugz-0.11.1.ebuild b/www-client/pybugz/pybugz-0.11.1.ebuild
new file mode 100644
index 000000000000..ab820262405a
--- /dev/null
+++ b/www-client/pybugz/pybugz-0.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_REQ_USE="readline(+)"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://github.com/williamh/pybugz.git
+		https://github.com/williamh/pybugz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	inherit vcs-snapshot
+fi
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
+HOMEPAGE="http://www.github.com/williamh/pybugz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp contrib/bash-completion bugz
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh-completion _pybugz
+	fi
+}
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
new file mode 100644
index 000000000000..3434a5c5d9aa
--- /dev/null
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_REQ_USE="readline(+)"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://github.com/williamh/pybugz.git
+		https://github.com/williamh/pybugz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	inherit vcs-snapshot
+fi
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
+HOMEPAGE="http://www.github.com/williamh/pybugz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp contrib/bash-completion bugz
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh-completion _pybugz
+	fi
+}
diff --git a/www-client/qtweb/Manifest b/www-client/qtweb/Manifest
new file mode 100644
index 000000000000..60800c9e7f18
--- /dev/null
+++ b/www-client/qtweb/Manifest
@@ -0,0 +1 @@
+DIST qtweb-3.8.5_p108.tar.gz 1126836 SHA256 4b0735af1ab88b8be0dc0ac0d5acfb3164293a73a26c6e61ef2203a4977bf0a3 SHA512 7bb2f1760e41b91c65185cce2ce7cde639262d7b04256d766bb128a19046c97c645fab329676faa88a66407e1b551f914267dadb0e4f5f6c6f6d8ff9aedc8e46 WHIRLPOOL f43cd7179cd548ceae8c1cd1c9df5f647363608d7c27a8799bd5a0c494b43f2f092a37c78e3f14d702dde3c2641f29c1708b4f79892aaea719a363898b7f4760
diff --git a/www-client/qtweb/metadata.xml b/www-client/qtweb/metadata.xml
new file mode 100644
index 000000000000..5078e95f7191
--- /dev/null
+++ b/www-client/qtweb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">magist3r/QtWeb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/qtweb/qtweb-3.8.5_p108.ebuild b/www-client/qtweb/qtweb-3.8.5_p108.ebuild
new file mode 100644
index 000000000000..5670fe1833a8
--- /dev/null
+++ b/www-client/qtweb/qtweb-3.8.5_p108.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-r2
+
+MY_PN=QtWeb
+
+DESCRIPTION="Lightweight, fast, secure and portable browser for the Web"
+HOMEPAGE="http://www.qtweb.net/ https://github.com/magist3r/QtWeb"
+SRC_URI="https://codeload.github.com/magist3r/${MY_PN}/tar.gz/b${PV/*_p} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/designer:4
+"
+
+S=${WORKDIR}/${MY_PN}-b${PV/*_p}
+
+src_install() {
+	dobin build/${MY_PN}
+}
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
new file mode 100644
index 000000000000..b51ed9ad1942
--- /dev/null
+++ b/www-client/qupzilla/Manifest
@@ -0,0 +1,2 @@
+DIST QupZilla-1.8.6.tar.xz 3205912 SHA256 aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5 SHA512 36f1c79b7932b76f3ecbc4d1ea1bb207fe7e0477a98d583e13ab7df1703a5529e2d599c42b8f0a6792692c09e257abfdec398a1537a9002c1fd98d2128f4b627 WHIRLPOOL e60f66749654bd135fa2552ed2d75095c00108be6992b5d0e1609d7b458690218e601af317b3219f6e106e19870e46207109659e8aa9182117532bda7481f8e3
+DIST qupzilla-plugins-2015.01.27.tar.gz 335585 SHA256 466d2cc4a0b904705e2d23b6c05be6d36c74065f81b24aa9b82be0e377960e55 SHA512 0354b96530eca72d27838acfcd6605c0a14095f741587b89d1d4292e57bebe54d17e49464dc0a41af99873031c69ef09120c07053452568caf16dca222f1371b WHIRLPOOL a849f120f7f7a9e4dae6fa9abb2d3a66295a4778101887e99248f1ebd46e9231481f99f1d8fd9478e12f5cedbc5be055948ebe026d504d6b5d2d362ee222ba49
diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
new file mode 100644
index 000000000000..25694afcc9af
--- /dev/null
+++ b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
@@ -0,0 +1,10 @@
+--- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG	2015-05-07 18:29:35.045402873 +0200
++++ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp	2015-05-07 18:33:04.942404927 +0200
+@@ -39,6 +39,7 @@
+ ****************************************************************************/
+
+
++#include <QDataStream>
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
+ #include <QTime>
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
new file mode 100644
index 000000000000..dc9f533034c7
--- /dev/null
+++ b/www-client/qupzilla/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qt</herd>
+  <use>
+    <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
+      shown inside the page, not blocking the application window. When closing
+      browser windows with open dialogs, this can crash the application.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">QupZilla/qupzilla-plugins</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..21a113eef9f5
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.8.6-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_PN="QupZilla"
+MY_P=${MY_PN}-${PV}
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
+PLUGINS_HASH='1f8122da27362ae14a6e3c029830b51e9bac03be'
+PLUGINS_VERSION='2015.01.27' # if there are no updates, we can use the older archive
+
+inherit eutils l10n multilib qmake-utils vcs-snapshot
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
+	https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )
+	kde? ( qt4 )"
+
+RDEPEND="dev-libs/openssl:0
+	x11-libs/libX11
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	kde? ( kde-base/kdelibs:4
+		kde-apps/kwalletd:4 )
+	qt4? ( >=dev-qt/qtcore-4.8:4
+		>=dev-qt/qtgui-4.8:4
+		>=dev-qt/qtscript-4.8:4
+		>=dev-qt/qtsql-4.8:4[sqlite]
+		>=dev-qt/qtwebkit-4.8:4
+		dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dbus? ( dev-qt/qtdbus:5 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS=( AUTHORS CHANGELOG FAQ README.md )
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm_loc() {
+		# remove localizations the user has not specified
+		sed -i -e "/${1}.ts/d" translations/translations.pri || die
+		rm translations/${1}.ts || die
+	}
+
+	# patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142
+	epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch
+
+	epatch_user
+
+	# remove outdated prebuilt localizations
+	rm -rf bin/locale || die
+
+	# remove empty locale
+	rm translations/empty.ts || die
+
+	# get extra plugins into qupzilla build tree
+	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
+
+	l10n_find_plocales_changes "translations" "" ".ts"
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_configure() {
+	# see BUILDING document for explanation of options
+	export \
+		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
+		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
+		USE_QTWEBKIT_2_2=true \
+		DISABLE_DBUS=$(usex dbus '' 'true') \
+		KDE_INTEGRATION=$(usex kde 'true' '') \
+		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
+
+	if use qt4 ; then
+		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	else
+		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if has_version www-plugins/adobe-flash; then
+		ewarn "For using adobe flash plugin you may need to run"
+		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
+	fi
+}
diff --git a/www-client/qupzilla/qupzilla-1.8.6.ebuild b/www-client/qupzilla/qupzilla-1.8.6.ebuild
new file mode 100644
index 000000000000..f125b456a427
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.8.6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_PN="QupZilla"
+MY_P=${MY_PN}-${PV}
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
+PLUGINS_HASH='1f8122da27362ae14a6e3c029830b51e9bac03be'
+PLUGINS_VERSION='2015.01.27' # if there are no updates, we can use the older archive
+
+inherit eutils l10n multilib qmake-utils vcs-snapshot
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
+	https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )
+	kde? ( qt4 )"
+
+RDEPEND="dev-libs/openssl:0
+	x11-libs/libX11
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	kde? ( kde-base/kdelibs:4
+		kde-apps/kwalletd:4 )
+	qt4? ( >=dev-qt/qtcore-4.8:4
+		>=dev-qt/qtgui-4.8:4
+		>=dev-qt/qtscript-4.8:4
+		>=dev-qt/qtsql-4.8:4[sqlite]
+		>=dev-qt/qtwebkit-4.8:4
+		dbus? ( >=dev-qt/qtdbus-4.8:4 ) )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dbus? ( dev-qt/qtdbus:5 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS=( AUTHORS CHANGELOG FAQ README.md )
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm_loc() {
+		# remove localizations the user has not specified
+		sed -i -e "/${1}.ts/d" translations/translations.pri || die
+		rm translations/${1}.ts || die
+	}
+
+	epatch_user
+
+	# remove outdated prebuilt localizations
+	rm -rf bin/locale || die
+
+	# remove empty locale
+	rm translations/empty.ts || die
+
+	# get extra plugins into qupzilla build tree
+	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
+
+	l10n_find_plocales_changes "translations" "" ".ts"
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_configure() {
+	# see BUILDING document for explanation of options
+	export \
+		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
+		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
+		USE_QTWEBKIT_2_2=true \
+		DISABLE_DBUS=$(usex dbus '' 'true') \
+		KDE_INTEGRATION=$(usex kde 'true' '') \
+		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
+
+	if use qt4 ; then
+		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	else
+		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if has_version www-plugins/adobe-flash; then
+		ewarn "For using adobe flash plugin you may need to run"
+		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
+	fi
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
new file mode 100644
index 000000000000..039da4ad9325
--- /dev/null
+++ b/www-client/qutebrowser/Manifest
@@ -0,0 +1,2 @@
+DIST qutebrowser-0.2.1.tar.gz 892955 SHA256 0738377c1069d7d9ce1ff61e7425a139b44d21493d3a5c6338d697eb54f26d31 SHA512 9c49779515e6d7a3c9b93d50b51138f20292712f08de6f682db4f452c893796d9c66af7cca9ab7c18a5b7ddc147d62b7649572c7cdd416cc67c81cdf462c4f01 WHIRLPOOL 5f2f42163b59490eda25bad390c71113c8e7725a7bd8fa47240516a336364c76a7f97c516996f1ffcbc11025785070a30a6bccdcd66a06459ffbb24f874ed960
+DIST qutebrowser-0.3.0.tar.gz 938380 SHA256 a0c02148bf76eb13691d9476e6ab8bc791993dfe7a408974ba31dd6eb6584461 SHA512 ee0e5808f7732c3c4cd577beb9c25227af0b6a3136bd20b80e18fef20a0d7ae34111f40db2bc0071e34a92c0b0dc94c8899f0953107b4926ff5ba2894fc818e0 WHIRLPOOL 95bd3e1a8c065a31d816ea8f7d85649d937aed6ddf85cb28ad309cab2d7ed0b9dc72672106321be9a2d0a085622114fc340122920c4c528750e70636d88930d3
diff --git a/www-client/qutebrowser/files/qutebrowser-0.2.1-exclude-scripts.patch b/www-client/qutebrowser/files/qutebrowser-0.2.1-exclude-scripts.patch
new file mode 100644
index 000000000000..f9f949159ccb
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-0.2.1-exclude-scripts.patch
@@ -0,0 +1,13 @@
+Don't install development scripts.
+
+--- qutebrowser-0.2.1/setup.py
++++ qutebrowser-0.2.1/setup.py
+@@ -38,7 +38,7 @@
+ try:
+     common.write_git_file()
+     setuptools.setup(
+-        packages=setuptools.find_packages(exclude=['qutebrowser.test']),
++        packages=setuptools.find_packages(exclude=['qutebrowser.test', 'scripts']),
+         include_package_data=True,
+         entry_points={'gui_scripts':
+                       ['qutebrowser = qutebrowser.qutebrowser:main']},
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
new file mode 100644
index 000000000000..1dff51eefa1f
--- /dev/null
+++ b/www-client/qutebrowser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">The-Compiler/qutebrowser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/qutebrowser/qutebrowser-0.2.1.ebuild b/www-client/qutebrowser/qutebrowser-0.2.1.ebuild
new file mode 100644
index 000000000000..949e4d8a7a35
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-0.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils fdo-mime
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/The-Compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
+HOMEPAGE="https://github.com/The-Compiler/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gstreamer test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-exclude-scripts.patch )
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
+
+	domenu ${PN}.desktop
+	doicon icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/qutebrowser/qutebrowser-0.3.0.ebuild b/www-client/qutebrowser/qutebrowser-0.3.0.ebuild
new file mode 100644
index 000000000000..b63da5740940
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-0.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils fdo-mime
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/The-Compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
+HOMEPAGE="https://github.com/The-Compiler/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gstreamer test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+"
+
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
+
+	domenu ${PN}.desktop
+	doicon icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
new file mode 100644
index 000000000000..b63da5740940
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils fdo-mime
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/The-Compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
+HOMEPAGE="https://github.com/The-Compiler/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gstreamer test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+"
+
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
+
+	domenu ${PN}.desktop
+	doicon icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/rekonq/Manifest b/www-client/rekonq/Manifest
new file mode 100644
index 000000000000..b662e73c7840
--- /dev/null
+++ b/www-client/rekonq/Manifest
@@ -0,0 +1 @@
+DIST rekonq-2.4.2.tar.xz 5161348 SHA256 e9805b32f592ca5809bd1632c624c57fc0109ce98b73a8b8e3ebd04e9c875126 SHA512 55594dac99b06db7986198f1b6e8efdb0770e2219a33d34db7919d4d0d741ef026b0e12d284ae9b2e1a9b6e40efcdf4f0870e9b0819bff14f45162c5b464ba78 WHIRLPOOL 9e555f5ad935bd2e73ef62e6ccc8f634d3dedf219a5f1ef7a2c356123b0d56d47e2a177cabfb0803ca7f48ebef60a72e34801aa6c9904891630f7b47af08b2ba
diff --git a/www-client/rekonq/metadata.xml b/www-client/rekonq/metadata.xml
new file mode 100644
index 000000000000..8aa324273fae
--- /dev/null
+++ b/www-client/rekonq/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
+		<flag name="opera">Support for Opera sync handler</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">rekonq</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/rekonq/rekonq-2.4.2-r1.ebuild b/www-client/rekonq/rekonq-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..dc3369cdaff6
--- /dev/null
+++ b/www-client/rekonq/rekonq-2.4.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WEBKIT_REQUIRED="always"
+KDE_LINGUAS="cs da de el es et eu fi fr gl hu ia it km lt mr nb nl pl pt pt_BR
+sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+KDE_MINIMAL="4.13.1"
+inherit kde4-base
+
+DESCRIPTION="A browser based on qtwebkit"
+HOMEPAGE="http://rekonq.kde.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug kde nepomuk opera"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'nepomuk?')
+	kde? ( $(add_kdebase_dep kactivities) )
+	nepomuk? (
+		$(add_kdebase_dep nepomuk-core)
+		dev-libs/soprano
+	)
+	opera? (
+		app-crypt/qca:2[qt4(+)]
+		dev-libs/qoauth
+	)
+"
+RDEPEND="
+	${DEPEND}
+	$(add_kdeapps_dep kdebase-kioslaves)
+	$(add_kdeapps_dep keditbookmarks)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with kde KActivities)
+		$(cmake-utils_use_with opera QCA2)
+		$(cmake-utils_use_with opera QtOAuth)
+		$(cmake-utils_use_find_package nepomuk NepomukCore)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
new file mode 100644
index 000000000000..df4688918b0d
--- /dev/null
+++ b/www-client/seamonkey-bin/Manifest
@@ -0,0 +1,27 @@
+DIST seamonkey-2.33.1-be.xpi 842837 SHA256 bd6ccc1b70c8fe41d43b5f0f05137454f425e572a631ac9641bd7549375ede34 SHA512 a1a264e1cb794a25d22926ed4995028cf94f21fc1083d28491cf4616d9905cbf22dd006fa9298453c3349c6d9b8d3661a376513f95e3b18697d43845e7214afa WHIRLPOOL 295bf608cfa2142c9fb1ab85f1c122df2b4d27b3a6cd39c2e50f23159037165f126afe9938ce07a986c4bc2915ec3e944f3b52f5d13f3b7545d462c5966580a5
+DIST seamonkey-2.33.1-ca.xpi 834200 SHA256 f46880e8582a63d6af332c76d988fabb5077fba92affc1881ab8e3d24bf6b331 SHA512 c050cb3f86c78212dfbd40343e817685965d72a90b519879e5b4291f62a4371175352b08fb2fd3aa7834fd27e263404b2bf7473a9588fcbc61f09b9f658e4777 WHIRLPOOL 7202ea355b122da09df204198373b997a683761e8ddc04568ee2cab213907b9ca3ea38cb1490268b13344462a76d26a7f007a67501d51bfc3e6696c2dbe4c4ba
+DIST seamonkey-2.33.1-cs.xpi 831811 SHA256 38c09955551adc43dc2e6dec6aafd199b4a6fe7886a761eaafaa70938e8c3cff SHA512 2ea8f32eef09a908a16c949ca8f635a2f2e17b76996dcbcc8e6dc5c0119c2a4f25d58f49c830be2b29aaad0171289066acc77319d26822fc83e968d42469a3e9 WHIRLPOOL 87e0ad932f27175f7940cd7adfa0b42989aba9178c4159aad72f271258f231f9edf62c680b98c6ed27cebf6b80d64e5229b5b234cf44430963bff6fc2c1b6db7
+DIST seamonkey-2.33.1-de.xpi 838262 SHA256 36b12d7681556ed9501ba74e0b8e0564c41d87695f8b7b8960dde0b099f83500 SHA512 4794a95682625ccd46850ed68c5aca765984ee2583d75e17f73c963a86dd788936946ad5708d46a34f178f429578e967d07b00e3340f4e6cd078375ea99a3687 WHIRLPOOL 69fbf410d2e197507e1b6ad3eef7f477850f98930c4969b862ec4f1d2a5ccd70934b59198116ae71164d9d6935140c2e0d1878b07252e15a78b6ef08912f9a48
+DIST seamonkey-2.33.1-en-GB.xpi 804289 SHA256 5521941e84ba5979abf4864e5eefbdd331580e6e76f5ae46d4c43cf0a67170da SHA512 cf78583565e5320d9be3ff5eff71c065f9ad5472b99427b1924baf50d7f6665e90a4c9944bef76192f0665af3c9888a713f8b1c42c4fa093f290f8b6ab0b42ed WHIRLPOOL ac04bee191b5126d93d6705e69ba7cfa4d1a6b8fb569d17e1575faa3e2e171aa95b2bd5eb1054b4f9c919c3287aba2edf725982a44696ba0fac59e06e73bf82a
+DIST seamonkey-2.33.1-es-AR.xpi 852874 SHA256 40270d0af40557516049df8922f83dc4050dee0ad22599896fee226236115906 SHA512 bb9f4158a892d318afb2122c53031bda682363ffea68222f2456c12039d08e7fc56a413c9f62f938e05009a4a1d99c74c0f7e6383e669b0c941da3873a086a6c WHIRLPOOL e9e3802a7d99cb0e790329157e4702a3f73cf1014e398b215d2961f04b6409c2cd98936864fcaab4fdc662cbb0e1bd2a1d0f3568154b13ec334a030aad50ea55
+DIST seamonkey-2.33.1-es-ES.xpi 830037 SHA256 75b754919326c4ee9c114abadb02a387f91b7b65821b081eb820aaf50050621e SHA512 b24e6f7eb43ed7201fd383e64cf5e57b8fdb5a324023800d4990cadfeca5da56d4e473df8a3cec0313c64b28ddbe48e552fcd30e1145149a800f4093922707e3 WHIRLPOOL a7f1d85ac5c1e0d9dce5141d5aaa2d338cb11e637448b44a3527344659ef69d61feb23814a06faba8f336cc61b453f4b17aee64a56e23792c1238ba11d089a58
+DIST seamonkey-2.33.1-fi.xpi 801209 SHA256 42f3a3001dcbd9f6ff8f77ef5094363231282b1e05959ed07469adce9e841efc SHA512 ea05d0f85743f3f9a42a06ce5d3dba6ea92218af3c7eee97f5a3af50044a26d31aaa8d9e390809dd9487f72eb37d12388fe412e27646bef5e7291394f985ec51 WHIRLPOOL d1d0f9db82235f2b553e76dd5e9537f0db2de1c1f6c9d14fc11f2ed3755dc0b2a085b4dfe62bc425c32f23f7f8cc30a2a34ca917a91a0adb070e0c67ba11ece2
+DIST seamonkey-2.33.1-fr.xpi 812075 SHA256 864455ed8186096d90daaf35368d22825e4c3f2bcc3829efe60c4345b532718b SHA512 b14e17b6734e77138cc566322b20df677698d48542d29d868764267108c285c1b3e4aa83c3450187ce9c8dfabf2eb832afdd413a02753a2df2e1be999ca9c852 WHIRLPOOL c6d076bbdf959f0df75772812c022c298f517fe5283b3c273dca9289c445e61e657c0aef5cbb89f1d756d43e78096fe31568a6ee6ca6671a1a4e0fe71ca9e9c3
+DIST seamonkey-2.33.1-gl.xpi 815203 SHA256 74eac6af6cce412bd9a320696e78fd22e6e4a285b0873e21bc861df837a27d6a SHA512 0dacd3dec431be38fe479c53b4bf92a528ab1ba28ac88bd9da9b769afb35998ca5c855063644b833efbb5ebd5ba909c35525bd6ac6f23434956e8385bbc6fe27 WHIRLPOOL c19e7b819b949162d4aff72f89b26115cc7258973e49507a0fd6e7f442b3f1ef8e469edbaef619faccc7fb6f95281faa1ad25aa955e12681844bb60e999afb5a
+DIST seamonkey-2.33.1-hu.xpi 844136 SHA256 3451b3b0604842a23dab9aadb91ed51bbf60431bc5b456d337dbb5c22aba1c93 SHA512 b164d9908aa9c681d7716fbbf8f5bff3f3ff58e4f17d19a71f3c14079805246b094c86010e2664ddfd96b2e8896a95f58a1351041c308797685509e8522b0fef WHIRLPOOL a4597d6b92999391588aa6e98a09429b3046fb1ea499aa7bcf3a456250c0325f5e46e80c61ead4e60d999d3f23e00bc5f629314b114bbf91c04f9e15e4c25637
+DIST seamonkey-2.33.1-it.xpi 742287 SHA256 e6975df4e7680199d133df63875e5eb8aa5b7ff4dcfa0ddadf4867e8b4f3b68d SHA512 7988df7ff5f23e4cd0346cf41f2470def9c07b9edc8aabe1cf3e0b564cfa885cb1f52a0eafe6a2868f383ac3fb633714c864ecf9be89bc13960c795d0c10dd80 WHIRLPOOL 1ddd36ad829d90742ea3372f3215a92ab2a036aa4cc5d7632934ae185c2c009fd4e578f84519d1084dbbd901df9ada3846c3bff80d50ca6b30863f2a2449d90e
+DIST seamonkey-2.33.1-ja.xpi 886326 SHA256 e14120fbdece134b8716b47c28d7e7c823b3424cc238bd65980d91cc00ee9695 SHA512 9a2c9dedf21472137c85fe40bcf7b8e31b40f9f841528121e5040b495b36be03b738f1e60dc796f24db3e8013a4282df4d66a45a988a7bb1177f192978f28711 WHIRLPOOL 30b4bacba8430f3897e957a8b7bdb67e95638f26a2c5dbfa0b9985412d23130259565cf66bbd8c099e42c492786de7b49aaec3d05f764458134808b494f64f03
+DIST seamonkey-2.33.1-lt.xpi 853980 SHA256 19f699e40637e9f4dd06561bcc99cc8adc54c2e5b4c9d19cdce05eefbfcb2e55 SHA512 18b8d60d02775c5daa1f5c4f42bf95705828d90406044fe5b8e93fc807fe662016c20bd863b1794d23e2bbde4cc8e7dfff73ba2602e26248245fa3e0bb91b537 WHIRLPOOL 9187c07163aa86bb40e5749bb5e412d080e8cb5d6f0ec66893726955fbd06e89a8cf41683dd644cfe7485408bf7e21ffde1f72bcc90a59eb00a0814c9be90fec
+DIST seamonkey-2.33.1-nb-NO.xpi 824264 SHA256 adafdef75d19013e0ae6aaf60986680a56cbb0f69b5c4332bd7202becb343699 SHA512 f47e0e2fa2b450030f32c71767c290fa211a66198d3ddf095cfdf3c722b92d47e7cd7079cc1c1358bd7ff2f1ba9676949a1c4f04240c083a114228767053c3ff WHIRLPOOL a0e0899d5dfc2cedb732617ed64e9ea09529e9e9794d12644a8c61ad847730031811b5df48a1d89b7663f2da6c2ef65a2ca626c701dd817d67978ab73bb194f8
+DIST seamonkey-2.33.1-nl.xpi 796770 SHA256 44cb967d184ac079ce8ece66a8875f7f338f464f7c10189c7241512dc766492e SHA512 3aff3fbee4187208ecc4eca11132be066f7266619ad8cee11f000c0374c3739c3cd2916d42db7125a3ee50b39715cab3446cbb45df92f67294174b364348a0f9 WHIRLPOOL e4b02313f8b8f31abe49dc7d9ebe4e43638f6e1a3ccea61d9fcab463775cd151d386666e6ddd806dd5060bfd4fdaef3fb32c2500db0f08591a82509207dcdc06
+DIST seamonkey-2.33.1-pl.xpi 867982 SHA256 48a0ee96e322f8c5da269744dc8a0fdde4395cc801a01d6aa2279696e81011a5 SHA512 19bb762910e53bf3868ec586f3f538b16e472c2c46772be3b92807b48310308f930e59acf1e49d72bacbf4888dd41a0d7d1c247c12030fed8e6b9f01f264f1f6 WHIRLPOOL 9dc010f2b1d0548d2c5d32f6b775d06b799c799f7d3d8f22ae83a4db4bfcd44acbd7f239a47758e1e292a27eeb7e1c17819ed6aee460afb0c5f828acdf2bf252
+DIST seamonkey-2.33.1-pt-PT.xpi 834974 SHA256 6b109aaa7fb7402fbb383a0479a7010430d227df18c57010f78b3c80cd437f99 SHA512 423a07666e987c99d53bbf3bc0ffddb7654f634d6f83fc14e0427de77b8fcc1c116e1994b056818b11a22761e8fa7c46ce96a9004a36708069d7d6afac440e5a WHIRLPOOL 1c70acc518e494997d4242a4e991ca3fc582195bd3642243f4bb300c0e740817bcd3a6118b89c539aab3c3b33e263a07f669898e9e2d23a9f4d2f2d1708191d7
+DIST seamonkey-2.33.1-ru.xpi 899955 SHA256 3f7fa18e6da04e75b4e9a161e65aa45c16495bf78234eb1168573f3e0715ff9c SHA512 b2f3b3e0eb5f83d99ea7f5f4793d6f4280b733d8dfad4d752cfca76925815eccac434ddfe23ec4b017bf983e1d785b550133b5cab7f860a8d3e2aeaafd46cc1d WHIRLPOOL 589905b258dc112fcf611367c7a68d221b9ce9fabb52bdb6e1f64f1ebf865ede32dc0c6d844736c0dffa450ffa06ae4e98e4f75cb5144df948b2491e88174d32
+DIST seamonkey-2.33.1-sk.xpi 857564 SHA256 c80460e380b74047149fe8885a4befc4efb762eb28c98a2df6d61d06fbd709f4 SHA512 af3ad8c03e504d366bc092a607c3bfb1f62e09589f2371823de623650904dcfa0d0942f3450baea7c8650baa59b91f060742ce182dec998e57e222dcab92db25 WHIRLPOOL 8a706b897bac658293507d31995d621d5b3aded8a80109a1ebe174165f884bd9ea125f76c34d0a6d71d71f2de51ef032d26ac8e544bb78769b8ef11f17b5238a
+DIST seamonkey-2.33.1-sv-SE.xpi 826424 SHA256 f42d0dc239e124488b57b0b96b1f9cc3cae2118525d5d2bf5e2ac699211c00fb SHA512 7c8f9ac6726ab92eccb268cdbd3c9a3166b0d5fcca161e14e23335633f96f3e7c4ad7cf016286192ffd4410aec1bc2a38fbeb98e520b0592aa3aab50c1b953b9 WHIRLPOOL e71c41889118747950a399ca7f7a6df8c036b4a70b3407f8220198e2922c6d65e2d00a8b59c727f24edee948e3d37879b4c441082495c604ae0d2033140c72f4
+DIST seamonkey-2.33.1-tr.xpi 812398 SHA256 db1d8392f2d8c298d8b8a9a0da835cfcf14679a52dd96a8fad2c8dc7b29ea5dd SHA512 7ccd55fcb290fd615bfadae1c5cdfbb9e68bdede008e5b63939ac724c134bae9439d53062fe49008e89bd2940e176a812575b76bdbd578caf5b576510f652e7e WHIRLPOOL ec8c181e434c66157d704455db60f1f2739b4cc6ce6d42034ce156c4c512ea3ef2d3f31b5fdd16b89a8fdab439bcf2acb6d068242febe0788a8c3491a523908e
+DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 5f40259490b909023b318fa633fb8f549071c0bb23f2a1f3037c21c6792570da SHA512 4b0a763f11af9e604ace7cf60bd39d3601869459b28f65c91f3b7c272c5cce7b9d0ab6e676351f244d3f7e4fc86066ac96efc1017a8a59e249445be4c972c15e WHIRLPOOL 9453681ca3c2e82eac6223ed4ee4092dd2f6c1f396b6fcd6d78ada59b293b572edf2a423a9b206d703ce2651bcf6e8f78a39db3e2f8ef4e5ff262b8c2640188f
+DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5 WHIRLPOOL 36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0
+DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f WHIRLPOOL df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28
+DIST seamonkey-bin_i686-2.33.1.tar.bz2 41382431 SHA256 f52b597a938f2980fc438a96ac38b9d23cb403a7319bb5d60d862f96efc54926 SHA512 4f0261fd1d8acaa445670c1ea720dbb9d8e208df1fa68ff5cb699becf0adb8c8ef5429342e07da73e8b41d8cd2aabbeef9c54387d76f5a9f38f4c028c8cfd26f WHIRLPOOL 519f10c6e08bf1fa7c60b4377de66ae36e68c15a1424f11bb9eace35af242fb3138ca82eaea959842ed8fc7fbf94caec26d0d43f3e848e151046385e018ef307
+DIST seamonkey-bin_x86_64-2.33.1.tar.bz2 40357864 SHA256 94230b84f42b8d16700b1cc536f5888f9fb2088319835f24bcb404110ecf2136 SHA512 5ee9a7e7fbec36a380af612e2a326d379f3fe733eba4a35b29c8ad0927ad0a14e3f5ad9dc0342581019440b1f629e79f07ac91a92ea71622de080e01ffcd1cdc WHIRLPOOL 4f6f701f79ff9837851bea50a8b2cfdcefa4a1d9a4a9d18f3132956d8caa03dab25dd77255ce9835520702dea5cd8aa152dd1263234a6c4d06b260778b662355
diff --git a/www-client/seamonkey-bin/files/10seamonkey-bin b/www-client/seamonkey-bin/files/10seamonkey-bin
new file mode 100644
index 000000000000..6748c6cffe8b
--- /dev/null
+++ b/www-client/seamonkey-bin/files/10seamonkey-bin
@@ -0,0 +1 @@
+SEARCH_DIRS_MASK="/opt/seamonkey"
diff --git a/www-client/seamonkey-bin/files/all-gentoo-1-cve-2015-4000.js b/www-client/seamonkey-bin/files/all-gentoo-1-cve-2015-4000.js
new file mode 100644
index 000000000000..0cda361882e5
--- /dev/null
+++ b/www-client/seamonkey-bin/files/all-gentoo-1-cve-2015-4000.js
@@ -0,0 +1,13 @@
+// Ensure preference cann't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+lockPref("intl.locale.matchOS",                true);
+// Allow user to change based on needs
+defaultPref("browser.display.use_system_colors",  true);
+defaultPref("spellchecker.dictionary_path", "/usr/share/myspell");
+defaultPref("browser.shell.checkDefaultBrowser",  false); 
+// Preferences that should be reset every session
+pref("browser.EULA.override",              true); 
+// CVE-2015-4000 - prevent Logjam attack vector
+lockPref("security.ssl3.dhe_rsa_aes_128_sha", false);
+lockPref("security.ssl3.dhe_rsa_aes_256_sha", false);
diff --git a/www-client/seamonkey-bin/files/icon/seamonkey-bin.desktop b/www-client/seamonkey-bin/files/icon/seamonkey-bin.desktop
new file mode 100644
index 000000000000..ca02843c80f5
--- /dev/null
+++ b/www-client/seamonkey-bin/files/icon/seamonkey-bin.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SeaMonkey (bin)
+Comment=SeaMonkey Suite
+Exec=/usr/bin/seamonkey-bin %U
+Icon=seamonkey-bin
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
+Categories=Network;WebBrowser;Email;
diff --git a/www-client/seamonkey-bin/files/local-settings.js b/www-client/seamonkey-bin/files/local-settings.js
new file mode 100644
index 000000000000..9dac3b0eae0a
--- /dev/null
+++ b/www-client/seamonkey-bin/files/local-settings.js
@@ -0,0 +1,2 @@
+pref("general.config.filename", "all-gentoo.js");
+pref("general.config.obscure_value", 0); // use this to disable the byte-shift
diff --git a/www-client/seamonkey-bin/metadata.xml b/www-client/seamonkey-bin/metadata.xml
new file mode 100644
index 000000000000..399c1e911774
--- /dev/null
+++ b/www-client/seamonkey-bin/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>mozilla</herd>
+	<maintainer>
+		<email>jdhore@gentoo.org</email>
+		<name>Jeff Horelick</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild
new file mode 100644
index 000000000000..86cf1cfe8d82
--- /dev/null
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
+pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.seamonkey-project.org/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	gnome-base/gconf
+	gnome-base/gnome-vfs
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/components/*.so
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/seamonkey
+
+	# Install seamonkey in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}${MOZILLA_FIVE_HOME}"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/seamonkey-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/seamonkey-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/seamonkey/seamonkey "\$@"
+EOF
+	fperms 0755 /usr/bin/seamonkey-bin
+
+	# Install icon and .desktop for menu entry
+	newicon "${D}${MOZILLA_FIVE_HOME}"/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	if use startup-notification; then
+	    echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	# Copy preferences file so we can do a simple rename.
+	cp "${FILESDIR}"/all-gentoo-1-cve-2015-4000.js  "${D}"${MOZILLA_FIVE_HOME}/all-gentoo.js
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild
new file mode 100644
index 000000000000..8460a4fc2e67
--- /dev/null
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
+pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.seamonkey-project.org/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	gnome-base/gconf
+	gnome-base/gnome-vfs
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/components/*.so
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/seamonkey
+
+	# Install seamonkey in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}${MOZILLA_FIVE_HOME}"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/seamonkey-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/seamonkey-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/seamonkey/seamonkey "\$@"
+EOF
+	fperms 0755 /usr/bin/seamonkey-bin
+
+	# Install icon and .desktop for menu entry
+	newicon "${D}${MOZILLA_FIVE_HOME}"/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	if use startup-notification; then
+	    echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
new file mode 100644
index 000000000000..2de691806652
--- /dev/null
+++ b/www-client/seamonkey/Manifest
@@ -0,0 +1,29 @@
+DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
+DIST firefox-36.0-patches-01.tar.xz 4420 SHA256 9ebde39a67c05b3bd1053f16cc6ef9a9795940871da39456685cff0093c72812 SHA512 e5edc318acd367ae71bbeac554a01276be09301c052ed8054ce420f8026e11501cb853a81f05ce48df3642d5cec4e56c70502cf07c45fc514662f24177714ba1 WHIRLPOOL 7f2cda02552f9cbb4aeedcc8928ee2c624133d220fda86d3e526c97ada7d1def6ca3393c6368a70c5892b188bb3b47589c3365a66adf697464277438644d0cc9
+DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256 1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512 0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392 WHIRLPOOL 4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507
+DIST seamonkey-2.33.1-be.xpi 842837 SHA256 bd6ccc1b70c8fe41d43b5f0f05137454f425e572a631ac9641bd7549375ede34 SHA512 a1a264e1cb794a25d22926ed4995028cf94f21fc1083d28491cf4616d9905cbf22dd006fa9298453c3349c6d9b8d3661a376513f95e3b18697d43845e7214afa WHIRLPOOL 295bf608cfa2142c9fb1ab85f1c122df2b4d27b3a6cd39c2e50f23159037165f126afe9938ce07a986c4bc2915ec3e944f3b52f5d13f3b7545d462c5966580a5
+DIST seamonkey-2.33.1-ca.xpi 834200 SHA256 f46880e8582a63d6af332c76d988fabb5077fba92affc1881ab8e3d24bf6b331 SHA512 c050cb3f86c78212dfbd40343e817685965d72a90b519879e5b4291f62a4371175352b08fb2fd3aa7834fd27e263404b2bf7473a9588fcbc61f09b9f658e4777 WHIRLPOOL 7202ea355b122da09df204198373b997a683761e8ddc04568ee2cab213907b9ca3ea38cb1490268b13344462a76d26a7f007a67501d51bfc3e6696c2dbe4c4ba
+DIST seamonkey-2.33.1-cs.xpi 831811 SHA256 38c09955551adc43dc2e6dec6aafd199b4a6fe7886a761eaafaa70938e8c3cff SHA512 2ea8f32eef09a908a16c949ca8f635a2f2e17b76996dcbcc8e6dc5c0119c2a4f25d58f49c830be2b29aaad0171289066acc77319d26822fc83e968d42469a3e9 WHIRLPOOL 87e0ad932f27175f7940cd7adfa0b42989aba9178c4159aad72f271258f231f9edf62c680b98c6ed27cebf6b80d64e5229b5b234cf44430963bff6fc2c1b6db7
+DIST seamonkey-2.33.1-de.xpi 838262 SHA256 36b12d7681556ed9501ba74e0b8e0564c41d87695f8b7b8960dde0b099f83500 SHA512 4794a95682625ccd46850ed68c5aca765984ee2583d75e17f73c963a86dd788936946ad5708d46a34f178f429578e967d07b00e3340f4e6cd078375ea99a3687 WHIRLPOOL 69fbf410d2e197507e1b6ad3eef7f477850f98930c4969b862ec4f1d2a5ccd70934b59198116ae71164d9d6935140c2e0d1878b07252e15a78b6ef08912f9a48
+DIST seamonkey-2.33.1-en-GB.xpi 804289 SHA256 5521941e84ba5979abf4864e5eefbdd331580e6e76f5ae46d4c43cf0a67170da SHA512 cf78583565e5320d9be3ff5eff71c065f9ad5472b99427b1924baf50d7f6665e90a4c9944bef76192f0665af3c9888a713f8b1c42c4fa093f290f8b6ab0b42ed WHIRLPOOL ac04bee191b5126d93d6705e69ba7cfa4d1a6b8fb569d17e1575faa3e2e171aa95b2bd5eb1054b4f9c919c3287aba2edf725982a44696ba0fac59e06e73bf82a
+DIST seamonkey-2.33.1-es-AR.xpi 852874 SHA256 40270d0af40557516049df8922f83dc4050dee0ad22599896fee226236115906 SHA512 bb9f4158a892d318afb2122c53031bda682363ffea68222f2456c12039d08e7fc56a413c9f62f938e05009a4a1d99c74c0f7e6383e669b0c941da3873a086a6c WHIRLPOOL e9e3802a7d99cb0e790329157e4702a3f73cf1014e398b215d2961f04b6409c2cd98936864fcaab4fdc662cbb0e1bd2a1d0f3568154b13ec334a030aad50ea55
+DIST seamonkey-2.33.1-es-ES.xpi 830037 SHA256 75b754919326c4ee9c114abadb02a387f91b7b65821b081eb820aaf50050621e SHA512 b24e6f7eb43ed7201fd383e64cf5e57b8fdb5a324023800d4990cadfeca5da56d4e473df8a3cec0313c64b28ddbe48e552fcd30e1145149a800f4093922707e3 WHIRLPOOL a7f1d85ac5c1e0d9dce5141d5aaa2d338cb11e637448b44a3527344659ef69d61feb23814a06faba8f336cc61b453f4b17aee64a56e23792c1238ba11d089a58
+DIST seamonkey-2.33.1-fi.xpi 801209 SHA256 42f3a3001dcbd9f6ff8f77ef5094363231282b1e05959ed07469adce9e841efc SHA512 ea05d0f85743f3f9a42a06ce5d3dba6ea92218af3c7eee97f5a3af50044a26d31aaa8d9e390809dd9487f72eb37d12388fe412e27646bef5e7291394f985ec51 WHIRLPOOL d1d0f9db82235f2b553e76dd5e9537f0db2de1c1f6c9d14fc11f2ed3755dc0b2a085b4dfe62bc425c32f23f7f8cc30a2a34ca917a91a0adb070e0c67ba11ece2
+DIST seamonkey-2.33.1-fr.xpi 812075 SHA256 864455ed8186096d90daaf35368d22825e4c3f2bcc3829efe60c4345b532718b SHA512 b14e17b6734e77138cc566322b20df677698d48542d29d868764267108c285c1b3e4aa83c3450187ce9c8dfabf2eb832afdd413a02753a2df2e1be999ca9c852 WHIRLPOOL c6d076bbdf959f0df75772812c022c298f517fe5283b3c273dca9289c445e61e657c0aef5cbb89f1d756d43e78096fe31568a6ee6ca6671a1a4e0fe71ca9e9c3
+DIST seamonkey-2.33.1-gl.xpi 815203 SHA256 74eac6af6cce412bd9a320696e78fd22e6e4a285b0873e21bc861df837a27d6a SHA512 0dacd3dec431be38fe479c53b4bf92a528ab1ba28ac88bd9da9b769afb35998ca5c855063644b833efbb5ebd5ba909c35525bd6ac6f23434956e8385bbc6fe27 WHIRLPOOL c19e7b819b949162d4aff72f89b26115cc7258973e49507a0fd6e7f442b3f1ef8e469edbaef619faccc7fb6f95281faa1ad25aa955e12681844bb60e999afb5a
+DIST seamonkey-2.33.1-hu.xpi 844136 SHA256 3451b3b0604842a23dab9aadb91ed51bbf60431bc5b456d337dbb5c22aba1c93 SHA512 b164d9908aa9c681d7716fbbf8f5bff3f3ff58e4f17d19a71f3c14079805246b094c86010e2664ddfd96b2e8896a95f58a1351041c308797685509e8522b0fef WHIRLPOOL a4597d6b92999391588aa6e98a09429b3046fb1ea499aa7bcf3a456250c0325f5e46e80c61ead4e60d999d3f23e00bc5f629314b114bbf91c04f9e15e4c25637
+DIST seamonkey-2.33.1-it.xpi 742287 SHA256 e6975df4e7680199d133df63875e5eb8aa5b7ff4dcfa0ddadf4867e8b4f3b68d SHA512 7988df7ff5f23e4cd0346cf41f2470def9c07b9edc8aabe1cf3e0b564cfa885cb1f52a0eafe6a2868f383ac3fb633714c864ecf9be89bc13960c795d0c10dd80 WHIRLPOOL 1ddd36ad829d90742ea3372f3215a92ab2a036aa4cc5d7632934ae185c2c009fd4e578f84519d1084dbbd901df9ada3846c3bff80d50ca6b30863f2a2449d90e
+DIST seamonkey-2.33.1-ja.xpi 886326 SHA256 e14120fbdece134b8716b47c28d7e7c823b3424cc238bd65980d91cc00ee9695 SHA512 9a2c9dedf21472137c85fe40bcf7b8e31b40f9f841528121e5040b495b36be03b738f1e60dc796f24db3e8013a4282df4d66a45a988a7bb1177f192978f28711 WHIRLPOOL 30b4bacba8430f3897e957a8b7bdb67e95638f26a2c5dbfa0b9985412d23130259565cf66bbd8c099e42c492786de7b49aaec3d05f764458134808b494f64f03
+DIST seamonkey-2.33.1-lt.xpi 853980 SHA256 19f699e40637e9f4dd06561bcc99cc8adc54c2e5b4c9d19cdce05eefbfcb2e55 SHA512 18b8d60d02775c5daa1f5c4f42bf95705828d90406044fe5b8e93fc807fe662016c20bd863b1794d23e2bbde4cc8e7dfff73ba2602e26248245fa3e0bb91b537 WHIRLPOOL 9187c07163aa86bb40e5749bb5e412d080e8cb5d6f0ec66893726955fbd06e89a8cf41683dd644cfe7485408bf7e21ffde1f72bcc90a59eb00a0814c9be90fec
+DIST seamonkey-2.33.1-nb-NO.xpi 824264 SHA256 adafdef75d19013e0ae6aaf60986680a56cbb0f69b5c4332bd7202becb343699 SHA512 f47e0e2fa2b450030f32c71767c290fa211a66198d3ddf095cfdf3c722b92d47e7cd7079cc1c1358bd7ff2f1ba9676949a1c4f04240c083a114228767053c3ff WHIRLPOOL a0e0899d5dfc2cedb732617ed64e9ea09529e9e9794d12644a8c61ad847730031811b5df48a1d89b7663f2da6c2ef65a2ca626c701dd817d67978ab73bb194f8
+DIST seamonkey-2.33.1-nl.xpi 796770 SHA256 44cb967d184ac079ce8ece66a8875f7f338f464f7c10189c7241512dc766492e SHA512 3aff3fbee4187208ecc4eca11132be066f7266619ad8cee11f000c0374c3739c3cd2916d42db7125a3ee50b39715cab3446cbb45df92f67294174b364348a0f9 WHIRLPOOL e4b02313f8b8f31abe49dc7d9ebe4e43638f6e1a3ccea61d9fcab463775cd151d386666e6ddd806dd5060bfd4fdaef3fb32c2500db0f08591a82509207dcdc06
+DIST seamonkey-2.33.1-pl.xpi 867982 SHA256 48a0ee96e322f8c5da269744dc8a0fdde4395cc801a01d6aa2279696e81011a5 SHA512 19bb762910e53bf3868ec586f3f538b16e472c2c46772be3b92807b48310308f930e59acf1e49d72bacbf4888dd41a0d7d1c247c12030fed8e6b9f01f264f1f6 WHIRLPOOL 9dc010f2b1d0548d2c5d32f6b775d06b799c799f7d3d8f22ae83a4db4bfcd44acbd7f239a47758e1e292a27eeb7e1c17819ed6aee460afb0c5f828acdf2bf252
+DIST seamonkey-2.33.1-pt-PT.xpi 834974 SHA256 6b109aaa7fb7402fbb383a0479a7010430d227df18c57010f78b3c80cd437f99 SHA512 423a07666e987c99d53bbf3bc0ffddb7654f634d6f83fc14e0427de77b8fcc1c116e1994b056818b11a22761e8fa7c46ce96a9004a36708069d7d6afac440e5a WHIRLPOOL 1c70acc518e494997d4242a4e991ca3fc582195bd3642243f4bb300c0e740817bcd3a6118b89c539aab3c3b33e263a07f669898e9e2d23a9f4d2f2d1708191d7
+DIST seamonkey-2.33.1-ru.xpi 899955 SHA256 3f7fa18e6da04e75b4e9a161e65aa45c16495bf78234eb1168573f3e0715ff9c SHA512 b2f3b3e0eb5f83d99ea7f5f4793d6f4280b733d8dfad4d752cfca76925815eccac434ddfe23ec4b017bf983e1d785b550133b5cab7f860a8d3e2aeaafd46cc1d WHIRLPOOL 589905b258dc112fcf611367c7a68d221b9ce9fabb52bdb6e1f64f1ebf865ede32dc0c6d844736c0dffa450ffa06ae4e98e4f75cb5144df948b2491e88174d32
+DIST seamonkey-2.33.1-sk.xpi 857564 SHA256 c80460e380b74047149fe8885a4befc4efb762eb28c98a2df6d61d06fbd709f4 SHA512 af3ad8c03e504d366bc092a607c3bfb1f62e09589f2371823de623650904dcfa0d0942f3450baea7c8650baa59b91f060742ce182dec998e57e222dcab92db25 WHIRLPOOL 8a706b897bac658293507d31995d621d5b3aded8a80109a1ebe174165f884bd9ea125f76c34d0a6d71d71f2de51ef032d26ac8e544bb78769b8ef11f17b5238a
+DIST seamonkey-2.33.1-sv-SE.xpi 826424 SHA256 f42d0dc239e124488b57b0b96b1f9cc3cae2118525d5d2bf5e2ac699211c00fb SHA512 7c8f9ac6726ab92eccb268cdbd3c9a3166b0d5fcca161e14e23335633f96f3e7c4ad7cf016286192ffd4410aec1bc2a38fbeb98e520b0592aa3aab50c1b953b9 WHIRLPOOL e71c41889118747950a399ca7f7a6df8c036b4a70b3407f8220198e2922c6d65e2d00a8b59c727f24edee948e3d37879b4c441082495c604ae0d2033140c72f4
+DIST seamonkey-2.33.1-tr.xpi 812398 SHA256 db1d8392f2d8c298d8b8a9a0da835cfcf14679a52dd96a8fad2c8dc7b29ea5dd SHA512 7ccd55fcb290fd615bfadae1c5cdfbb9e68bdede008e5b63939ac724c134bae9439d53062fe49008e89bd2940e176a812575b76bdbd578caf5b576510f652e7e WHIRLPOOL ec8c181e434c66157d704455db60f1f2739b4cc6ce6d42034ce156c4c512ea3ef2d3f31b5fdd16b89a8fdab439bcf2acb6d068242febe0788a8c3491a523908e
+DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 5f40259490b909023b318fa633fb8f549071c0bb23f2a1f3037c21c6792570da SHA512 4b0a763f11af9e604ace7cf60bd39d3601869459b28f65c91f3b7c272c5cce7b9d0ab6e676351f244d3f7e4fc86066ac96efc1017a8a59e249445be4c972c15e WHIRLPOOL 9453681ca3c2e82eac6223ed4ee4092dd2f6c1f396b6fcd6d78ada59b293b572edf2a423a9b206d703ce2651bcf6e8f78a39db3e2f8ef4e5ff262b8c2640188f
+DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5 WHIRLPOOL 36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0
+DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f WHIRLPOOL df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28
+DIST seamonkey-2.33.1.source.tar.bz2 203015246 SHA256 b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08 SHA512 2fcd2833c140504a176da145b3fd519a22135c273ce8ea87d39e45a6255533e59dccb24367e3fc9b0575cfc7a7fe2b777296a067edafc83a3397d6916d9e3803 WHIRLPOOL c20f1dc667375608a94899546339c22134d09f74f3eae55b048ac21a6c024acbf7998d437d137963cf231b9ee07e6e69bc7b34ca7267a4ab3d3f6c51d09c4840
diff --git a/www-client/seamonkey/files/all-gentoo-1.js b/www-client/seamonkey/files/all-gentoo-1.js
new file mode 100644
index 000000000000..86b55cac5125
--- /dev/null
+++ b/www-client/seamonkey/files/all-gentoo-1.js
@@ -0,0 +1,19 @@
+pref("browser.display.use_system_colors",   true);
+pref("general.smoothScroll",                true);
+pref("general.useragent.vendor",            "Gentoo");
+pref("general.useragent.vendorSub",         "SEAMONKEY_PVR");
+pref("update_notifications.enabled",        false);
+
+pref("app.update.enabled",                  false);
+pref("app.update.autoInstallEnabled",       false);
+pref("browser.link.open_external",          3);
+pref("general.autoScroll",                  false);
+pref("browser.tabs.tabMinWidth",            15);
+pref("browser.backspace_action",            0);
+pref("accessibility.typeaheadfind",         true);
+pref("browser.EULA.override",               true);
+pref("intl.locale.matchOS",                 true);
+pref("general.useragent.locale",            "chrome://global/locale/intl.properties");
+pref("extensions.autoDisableScopes",        0);
+pref("layout.css.dpi",                      0);
+pref("browser.tabs.mouseScrollAdvancesTab", 0);
diff --git a/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch b/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch
new file mode 100644
index 000000000000..437d1adc220b
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch
@@ -0,0 +1,29 @@
+--- a/mozilla/memory/jemalloc/src/configure.ac	2014-10-11 05:06:41.000000000 -0400
++++ b/mozilla/memory/jemalloc/src/configure.ac	2014-10-16 13:41:10.809799170 -0400
+@@ -887,7 +887,7 @@
+ dnl Check whether the BSD/SUSv1 sbrk() exists.  If not, disable DSS support.
+ AC_CHECK_FUNC([sbrk], [have_sbrk="1"], [have_sbrk="0"])
+ if test "x$have_sbrk" = "x1" ; then
+-  if test "x$sbrk_deprecated" == "x1" ; then
++  if test "x$sbrk_deprecated" = "x1" ; then
+     AC_MSG_RESULT([Disabling dss allocation because sbrk is deprecated])
+     enable_dss="0"
+   else
+@@ -1180,7 +1180,7 @@
+ 		printf("%d\n", rv);
+ 	}
+ ], [je_cv_gcc_builtin_ffsl])
+-if test "x${je_cv_gcc_builtin_ffsl}" == "xyes" ; then
++if test "x${je_cv_gcc_builtin_ffsl}" = "xyes" ; then
+   AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [__builtin_ffsl])
+   AC_DEFINE([JEMALLOC_INTERNAL_FFS], [__builtin_ffs])
+ else
+@@ -1194,7 +1194,7 @@
+ 		printf("%d\n", rv);
+ 	}
+   ], [je_cv_function_ffsl])
+-  if test "x${je_cv_function_ffsl}" == "xyes" ; then
++  if test "x${je_cv_function_ffsl}" = "xyes" ; then
+     AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [ffsl])
+     AC_DEFINE([JEMALLOC_INTERNAL_FFS], [ffs])
+   else
diff --git a/www-client/seamonkey/files/seamonkey.desktop b/www-client/seamonkey/files/seamonkey.desktop
new file mode 100644
index 000000000000..780561f4bba2
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SeaMonkey
+Comment=SeaMonkey Suite
+Exec=seamonkey %u
+Icon=seamonkey
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
new file mode 100644
index 000000000000..d3602180c7a1
--- /dev/null
+++ b/www-client/seamonkey/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mozilla</herd>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+<use>
+	<flag name='chatzilla'>Build Mozilla's IRC client (default on)</flag>
+	<flag name='custom-optimization'>Fine-tune custom compiler
+		optimizations (-Os, -O0, -O1, -O2, -O3)</flag>
+	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
+		downloaded and kept up-to-date in user profiles</flag>
+	<flag name="ipc">Use inter-process communication between tabs and plugins.
+		Allows for greater stability in case of plugin crashes</flag>
+	<flag name='roaming'>Build roaming extension support (default on)</flag>
+	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
+		Use system cairo instead of bundled.</flag>
+	<flag name="system-icu">Use the sytem-wide <pkg>dev-libs/icu</pkg>
+		Use system icu indead of bundled.</flag>
+	<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
+		Use system jpeg instead of bundled.</flag>
+	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
+		instead of bundled.</flag>
+	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
+		installation with secure-delete enabled</flag>
+</use>
+</pkgmetadata>
diff --git a/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild b/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild
new file mode 100644
index 000000000000..187258834ef1
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
+	    pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	# And the langpack stuff stays at eclass defaults
+else
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+fi
+
+MOZCONFIG_OPTIONAL_WIFI=1
+#MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v5.36 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+
+PATCHFF="firefox-36.0-patches-01"
+PATCH="${PN}-2.33-patches-01"
+EMVER="1.8.2"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+if [[ ${PV} == *_pre* ]] ; then
+	# pre-releases. No need for arch teams to change KEYWORDS here.
+
+	KEYWORDS=""
+else
+	# This is where arch teams should change the KEYWORDS.
+
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
+fi
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal pulseaudio +roaming selinux test"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
+	http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=dev-libs/nss-3.17.4
+	>=dev-libs/nspr-4.10.8
+	crypt? ( || (
+			( >=app-crypt/gnupg-2.0
+				|| (
+					app-crypt/pinentry[gtk]
+					app-crypt/pinentry[qt4]
+				)
+			)
+			=app-crypt/gnupg-1.4* ) )
+	system-sqlite? ( >=dev-db/sqlite-3.8.7.4:3[secure-delete,debug=] )"
+
+DEPEND="${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc?  ( dev-libs/libexecinfo ) )
+	crypt? ( dev-lang/perl )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+if [[ ${PV} == *beta* ]] ; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-release"
+fi
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/seamonkey"
+
+	epatch "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
+			8002_jemalloc_configure_unbashify.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+	# drop -Wl,--build-id from LDFLAGS, bug #465466
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	if has_version '>=media-libs/freetype-2.6' ; then
+		sed '/ftcache\.h/aftfntfmt.h' \
+			-i "${S}/mozilla/config/system-headers" || die
+	fi
+
+	eautoreconf
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if use chatzilla ; then
+		MEXTENSIONS+=",irc"
+	else
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-canvas
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# jit needs to be enabled unconditionally (bug #544436)
+	mozconfig_annotate '' --enable-ion
+	mozconfig_annotate '' --enable-yarr-jit
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
+		>> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if use crypt ; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		econf
+		popd &>/dev/null || die
+	fi
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	# Only build enigmail extension if conditions are met.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in gmp-gmpopenh264 ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	if use crypt ; then
+		local em_dir="${WORKDIR}/enigmail/build"
+		pushd "${T}" &>/dev/null || die
+		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+		#'
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${em_dir}"/enigmail*.xpi || die
+
+		popd &>/dev/null || die
+	fi
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	#doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
new file mode 100644
index 000000000000..cea1d6f45af8
--- /dev/null
+++ b/www-client/surf/Manifest
@@ -0,0 +1 @@
+DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99
diff --git a/www-client/surf/files/surf-0.6-gentoo.patch b/www-client/surf/files/surf-0.6-gentoo.patch
new file mode 100644
index 000000000000..cda644baa84e
--- /dev/null
+++ b/www-client/surf/files/surf-0.6-gentoo.patch
@@ -0,0 +1,133 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,27 +4,27 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++PREFIX = /usr
++MANPREFIX = $(PREFIX)/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ 
+-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
+-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = -I. -I/usr/include $(X11INC) $(GTKINC)
++LIBS = $(X11LIB) $(GTKLIB)
+ 
+ # flags
+-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_SOURCE
++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS += $(LIBS)
+ 
+ # Solaris
+-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+-#LDFLAGS = ${LIBS}
++#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
++#LDFLAGS = $(LIBS)
+ 
+ # compiler and linker
+-CC = cc
++CC ?= gcc
+--- a/Makefile
++++ b/Makefile
+@@ -4,58 +4,58 @@
+ include config.mk
+ 
+ SRC = surf.c
+-OBJ = ${SRC:.c=.o}
++OBJ = $(SRC:.c=.o)
+ 
+ all: options surf
+ 
+ options:
+ 	@echo surf build options:
+-	@echo "CFLAGS   = ${CFLAGS}"
+-	@echo "LDFLAGS  = ${LDFLAGS}"
+-	@echo "CC       = ${CC}"
++	@echo "CFLAGS   = $(CFLAGS)"
++	@echo "LDFLAGS  = $(LDFLAGS)"
++	@echo "CC       = $(CC)"
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	$(CC) -c $(CFLAGS) $<
+ 
+-${OBJ}: config.h config.mk
++$(OBJ): config.h config.mk
+ 
+ config.h:
+ 	@echo creating $@ from config.def.h
+-	@cp config.def.h $@
++	cp config.def.h $@
+ 
+-surf: ${OBJ}
++surf: $(OBJ)
+ 	@echo CC -o $@
+-	@${CC} -o $@ surf.o ${LDFLAGS}
++	$(CC) -o $@ surf.o $(LDFLAGS)
+ 
+ clean:
+ 	@echo cleaning
+-	@rm -f surf ${OBJ} surf-${VERSION}.tar.gz
++	rm -f surf $(OBJ) surf-$(VERSION).tar.gz
+ 
+ dist: clean
+ 	@echo creating dist tarball
+-	@mkdir -p surf-${VERSION}
+-	@cp -R LICENSE Makefile config.mk config.def.h README \
++	mkdir -p surf-$(VERSION)
++	cp -R LICENSE Makefile config.mk config.def.h README \
+ 		surf-open.sh arg.h TODO.md surf.png \
+-		surf.1 ${SRC} surf-${VERSION}
+-	@tar -cf surf-${VERSION}.tar surf-${VERSION}
+-	@gzip surf-${VERSION}.tar
+-	@rm -rf surf-${VERSION}
++		surf.1 $(SRC) surf-$(VERSION)
++	tar -cf surf-$(VERSION).tar surf-$(VERSION)
++	gzip surf-$(VERSION).tar
++	rm -rf surf-$(VERSION)
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f surf ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/surf
+-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
++	@echo installing executable file to $(DESTDIR)$(PREFIX)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
++	cp -f surf $(DESTDIR)$(PREFIX)/bin
++	chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
++	@echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1
++	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
++	sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1
++	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ 
+ uninstall:
+-	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-	@rm -f ${DESTDIR}${PREFIX}/bin/surf
+-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+-	@rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1
++	@echo removing executable file from $(DESTDIR)$(PREFIX)/bin
++	rm -f $(DESTDIR)$(PREFIX)/bin/surf
++	@echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
++	rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ 
+ .PHONY: all options clean dist install uninstall
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
new file mode 100644
index 000000000000..424b08d75cc3
--- /dev/null
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -0,0 +1,133 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,27 +4,27 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++PREFIX = /usr
++MANPREFIX = $(PREFIX)/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ 
+-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
+-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = -I. -I/usr/include $(X11INC) $(GTKINC)
++LIBS = $(X11LIB) $(GTKLIB)
+ 
+ # flags
+-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE
++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS += $(LIBS)
+ 
+ # Solaris
+-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+-#LDFLAGS = ${LIBS}
++#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
++#LDFLAGS = $(LIBS)
+ 
+ # compiler and linker
+-CC = cc
++CC ?= gcc
+--- a/Makefile
++++ b/Makefile
+@@ -4,58 +4,58 @@
+ include config.mk
+ 
+ SRC = surf.c
+-OBJ = ${SRC:.c=.o}
++OBJ = $(SRC:.c=.o)
+ 
+ all: options surf
+ 
+ options:
+ 	@echo surf build options:
+-	@echo "CFLAGS   = ${CFLAGS}"
+-	@echo "LDFLAGS  = ${LDFLAGS}"
+-	@echo "CC       = ${CC}"
++	@echo "CFLAGS   = $(CFLAGS)"
++	@echo "LDFLAGS  = $(LDFLAGS)"
++	@echo "CC       = $(CC)"
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	$(CC) -c $(CFLAGS) $<
+ 
+-${OBJ}: config.h config.mk
++$(OBJ): config.h config.mk
+ 
+ config.h:
+ 	@echo creating $@ from config.def.h
+-	@cp config.def.h $@
++	cp config.def.h $@
+ 
+-surf: ${OBJ}
++surf: $(OBJ)
+ 	@echo CC -o $@
+-	@${CC} -o $@ surf.o ${LDFLAGS}
++	$(CC) -o $@ surf.o $(LDFLAGS)
+ 
+ clean:
+ 	@echo cleaning
+-	@rm -f surf ${OBJ} surf-${VERSION}.tar.gz
++	rm -f surf $(OBJ) surf-$(VERSION).tar.gz
+ 
+ dist: clean
+ 	@echo creating dist tarball
+-	@mkdir -p surf-${VERSION}
+-	@cp -R LICENSE Makefile config.mk config.def.h README \
++	mkdir -p surf-$(VERSION)
++	cp -R LICENSE Makefile config.mk config.def.h README \
+ 		surf-open.sh arg.h TODO.md surf.png \
+-		surf.1 ${SRC} surf-${VERSION}
+-	@tar -cf surf-${VERSION}.tar surf-${VERSION}
+-	@gzip surf-${VERSION}.tar
+-	@rm -rf surf-${VERSION}
++		surf.1 $(SRC) surf-$(VERSION)
++	tar -cf surf-$(VERSION).tar surf-$(VERSION)
++	gzip surf-$(VERSION).tar
++	rm -rf surf-$(VERSION)
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f surf ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/surf
+-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
++	@echo installing executable file to $(DESTDIR)$(PREFIX)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
++	cp -f surf $(DESTDIR)$(PREFIX)/bin
++	chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
++	@echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1
++	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
++	sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1
++	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ 
+ uninstall:
+-	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-	@rm -f ${DESTDIR}${PREFIX}/bin/surf
+-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+-	@rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1
++	@echo removing executable file from $(DESTDIR)$(PREFIX)/bin
++	rm -f $(DESTDIR)$(PREFIX)/bin/surf
++	@echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
++	rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ 
+ .PHONY: all options clean dist install uninstall
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
new file mode 100644
index 000000000000..a30445e0d016
--- /dev/null
+++ b/www-client/surf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+</maintainer>
+<use>
+<flag name='savedconfig'>Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
+</use>
+</pkgmetadata>
diff --git a/www-client/surf/surf-0.6-r1.ebuild b/www-client/surf/surf-0.6-r1.ebuild
new file mode 100644
index 000000000000..d5f45712de12
--- /dev/null
+++ b/www-client/surf/surf-0.6-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="a simple web browser based on WebKit/GTK+"
+HOMEPAGE="http://surf.suckless.org/"
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	net-libs/libsoup
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	!sci-chemistry/surf
+	${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-misc/dmenu
+"
+
+pkg_setup() {
+	if ! use savedconfig; then
+		elog "The default config.h assumes you have"
+		elog " net-misc/curl"
+		elog " x11-terms/st"
+		elog "installed to support the download function."
+		elog "Without those, downloads will fail (gracefully)."
+		elog "You can fix this by:"
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch_user
+	restore_config config.h
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	default
+	save_config config.h
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then
+		ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
+		ewarn "and its contents to no longer be world readable (see bug #404983)"
+	fi
+}
diff --git a/www-client/surf/surf-0.6-r2.ebuild b/www-client/surf/surf-0.6-r2.ebuild
new file mode 100644
index 000000000000..327f7d878b68
--- /dev/null
+++ b/www-client/surf/surf-0.6-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="a simple web browser based on WebKit/GTK+"
+HOMEPAGE="http://surf.suckless.org/"
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	net-libs/libsoup
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	!sci-chemistry/surf
+	${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-misc/dmenu
+	!savedconfig? (
+		net-misc/curl
+		x11-terms/st
+	)
+"
+
+pkg_setup() {
+	if ! use savedconfig; then
+		elog "The default config.h assumes you have"
+		elog " net-misc/curl"
+		elog " x11-terms/st"
+		elog "installed to support the download function."
+		elog "Without those, downloads will fail (gracefully)."
+		elog "You can fix this by:"
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch_user
+	restore_config config.h
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	default
+	save_config config.h
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then
+		ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
+		ewarn "and its contents to no longer be world readable (see bug #404983)"
+	fi
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
new file mode 100644
index 000000000000..97df92ea65b9
--- /dev/null
+++ b/www-client/surf/surf-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils git-2 savedconfig toolchain-funcs
+
+DESCRIPTION="a simple web browser based on WebKit/GTK+"
+HOMEPAGE="http://surf.suckless.org/"
+EGIT_REPO_URI="git://git.suckless.org/surf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+COMMON_DEPEND="
+	dev-libs/glib
+	net-libs/libsoup
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	!sci-chemistry/surf
+	${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-misc/dmenu
+	!savedconfig? (
+		net-misc/curl
+		x11-terms/st
+	)
+"
+
+pkg_setup() {
+	if ! use savedconfig; then
+		elog "The default config.h assumes you have"
+		elog " net-misc/curl"
+		elog " x11-terms/st"
+		elog "installed to support the download function."
+		elog "Without those, downloads will fail (gracefully)."
+		elog "You can fix this by:"
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch_user
+	restore_config config.h
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	default
+	save_config config.h
+}
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
new file mode 100644
index 000000000000..b3b889a1b21a
--- /dev/null
+++ b/www-client/surfraw/Manifest
@@ -0,0 +1 @@
+DIST surfraw-2.2.9.tar.gz 200042 SHA256 aa97d9ac24ca4299be39fcde562b98ed556b3bf5ee9a1ae497e0ce040bbcc4bb SHA512 81ddfc5300f5f052e09187144f39c0e1f0d6a0df9ad82d4457b60498278061ac6736a8236bd2b3516f6ad885d22c8616372b354f11b2dbb46ef4f3790456f016 WHIRLPOOL 80b149ddb7f37a0c000bba6dcbd1d4eff124581ba3266fb0cdf87467759856fc933067d45a4af30687564fa29f2b9756c6b393378420b0661e5d7c90cc8d30d6
diff --git a/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
new file mode 100644
index 000000000000..e43b24e46710
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
@@ -0,0 +1,37 @@
+  Needs a little more thought, or some method which would allow for an upstream
+push without affecting the non-Gentoo users.
+
+--- i/surfraw-bash-completion.IN
++++ w/surfraw-bash-completion.IN
+@@ -4,6 +4,22 @@
+ # installing the bash-completion package which sets this explicitly.
+ shopt -s extglob
+ 
++_srpkgname()
++{
++	local pd
++	local dir=$(sed -n -e '/^PORTDIR=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \
++		/etc/make.{conf,globals})/*
++	local cur="$1"
++
++	COMPREPLY=($(compgen -W "$(
++	    for pd in $dir
++		do
++			[ ! -d ${pd} ] && continue
++			builtin cd ${pd}
++			echo *
++		done)" -- ${cur})
++	)
++}
+ _surfraw() 
+ {       COMPREPLY=()
+ 	local cur=${COMP_WORDS[COMP_CWORD]}
+@@ -20,7 +36,7 @@ _surfraw()
+ 	then    COMPREPLY=( $( compgen -W "$elvi" -- $cur ) )
+ 		# "sr go<tab>" for google
+ 	elif    [[ $prev == @(alioth|deb@(bugs|contents|packages|pts|sec)|freshmeat|fsfdir|sourceforge) ]]
+-	then    COMPREPLY=( $(apt-cache --generate pkgnames $cur) )
++	then    _srpkgname ${cur}
+ 		# "sr debbugs 4<tab>" to check 44bsd-rdist bugs...
+ 	elif    [[ -x /usr/bin/look ]] # in bsdmainutils, "important"
+ 	then	COMPREPLY=( $(/usr/bin/look ${cur:-''}) )
diff --git a/www-client/surfraw/files/surfraw-2.2.9-completion.patch b/www-client/surfraw/files/surfraw-2.2.9-completion.patch
new file mode 100644
index 000000000000..0fb759f864b5
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-2.2.9-completion.patch
@@ -0,0 +1,10 @@
+--- a/surfraw-bash-completion.IN
++++ b/surfraw-bash-completion.IN
+@@ -45,5 +45,5 @@
+ 	fi
+ 	return 0
+ }
+-# test first in case removed-but-unpurged
+-type -p surfraw >/dev/null 2>&1 && complete -F _surfraw surfraw sr
++
++complete -F _surfraw surfraw sr
diff --git a/www-client/surfraw/metadata.xml b/www-client/surfraw/metadata.xml
new file mode 100644
index 000000000000..a38ca9cdc4a3
--- /dev/null
+++ b/www-client/surfraw/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<maintainer>
+		<email>jnrowe@gmail.com</email>
+		<name>James Rowe</name>
+	</maintainer>
+	<longdescription lang="en">
+		Surfraw provides a fast unix command line interface to a variety of
+		popular WWW search engines and other artifacts of power. It reclaims
+		google, altavista, babelfish, dejanews, freshmeat, research index,
+		slashdot and many others from the false-prophet, pox-infested heathen
+		lands of html-forms, placing these 	wonders where they belong, deep in
+		unix heartland, as god loving extensions to the shell.
+
+		Surfraw abstracts the browser away from input. Doing so lets it get on
+		with what it's good at. Browsing. Interpretation of linguistic forms is
+		handed back to the	shell, which is what it, and human beings are good
+		at. Combined with netscape-remote or incremental text browsers, such as
+		links (http://artax.karlin.mff.cuni.cz/~mikulas/links/),
+		w3m (http://www.w3m.org/), and screen(1) a Surfraw liberateur is
+		capable of navigating speeds that leave GUI tainted idolaters agape
+		with fear and wonder.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-client/surfraw/surfraw-2.2.9-r1.ebuild b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..919920ad492b
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="A fast unix command line interface to WWW"
+HOMEPAGE="http://surfraw.alioth.debian.org/"
+SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="amd64 hppa ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+RESTRICT="test"
+RDEPEND="dev-lang/perl"
+
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch \
+		"${FILESDIR}"/${PN}-2.2.9-completion.patch
+}
+
+src_configure() {
+	econf --with-elvidir='$(datadir)'/surfraw
+}
+
+src_install() {
+	default
+
+	newbashcomp surfraw-bash-completion ${PN}
+	bashcomp_alias ${PN} sr
+
+	docinto examples
+	dodoc examples/README
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/uzbl_load_url_from_surfraw
+}
+
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.0.7"
+	upgrade_from_1_0_7=$?
+}
+
+pkg_postinst() {
+	local moves f
+
+	einfo
+	einfo "You can get a list of installed elvi by just typing 'surfraw' or"
+	einfo "the abbreviated 'sr'."
+	einfo
+	einfo "You can try some searches, for example:"
+	einfo "$ sr ask why is jeeves gay? "
+	einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?"
+	einfo "$ sr rhyme -method=perfect Julian"
+	einfo
+	einfo "The system configuration file is /etc/surfraw.conf"
+	einfo
+	einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
+	einfo "SURFRAW_graphical_browser=mozilla"
+	einfo "SURFRAW_text_browser=w3m"
+	einfo "SURFRAW_graphical=no"
+	einfo
+	einfo "surfraw works with any graphical and/or text WWW browser"
+	einfo
+	if [[ $upgrade_from_1_0_7 = 0 ]] ; then
+		ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called"
+		ewarn "using the 'sr' wrapper script as described above.  If you wish to return to"
+		ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
+	fi
+	# This file was always autogenerated, and is no longer needed.
+	if [ -f "${EROOT}"/etc/surfraw_elvi.list ]; then
+		rm -f "${EROOT}"/etc/surfraw_elvi.list
+	fi
+
+	# Config file location changes in v2.2.6
+	for f in /etc/surfraw.{bookmarks,conf}; do
+		if [ -f "${EROOT}"${f} ]; then
+			ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6."
+			moves=1
+		fi
+	done
+	if [ "${moves}" == 1 ]; then
+		ewarn "You must manually move, and update, the config files listed"
+		ewarn "above for surfraw v2.2.6 and above to use them."
+	fi
+}
diff --git a/www-client/surfraw/surfraw-2.2.9.ebuild b/www-client/surfraw/surfraw-2.2.9.ebuild
new file mode 100644
index 000000000000..0df9a010e08e
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.2.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="A fast unix command line interface to WWW"
+HOMEPAGE="http://surfraw.alioth.debian.org/"
+SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="amd64 hppa ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+RESTRICT="test"
+RDEPEND="dev-lang/perl"
+
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch
+}
+
+src_configure() {
+	econf --with-elvidir='$(datadir)'/surfraw
+}
+
+src_install() {
+	default
+
+	newbashcomp surfraw-bash-completion ${PN}
+
+	docinto examples
+	dodoc examples/README
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/uzbl_load_url_from_surfraw
+}
+
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.0.7"
+	upgrade_from_1_0_7=$?
+}
+
+pkg_postinst() {
+	local moves f
+
+	einfo
+	einfo "You can get a list of installed elvi by just typing 'surfraw' or"
+	einfo "the abbreviated 'sr'."
+	einfo
+	einfo "You can try some searches, for example:"
+	einfo "$ sr ask why is jeeves gay? "
+	einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?"
+	einfo "$ sr rhyme -method=perfect Julian"
+	einfo
+	einfo "The system configuration file is /etc/surfraw.conf"
+	einfo
+	einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
+	einfo "SURFRAW_graphical_browser=mozilla"
+	einfo "SURFRAW_text_browser=w3m"
+	einfo "SURFRAW_graphical=no"
+	einfo
+	einfo "surfraw works with any graphical and/or text WWW browser"
+	einfo
+	if [[ $upgrade_from_1_0_7 = 0 ]] ; then
+		ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called"
+		ewarn "using the 'sr' wrapper script as described above.  If you wish to return to"
+		ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
+	fi
+	# This file was always autogenerated, and is no longer needed.
+	if [ -f "${EROOT}"/etc/surfraw_elvi.list ]; then
+		rm -f "${EROOT}"/etc/surfraw_elvi.list
+	fi
+
+	# Config file location changes in v2.2.6
+	for f in /etc/surfraw.{bookmarks,conf}; do
+		if [ -f "${EROOT}"${f} ]; then
+			ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6."
+			moves=1
+		fi
+	done
+	if [ "${moves}" == 1 ]; then
+		ewarn "You must manually move, and update, the config files listed"
+		ewarn "above for surfraw v2.2.6 and above to use them."
+	fi
+}
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
new file mode 100644
index 000000000000..cb53852a2bf4
--- /dev/null
+++ b/www-client/uget/Manifest
@@ -0,0 +1,3 @@
+DIST uget-1.10.3.tar.gz 484395 SHA256 2ff3f51a2fc7b927777c81e002032a08f819c18d050b570cd6ca0be76a459324 SHA512 c939832ad2b635e5b1d1e448bf075c13362e3f69f708e6669ad435f6467b258441d5adef34cea176082fa107865c2edd3ceb54c5b9074f0d71f94496e4995a34 WHIRLPOOL 473ec38a4d922481ae50205cf8283d2b9ce259bfcc6f8ef964c5c69f9d6f860e872676e8327d45bca5efd4d22e34d699f9e2b43ac4a2cfdc7c6a8728cc2df640
+DIST uget-1.10.4.tar.gz 576147 SHA256 a25c5cc9af4e87a2c22206f376ffce70697ef743a902ecf028b50a586180a622 SHA512 013654ea6d06e8075bb216082dd85e7a4d1ed8510af4ecaf49c816dbf127f1adb157ca275a574f87900d7980cbe70e1e918fe54f0ceb4d0115da0ba07d4f2273 WHIRLPOOL dfb993029a9019e91a540c7ab98a2b708e726e902f0a13abb0bb52ace592f92b848a5233ff903fd4cbd5cb67fe0fe7c0c36c66704af79482cf40e3dbc5661212
+DIST uget-1.8.0.tar.gz 426031 SHA256 ee9e785990747af85da7701c5add4f1e31f3f404be56dbd9f495149c76b7a937 SHA512 c68c591b3c513c4829dfee735cbe8d4ee2c47aed0c5962002de9462c6c12b731e51756785e834aadaef1cb47182b9e560dd836d2e4861f053ec1f2f447c2c68d WHIRLPOOL 203ae0cbbb46440fdc6a551edb0ffd602bea27c7f9a1b185f2db80d19e04c79e22f158b3a6966354c23130592803253d5f63f143a4eecd841dadc9ed7c515c66
diff --git a/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch b/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch
new file mode 100644
index 000000000000..77e031488641
--- /dev/null
+++ b/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch
@@ -0,0 +1,125 @@
+diff -u -ru uget-1.10.4-orig/configure.ac uget-1.10.4/configure.ac
+--- uget-1.10.4-orig/configure.ac	2014-05-08 05:48:17.316939998 +0300
++++ uget-1.10.4/configure.ac	2014-05-08 05:48:34.668232311 +0300
+@@ -145,23 +145,45 @@
+ )
+ 
+ if test "x$plugin_curl" = "xyes"; then
+-    AC_DEFINE(HAVE_PLUGIN_CURL, 1, [Define to 1 to enable cURL plug-in.])
++	AC_DEFINE(HAVE_PLUGIN_CURL, 1, [Define to 1 to enable cURL plug-in.])
+ fi
+ 
+ ## ----------------
+ ## GnuTLS
+-AC_ARG_ENABLE(
++AC_ARG_WITH(
+ 	[gnutls],
+-	AC_HELP_STRING([--enable-gnutls], [Enable GnuTLS support.]),
+-	[enable_gnutls="$enableval"],
+-	[enable_gnutls="no"]
++	AC_HELP_STRING([--with-gnutls[=@<:@no/auto/yes@:>@]], [Enable GnuTLS support.]),
++	[with_gnutls="$withval"],
++	[with_gnutls="auto"]
+ )
+-if test "x$enable_gnutls" = "xyes"; then
+-  PKG_CHECK_MODULES(GNUTLS, gnutls)
+-  AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if gnutls support is required.])
+-  # for ArchLinux
+-  AC_SUBST(GNUTLS_CFLAGS)
+-  AC_SUBST(GNUTLS_LIBS)
++if test "x$with_gnutls" != "xno"; then
++#	AC_CHECK_HEADER(gcrypt.h, [USE_GNUTLS_GCRYPT=1], [USE_GNUTLS_GCRYPT=0])
++#	if test "$USE_GNUTLS_GCRYPT" = "1"; then
++#		LIBGCRYPT_CFLAGS=""
++#		AC_SUBST(LIBGCRYPT_CFLAGS)
++#	fi
++#	AC_CHECK_HEADER(gcrypt/gcrypt.h, [USE_GNUTLS_GCRYPT=1], [USE_GNUTLS_GCRYPT=0])
++#	if test "$USE_GNUTLS_GCRYPT" = "1"; then
++#		LIBGCRYPT_CFLAGS=""
++#		AC_SUBST(LIBGCRYPT_CFLAGS, [""])
++#	fi
++#	AC_CHECK_LIB(gcrypt, gcry_control, [USE_GNUTLS_GCRYPT=1], [USE_GNUTLS_GCRYPT=0])
++#	if test "$USE_GNUTLS_GCRYPT" = "1"; then
++#		LIBGCRYPT_LIBS="-lgcrypt"
++#		AC_SUBST(LIBGCRYPT_LIBS, ["-lgcrypt"])
++#	fi
++	AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config)
++	if test "x$LIBGCRYPT_CONFIG" = "x" ; then
++		if test "x$with_gnutls" = "xyes"; then
++			AC_MSG_ERROR(Unable to find libgcrypt-config, please install libgcrypt)
++		fi
++	else
++		LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++		LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++		AC_SUBST(LIBGCRYPT_CFLAGS)
++		AC_SUBST(LIBGCRYPT_LIBS)
++		AC_DEFINE(USE_GNUTLS, 1, [Define to 1 if gnutls support is required.])
++	fi
+ fi
+ 
+ ## -----------------
+@@ -188,7 +210,7 @@
+   PKG_CHECK_MODULES(LIBPWMD, [libpwmd-7.0 >= 7.0.0])
+   AC_DEFINE(HAVE_LIBPWMD, 1, [Define to 1 if libpwmd support is required.])
+ fi
+-AM_CONDITIONAL([WITH_LIBPWMD],  [test "x$enable_pwmd" = "xyes"])

++AM_CONDITIONAL([WITH_LIBPWMD],  [test "x$enable_pwmd" = "xyes"])
+ 
+ ## -----------------
+ ## HIDE_TEMPORARY_FILE
+diff -u -ru uget-1.10.4-orig/uget-gtk/Makefile.am uget-1.10.4/uget-gtk/Makefile.am
+--- uget-1.10.4-orig/uget-gtk/Makefile.am	2014-05-08 05:48:17.341936098 +0300
++++ uget-1.10.4/uget-gtk/Makefile.am	2014-05-08 05:48:34.668232311 +0300
+@@ -1,10 +1,14 @@
+ bin_PROGRAMS = uget-gtk
+ 
+-UGET_GTK_LIBS   = @GTK_LIBS@   @GIO_LIBS@   @GTHREAD_LIBS@   @CURL_LIBS@   @GNUTLS_LIBS@   @LIBNOTIFY_LIBS@   @APP_INDICATOR_LIBS@   @GSTREAMER_LIBS@   @LIBPWMD_LIBS@
++UGET_GTK_LIBS   = @GTK_LIBS@  @GIO_LIBS@  @GTHREAD_LIBS@  \
++	@CURL_LIBS@  @LIBGCRYPT_LIBS@  \
++	@LIBNOTIFY_LIBS@  @APP_INDICATOR_LIBS@  @GSTREAMER_LIBS@  @LIBPWMD_LIBS@
+ 
+ # set the include path found by configure
+ uget_gtk_CPPFLAGS = -DDATADIR='"$(datadir)"' -I$(top_srcdir)/uglib -I$(top_srcdir)/uget-gtk
+-uget_gtk_CFLAGS   = @LFS_CFLAGS@  @GTK_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@ @CURL_CFLAGS@ @GNUTLS_CFLAGS@ @LIBNOTIFY_CFLAGS@ @APP_INDICATOR_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBPWMD_CFLAGS@
++uget_gtk_CFLAGS   = @LFS_CFLAGS@  @GTK_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@  \
++	@CURL_CFLAGS@ @LIBGCRYPT_CFLAGS@  \
++	@LIBNOTIFY_CFLAGS@ @APP_INDICATOR_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBPWMD_CFLAGS@
+ uget_gtk_LDFLAGS  = @LFS_LDFLAGS@
+ uget_gtk_LDADD    = $(top_builddir)/uglib/libuglib.a $(UGET_GTK_LIBS)
+ 
+diff -u -ru uget-1.10.4-orig/uget-gtk/UgApp-gtk-main.c uget-1.10.4/uget-gtk/UgApp-gtk-main.c
+--- uget-1.10.4-orig/uget-gtk/UgApp-gtk-main.c	2014-05-08 05:48:17.341936098 +0300
++++ uget-1.10.4/uget-gtk/UgApp-gtk-main.c	2014-05-08 05:48:43.267889859 +0300
+@@ -113,17 +113,17 @@
+ #include <UgApp-gtk.h>
+ 
+ // GnuTLS
+-#ifdef HAVE_GNUTLS
++#ifdef USE_GNUTLS
+ #include <gcrypt.h>
+ #include <errno.h>
+ 
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ 
+-void init_gnutls_locks (void)
++void init_locks (void)
+ {
+-	gcry_control (GCRYCTL_SET_THREAD_CBS);
++	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+ }
+-#endif // HAVE_GNUTLS
++#endif // USE_GNUTLS
+ 
+ // GStreamer
+ #ifdef HAVE_GSTREAMER
+@@ -199,8 +199,8 @@
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+-#ifdef HAVE_GNUTLS
+-	init_gnutls_locks ();
++#ifdef USE_GNUTLS
++	init_locks ();
+ #endif
+ 
+ 	string = ug_arg_find_version (argc, argv);
diff --git a/www-client/uget/files/uget-1.10.4-linguas-fix.patch b/www-client/uget/files/uget-1.10.4-linguas-fix.patch
new file mode 100644
index 000000000000..9482f1e4b84d
--- /dev/null
+++ b/www-client/uget/files/uget-1.10.4-linguas-fix.patch
@@ -0,0 +1,14 @@
+--- po/Makefile.in.in.old	2014-05-08 05:07:04.860525201 +0300
++++ po/Makefile.in.in	2014-05-08 05:29:13.404227684 +0300
+@@ -56,9 +56,9 @@
+ 
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+ 
+-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(PO_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+ 
+-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS=""; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+ 
+ POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+ 
diff --git a/www-client/uget/files/uget-ar-hardcoded.patch b/www-client/uget/files/uget-ar-hardcoded.patch
new file mode 100644
index 000000000000..f9ce7bb2f1df
--- /dev/null
+++ b/www-client/uget/files/uget-ar-hardcoded.patch
@@ -0,0 +1,26 @@
+--- configure.ac	2013-04-23 21:14:51.367980659 +0200
++++ configure.ac	2013-04-23 21:19:23.096311763 +0200
+@@ -19,6 +19,9 @@
+ ## Use library (static library)
+ AC_PROG_RANLIB
+ 
++## Determine the archiver
++AM_PROG_AR
++
+ ## Use libtool (share and static library) (add libtoolize to autogen.sh)
+ # AC_PROG_LIBTOOL
+ # LT_PREREQ([2.2.6])
+
+
+--- uglib/Makefile.in	2013-04-23 21:14:51.405980565 +0200
++++ uglib/Makefile.in	2013-04-23 21:17:22.358607880 +0200
+@@ -51,7 +51,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libuglib_a_AR = $(AR) $(ARFLAGS)
+ libuglib_a_LIBADD =
+
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
new file mode 100644
index 000000000000..f91cf6615e16
--- /dev/null
+++ b/www-client/uget/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<longdescription lang="en">
+		Uget is a download manager. It allows you to classify URLs before downloading
+		them, and allows you to import URLs from HTML files. Every category has an
+		independent configuration that can be inherited by each download in that
+		category.
+	</longdescription>
+	<use>
+		<flag name="aria2">Enable support for <pkg>net-misc/aria2</pkg> through xmlrpc.
+			You'll find the plugin in the app's settings.</flag>
+		<flag name="hide-temp-files">Make temporary files that are used while downloading hidden.</flag>
+		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">urlget</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/uget/uget-1.10.3-r1.ebuild b/www-client/uget/uget-1.10.3-r1.ebuild
new file mode 100644
index 000000000000..818b61e4123d
--- /dev/null
+++ b/www-client/uget/uget-1.10.3-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base autotools
+
+IUSE="aria2 +curl gstreamer hide-temp-files libnotify nls"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+	EGIT_REPO_URI="git://urlget.git.sourceforge.net/gitroot/urlget/uget"
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+fi
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4:3
+	curl? ( >=net-misc/curl-7.10 )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-ar-hardcoded.patch
+	eautoreconf
+
+	if [[ ${PV} == *9999* ]]; then
+		intltoolize || die "intltoolize failed"
+		eautoreconf
+	fi
+
+	# fix the .desktop file for QA
+	sed -i 's/Network;FileTransfer/Network;FileTransfer;/g' uget-gtk.desktop
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
+		  $(use_enable libnotify notify)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd
+
+	if [[ ${PV} == *9999* ]]; then
+		dodoc AUTHORS ChangeLog README
+	else
+		dodoc AUTHORS ChangeLog NEWS README
+	fi
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
+}
diff --git a/www-client/uget/uget-1.10.3.ebuild b/www-client/uget/uget-1.10.3.ebuild
new file mode 100644
index 000000000000..f8c30acfdb76
--- /dev/null
+++ b/www-client/uget/uget-1.10.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+IUSE="aria2 +curl gstreamer hide-temp-files libnotify nls"
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-2
+	KEYWORDS=""
+	SRC_URI=""
+	EGIT_REPO_URI="git://urlget.git.sourceforge.net/gitroot/urlget/uget"
+else
+	KEYWORDS="amd64 ppc x86"
+	SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+fi
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4:3
+	curl? ( >=net-misc/curl-7.10 )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+		intltoolize || die "intltoolize failed"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
+		  $(use_enable libnotify notify)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd
+
+	if [[ ${PV} == *9999* ]]; then
+		dodoc AUTHORS ChangeLog README
+	else
+		dodoc AUTHORS ChangeLog NEWS README
+	fi
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
+}
diff --git a/www-client/uget/uget-1.10.4.ebuild b/www-client/uget/uget-1.10.4.ebuild
new file mode 100644
index 000000000000..218135e1bda3
--- /dev/null
+++ b/www-client/uget/uget-1.10.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+LANGUAGES="linguas_ar linguas_be linguas_bn_BD linguas_cs linguas_da linguas_de
+	linguas_es linguas_fr linguas_hu linguas_id linguas_it linguas_ka_GE linguas_pl
+	linguas_pt_BR linguas_ru linguas_tr linguas_uk linguas_vi linguas_zh_CN
+	linguas_zh_TW"
+
+IUSE="aria2 +curl gnutls gstreamer hide-temp-files libnotify nls ${LANGUAGES}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget"
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+fi
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4:3
+	curl? ( >=net-misc/curl-7.10 )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-ar-hardcoded.patch
+	epatch "${FILESDIR}"/${P}-gnutls-backport-fix.patch
+	eautoreconf
+
+	if [[ ${PV} == *9999* ]]; then
+		intltoolize || die "intltoolize failed"
+		eautoreconf
+	fi
+
+	# fix LINGUAS not getting applied
+	epatch "${FILESDIR}"/${PN}-1.10.4-linguas-fix.patch
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_with gnutls) \
+		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
+		  $(use_enable libnotify notify)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd
+
+	if [[ ${PV} == *9999* ]]; then
+		dodoc AUTHORS ChangeLog README
+	else
+		dodoc AUTHORS ChangeLog NEWS README
+	fi
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
+}
diff --git a/www-client/uget/uget-1.8.0.ebuild b/www-client/uget/uget-1.8.0.ebuild
new file mode 100644
index 000000000000..d0767ddee8d9
--- /dev/null
+++ b/www-client/uget/uget-1.8.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="aria2 +curl gstreamer gtk3 hide-temp-files libnotify nls"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.18:2
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+	)
+	curl? ( >=net-misc/curl-7.10 )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	# add missing file, fix tests, bug #376203
+	echo "uglib/UgPlugin-aria2.c" >> po/POTFILES.in ||
+		die "echo in po/POTFILES.in failed"
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_with gtk3) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
+		  $(use_enable libnotify notify)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
+}
diff --git a/www-client/uget/uget-9999.ebuild b/www-client/uget/uget-9999.ebuild
new file mode 100644
index 000000000000..852d53c51f06
--- /dev/null
+++ b/www-client/uget/uget-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+LANGUAGES="linguas_ar linguas_be linguas_bn_BD linguas_cs linguas_da linguas_de
+	linguas_es linguas_fr linguas_hu linguas_id linguas_it linguas_ka_GE linguas_pl
+	linguas_pt_BR linguas_ru linguas_tr linguas_uk linguas_vi linguas_zh_CN
+	linguas_zh_TW"
+
+IUSE="aria2 +curl gnutls gstreamer hide-temp-files libnotify nls ${LANGUAGES}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget"
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+fi
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4:3
+	curl? ( >=net-misc/curl-7.10 )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		intltoolize || die "intltoolize failed"
+		eautoreconf
+	fi
+
+	# fix LINGUAS not getting applied
+	epatch "${FILESDIR}"/${PN}-1.10.4-linguas-fix.patch
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_with gnutls) \
+		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
+		  $(use_enable libnotify notify)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd
+
+	if [[ ${PV} == *9999* ]]; then
+		dodoc AUTHORS ChangeLog README
+	else
+		dodoc AUTHORS ChangeLog NEWS README
+	fi
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
+}
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
new file mode 100644
index 000000000000..d3e6fa3b3ed0
--- /dev/null
+++ b/www-client/uzbl/Manifest
@@ -0,0 +1 @@
+DIST uzbl-2012.05.14.tar.gz 152376 SHA256 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf SHA512 d0025a50c852007d5203b05d1bb1e77855c1c1d7e3cad685fd981817e5729682ccf01786f7e06c36a82ebbc1079e5d83fdb1cca40cc768024088dcc840a5ef90 WHIRLPOOL 1e16856b7b5005ae3dcad00c48ad5548bbee0d09403cdde35eda350013944ce35d67fc53063abf69d28d3c3ca37fc305101f0a6d2d645d9f01af1560d25f04e7
diff --git a/www-client/uzbl/metadata.xml b/www-client/uzbl/metadata.xml
new file mode 100644
index 000000000000..5d8d1b030ec2
--- /dev/null
+++ b/www-client/uzbl/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>tharvik@gmail.com</email>
+		<name>Kéwan Marconnet</name>
+	</maintainer>
+	<use>
+		<flag name="browser">Install the uzbl-browser script</flag>
+		<flag name="experimental">Enable experimental branch</flag>
+		<flag name="helpers">Optional tools used by uzbl scripts</flag>
+		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+		<flag name="tabbed">Install the uzbl-tabbed script</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Dieterbe/uzbl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/uzbl/uzbl-2012.05.14-r1.ebuild b/www-client/uzbl/uzbl-2012.05.14-r1.ebuild
new file mode 100644
index 000000000000..729fd9b369b5
--- /dev/null
+++ b/www-client/uzbl/uzbl-2012.05.14-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI='5'
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI=${EGIT_REPO_URI:-'git://github.com/Dieterbe/uzbl.git'}
+	KEYWORDS=''
+	SRC_URI=''
+	IUSE='experimental'
+	use experimental &&
+		EGIT_BRANCH='next'
+else
+	inherit vcs-snapshot
+	KEYWORDS='~amd64 ~x86 ~amd64-linux ~x86-linux'
+	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION='Web interface tools which adhere to the unix philosophy.'
+HOMEPAGE='http://www.uzbl.org'
+
+LICENSE='LGPL-2.1 MPL-1.1'
+SLOT='0'
+IUSE+=' gtk3 +browser helpers +tabbed vim-syntax'
+
+REQUIRED_USE='tabbed? ( browser )'
+
+COMMON_DEPEND='
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+'
+
+DEPEND="
+	virtual/pkgconfig
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject:2
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	tabbed? (
+		dev-python/pygtk
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+PREFIX="${EPREFIX}/usr"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		elog '   dev-python/pygtk'
+		elog '   dev-python/pygobject:2'
+		elog '   gnome-extra/zenity'
+		elog '   net-misc/socat'
+		elog '   x11-libs/pango'
+		elog '   x11-misc/dmenu'
+		elog '   x11-misc/xclip'
+		elog
+		elog 'Make sure you emerge the ones you need manually.'
+		elog 'You may also activate the *helpers* USE flag to'
+		elog 'install all of them automatically.'
+	else
+		einfo 'You have enabled the *helpers* USE flag that installs'
+		einfo "various optional applications used by uzbl's extra scripts."
+	fi
+}
+
+src_prepare() {
+	# remove -ggdb
+	sed -i 's/-ggdb //g' Makefile ||
+		die '-ggdb removal sed failed'
+
+	# make gtk3 configurable
+	sed -r 's:^(USE_GTK3) = (.*):\1?=\2:' -i Makefile ||
+		die 'Makefile sed for gtk3 failed'
+
+	# specify python version
+	python_fix_shebang bin/uzbl-tabbed ||
+		die 'Fix shebang failed'
+
+	# fix sandbox
+	if [ ${PV} == 9999 ] && ! use experimental
+	then
+		sed -i 's/prefix=$(PREFIX)/prefix=$(DESTDIR)\/$(PREFIX)/' Makefile ||
+			die 'Makefile sed for sandbox failed'
+	fi
+
+	# fix QA of uzbl.desktop
+	if [ ${PV} == 9999 ] && use experimental
+	then
+		sed -i 's/Categories=Application;Network;/Categories=Network;/'	\
+			uzbl.desktop.in || die 'QA compliance of uzbl.desktop.in failed'
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == 9999 ]] && gtk_var='ENABLE_GTK3' || gtk_var='USE_GTK3'
+	emake PREFIX="${PREFIX}" ${gtk_var}=$(use gtk3 && echo 1 || echo 0)
+}
+
+src_install() {
+	local targets='install-uzbl-core'
+	use browser && targets="${targets} install-uzbl-browser"
+	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
+
+	# -j1 : upstream bug #351
+	emake -j1 DESTDIR="${D}" PREFIX="${PREFIX}"	\
+		DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim
+	fi
+}
diff --git a/www-client/uzbl/uzbl-2012.05.14.ebuild b/www-client/uzbl/uzbl-2012.05.14.ebuild
new file mode 100644
index 000000000000..a68166e336d9
--- /dev/null
+++ b/www-client/uzbl/uzbl-2012.05.14.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+IUSE="gtk3"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
+	KEYWORDS=""
+	SRC_URI=""
+	IUSE+=" experimental"
+	use experimental &&
+		EGIT_BRANCH="experimental" &&
+		EGIT_COMMIT="experimental"
+else
+	inherit vcs-snapshot
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Web interface tools which adhere to the unix philosophy"
+HOMEPAGE="http://www.uzbl.org"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+SLOT="0"
+IUSE+=" +browser helpers +tabbed vim-syntax"
+
+REQUIRED_USE="tabbed? ( browser )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+
+"
+
+DEPEND="
+	virtual/pkgconfig
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject:2
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	tabbed? (
+		dev-python/pygtk
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+pkg_setup() {
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		elog "   dev-python/pygtk"
+		elog "   dev-python/pygobject:2"
+		elog "   gnome-extra/zenity"
+		elog "   net-misc/socat"
+		elog "   x11-libs/pango"
+		elog "   x11-misc/dmenu"
+		elog "   x11-misc/xclip"
+		elog
+		elog "Make sure you emerge the ones you need manually."
+		elog "You may also activate the *helpers* USE flag to"
+		elog "install all of them automatically."
+	else
+		einfo "You have enabled the *helpers* USE flag that installs"
+		einfo "various optional applications used by uzbl's extra scripts."
+	fi
+}
+
+src_prepare() {
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
+
+	# make gtk3 configurable
+	sed -r "s:^(USE_GTK3) = (.*):\1?=\2:" -i Makefile ||
+		die "Makefile sed for gtk3 failed"
+}
+
+src_compile() {
+	emake USE_GTK3=$(use gtk3 && echo 1 || echo 0)
+}
+
+src_install() {
+	local targets="install-uzbl-core"
+	use browser && targets="${targets} install-uzbl-browser"
+	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
+
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim
+	fi
+
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
new file mode 100644
index 000000000000..729fd9b369b5
--- /dev/null
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI='5'
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI=${EGIT_REPO_URI:-'git://github.com/Dieterbe/uzbl.git'}
+	KEYWORDS=''
+	SRC_URI=''
+	IUSE='experimental'
+	use experimental &&
+		EGIT_BRANCH='next'
+else
+	inherit vcs-snapshot
+	KEYWORDS='~amd64 ~x86 ~amd64-linux ~x86-linux'
+	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION='Web interface tools which adhere to the unix philosophy.'
+HOMEPAGE='http://www.uzbl.org'
+
+LICENSE='LGPL-2.1 MPL-1.1'
+SLOT='0'
+IUSE+=' gtk3 +browser helpers +tabbed vim-syntax'
+
+REQUIRED_USE='tabbed? ( browser )'
+
+COMMON_DEPEND='
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+'
+
+DEPEND="
+	virtual/pkgconfig
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject:2
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	tabbed? (
+		dev-python/pygtk
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+PREFIX="${EPREFIX}/usr"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		elog '   dev-python/pygtk'
+		elog '   dev-python/pygobject:2'
+		elog '   gnome-extra/zenity'
+		elog '   net-misc/socat'
+		elog '   x11-libs/pango'
+		elog '   x11-misc/dmenu'
+		elog '   x11-misc/xclip'
+		elog
+		elog 'Make sure you emerge the ones you need manually.'
+		elog 'You may also activate the *helpers* USE flag to'
+		elog 'install all of them automatically.'
+	else
+		einfo 'You have enabled the *helpers* USE flag that installs'
+		einfo "various optional applications used by uzbl's extra scripts."
+	fi
+}
+
+src_prepare() {
+	# remove -ggdb
+	sed -i 's/-ggdb //g' Makefile ||
+		die '-ggdb removal sed failed'
+
+	# make gtk3 configurable
+	sed -r 's:^(USE_GTK3) = (.*):\1?=\2:' -i Makefile ||
+		die 'Makefile sed for gtk3 failed'
+
+	# specify python version
+	python_fix_shebang bin/uzbl-tabbed ||
+		die 'Fix shebang failed'
+
+	# fix sandbox
+	if [ ${PV} == 9999 ] && ! use experimental
+	then
+		sed -i 's/prefix=$(PREFIX)/prefix=$(DESTDIR)\/$(PREFIX)/' Makefile ||
+			die 'Makefile sed for sandbox failed'
+	fi
+
+	# fix QA of uzbl.desktop
+	if [ ${PV} == 9999 ] && use experimental
+	then
+		sed -i 's/Categories=Application;Network;/Categories=Network;/'	\
+			uzbl.desktop.in || die 'QA compliance of uzbl.desktop.in failed'
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == 9999 ]] && gtk_var='ENABLE_GTK3' || gtk_var='USE_GTK3'
+	emake PREFIX="${PREFIX}" ${gtk_var}=$(use gtk3 && echo 1 || echo 0)
+}
+
+src_install() {
+	local targets='install-uzbl-core'
+	use browser && targets="${targets} install-uzbl-browser"
+	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
+
+	# -j1 : upstream bug #351
+	emake -j1 DESTDIR="${D}" PREFIX="${PREFIX}"	\
+		DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim
+	fi
+}
diff --git a/www-client/vimb/Manifest b/www-client/vimb/Manifest
new file mode 100644
index 000000000000..ed8255b34475
--- /dev/null
+++ b/www-client/vimb/Manifest
@@ -0,0 +1 @@
+DIST vimb-2.9.tar.gz 126272 SHA256 179024e07c133b049d9fb7c487bed9b9a8512b633e1d857e038b26a01d2e3541 SHA512 fac386aa6cd847215946582e4921f0742eeebd319845631d82236d8e17c715ac789940583b03de1e94ba690a94a09594183327d83552930572c54827808d70c7 WHIRLPOOL a4186c880511ee94e4021fd06c900155be8ea69314a07405c2e79214b88b6a7a96af0d5fc3f6344bd94384b713c247de7df6336445c5390ab80754aa47a10188
diff --git a/www-client/vimb/metadata.xml b/www-client/vimb/metadata.xml
new file mode 100644
index 000000000000..99d470df2d96
--- /dev/null
+++ b/www-client/vimb/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of
+			<pkg>x11-libs/gtk+:2</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">fanglingsu/vimb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/vimb/vimb-2.9.ebuild b/www-client/vimb/vimb-2.9.ebuild
new file mode 100644
index 000000000000..8e97e9e9ad02
--- /dev/null
+++ b/www-client/vimb/vimb-2.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="a fast, lightweight, vim-like browser based on webkit"
+HOMEPAGE="http://fanglingsu.github.io/vimb/"
+SRC_URI="https://github.com/fanglingsu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk3"
+
+RDEPEND="
+	>=net-libs/libsoup-2.38:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.5.0:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		>=net-libs/webkit-gtk-1.5.0:3
+		x11-libs/gtk+:3
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# force verbose build
+	sed -e '/@echo "\($(CC)\|${CC}\) $@"/d' \
+		-e 's/@$(CC)/$(CC)/' \
+		-i Makefile || die
+
+	epatch_user
+}
+
+src_compile() {
+	local myconf
+	use gtk3 && myconf+=" GTK=3"
+
+	emake CC="$(tc-getCC)" ${myconf}
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+}
diff --git a/www-client/vimprobable2/Manifest b/www-client/vimprobable2/Manifest
new file mode 100644
index 000000000000..636d9a11c40e
--- /dev/null
+++ b/www-client/vimprobable2/Manifest
@@ -0,0 +1,2 @@
+DIST vimprobable2_1.4.0.tar.bz2 44599 SHA256 dca8804671c64676b796228cfdd60c5ef4e44ccdd109b362c7d51c05ee6241b6 SHA512 1eb82cf50e8f33e2841d43f6a8cdd46caddb691b4f41784ae852b960533c1796561bb7253ceb2347dbd0a8accce494702c392a2f5ad8daf7a4b41de12d962a4a WHIRLPOOL b5c2c06e4387cc01d9e33f45255a1e34931f85606a82eba96f340e44b49c2cc43c83111236fc7d63ffd2fba5358786e9d9284912937d8c2ded182ea4cf89f56f
+DIST vimprobable2_1.4.2.tar.bz2 44730 SHA256 f9cfd25b75e5761378c40dfbdd1fe8c3ea7581ae1b39d11e1b39413d6bec4d8e SHA512 daf55843d3bb028673b4937d137ee532feb3324ca4dcd5a1c57fe7f6b0a02e35d0f8875bf695a3c9ae1d988840e71bfaad45a9f92c981205ac358fc2832d7e58 WHIRLPOOL 748573214f96d14916ff4b95b3186f1b6a45cafeaa55bd423e16c8f761a770981e07247c9c1675cef1f3554ed41bbdd0d376f776cfcfb0f3430915999fd45a91
diff --git a/www-client/vimprobable2/metadata.xml b/www-client/vimprobable2/metadata.xml
new file mode 100644
index 000000000000..8d814ce794e8
--- /dev/null
+++ b/www-client/vimprobable2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vimprobable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/vimprobable2/vimprobable2-1.4.0.ebuild b/www-client/vimprobable2/vimprobable2-1.4.0.ebuild
new file mode 100644
index 000000000000..ca0778f41787
--- /dev/null
+++ b/www-client/vimprobable2/vimprobable2-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
+HOMEPAGE="http://www.vimprobable.org/"
+SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1 vimprobablerc.5
+}
diff --git a/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild b/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..89b659c19f8c
--- /dev/null
+++ b/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs savedconfig
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
+	EGIT_PROJECT="vimprobable"
+else
+	SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}
+fi
+
+DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
+HOMEPAGE="http://www.vimprobable.org/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CC
+	restore_config config.h keymap.h
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1 vimprobablerc.5
+
+	save_config config.h keymap.h
+}
diff --git a/www-client/vimprobable2/vimprobable2-1.4.2.ebuild b/www-client/vimprobable2/vimprobable2-1.4.2.ebuild
new file mode 100644
index 000000000000..ac050ee2dc77
--- /dev/null
+++ b/www-client/vimprobable2/vimprobable2-1.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
+HOMEPAGE="http://www.vimprobable.org/"
+SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1 vimprobablerc.5
+}
diff --git a/www-client/vimprobable2/vimprobable2-9999.ebuild b/www-client/vimprobable2/vimprobable2-9999.ebuild
new file mode 100644
index 000000000000..28c0221c0c27
--- /dev/null
+++ b/www-client/vimprobable2/vimprobable2-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs savedconfig
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
+else
+	SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}
+fi
+
+DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
+HOMEPAGE="http://www.vimprobable.org/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CC
+	restore_config config.h keymap.h
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1 vimprobablerc.5
+
+	save_config config.h keymap.h
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
new file mode 100644
index 000000000000..a193438b7dd9
--- /dev/null
+++ b/www-client/vivaldi/Manifest
@@ -0,0 +1,4 @@
+DIST vivaldi-1.0.231.3_p1-amd64.deb 40667174 SHA256 f57a2099d2495e09d25bab53b56e71e946497d435fe386988de7f7b8458dac43 SHA512 51e2a08da25528188f19e701d440bbebe9b5df668dd8f10237e3c9c89324f5416f9df39c1962a3a5d95450a939d4445d75714548e3e3743f4e5dd74db172583a WHIRLPOOL 5588a231b85646acfbfa01a3eda6d865b875a1be958fefc23c512bb26fa007340cd444bbfb7fbbd3ad7397cb7ed6f09fec0cbf953a2932b92344550b4b107c7a
+DIST vivaldi-1.0.231.3_p1-i386.deb 40382314 SHA256 c760d606aef23a636b162fe6fa929b14c932a3e532cd785f9db857d9e6071d57 SHA512 2c70102450f65bff75682746f5cac8b924b8f55820d32165db5d0eebfb4c298372a011ef301625224e010a1d2e5916fcd7381bcc28a20ab725701b56d60949e3 WHIRLPOOL 88c98124ed6c88c2f4716f93c24f79fa62a41bb368d7c61cbeec6482e166f4250ddf29e3e5669130d2fe54219f03850d2ac72bd6a50dcf4bd4a4162371cd0371
+DIST vivaldi-1.0.233.3_p1-amd64.deb 40707172 SHA256 8811847b422ec2b8365e00e08453a59077a2d1dc9a6360841836fa477775af6b SHA512 ff5ce964ed5629af77cde6e77394e1efe3460560e757b09069e4b438d25b817954fd826975e9a82a253134296175688452a8f9e246c07272ff28ca5a0c576fac WHIRLPOOL 96dd4a99c42ec102335f64c1d13ea798aabacf860f2b5decef695f8dac657d59317723228a74f032cc2e2eb35634f5f1746242cbaf07e01e67c6d1c1645eaa21
+DIST vivaldi-1.0.233.3_p1-i386.deb 40393848 SHA256 b179fedfbb67238b7404453ee247081aab610555173c1f5292009921e8e661cf SHA512 b9856ee8ea362141026da4373464d08c7d57013810fbc411424b39e5d89ebfc7e45dce95f26dad745020ed1ed82aaf21faa2c6592fd7d4ddd035edf17de9aa53 WHIRLPOOL 764cea7497d855fd2eff5a6f0d04df4b12cf804156f04bb585376314fddf83b89be2b38003bd4ccaad252797fa9211024709f5836d2cf05f32d48349cd89e306
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
new file mode 100644
index 000000000000..ef0483f9ff68
--- /dev/null
+++ b/www-client/vivaldi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-client/vivaldi/vivaldi-1.0.231.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.231.3_p1.ebuild
new file mode 100644
index 000000000000..69c1403533e0
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.0.231.3_p1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh_CN zh_TW
+"
+inherit chromium multilib unpacker toolchain-funcs
+
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+VIVALDI_HOME="opt/${PN}-snapshot"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	sed -i \
+		-e 's|vivaldi-snapshot|vivaldi|g' \
+		usr/share/applications/${PN}-snapshot.desktop \
+		usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
+
+	mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
+
+	rm etc/cron.daily/${PN}-snapshot || die
+	rmdir etc/cron.daily/ || die
+	rmdir etc/ || die
+
+	rm usr/bin/${PN}-snapshot || die
+	rm _gpgbuilder || die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
diff --git a/www-client/vivaldi/vivaldi-1.0.233.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.233.3_p1.ebuild
new file mode 100644
index 000000000000..69c1403533e0
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.0.233.3_p1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh_CN zh_TW
+"
+inherit chromium multilib unpacker toolchain-funcs
+
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+VIVALDI_HOME="opt/${PN}-snapshot"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	sed -i \
+		-e 's|vivaldi-snapshot|vivaldi|g' \
+		usr/share/applications/${PN}-snapshot.desktop \
+		usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
+
+	mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
+
+	rm etc/cron.daily/${PN}-snapshot || die
+	rmdir etc/cron.daily/ || die
+	rmdir etc/ || die
+
+	rm usr/bin/${PN}-snapshot || die
+	rm _gpgbuilder || die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
new file mode 100644
index 000000000000..e4b958edf68c
--- /dev/null
+++ b/www-client/w3m/Manifest
@@ -0,0 +1 @@
+DIST w3m-0.5.3.tar.gz 2202328 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 SHA512 43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14 WHIRLPOOL 8f7dcaca362091227e29d7a6583ed796711904681a60e01d5838e45de003d60a9d88361d39b4d04056b67a14e51fe09e9d5b39fc8da18e83086484c974010cfe
diff --git a/www-client/w3m/files/w3m-0.5.2-ambwidth.patch b/www-client/w3m/files/w3m-0.5.2-ambwidth.patch
new file mode 100644
index 000000000000..4039982310e0
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.2-ambwidth.patch
@@ -0,0 +1,425 @@
+diff -Naur w3m-0.5.2.orig/libwc/Makefile.in w3m-0.5.2/libwc/Makefile.in
+--- w3m-0.5.2.orig/libwc/Makefile.in	2004-05-03 01:44:08.000000000 +0900
++++ w3m-0.5.2/libwc/Makefile.in	2007-09-27 17:34:58.000000000 +0900
+@@ -154,7 +154,7 @@
+ 	map/hkscs_ucs_p2.map map/gb12345_ucs.map map/johab_ucs.map \
+ 	map/sjis_ext_ucs.map map/gbk_ucs.map map/uhc_ucs.map map/ucs_wide.map \
+ 	map/ucs_combining.map map/ucs_precompose.map map/ucs_hangul.map \
+-	map/ucs_fullwidth.map
++	map/ucs_fullwidth.map map/ucs_ambwidth.map
+ uhc.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h uhc.h wtf.h ucs.h
+ utf7.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf7.h wtf.h
+ utf8.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h utf8.h wtf.h
+diff -Naur w3m-0.5.2.orig/libwc/map/ucs_ambwidth.map w3m-0.5.2/libwc/map/ucs_ambwidth.map
+--- w3m-0.5.2.orig/libwc/map/ucs_ambwidth.map	1970-01-01 09:00:00.000000000 +0900
++++ w3m-0.5.2/libwc/map/ucs_ambwidth.map	2007-09-27 17:34:58.000000000 +0900
+@@ -0,0 +1,167 @@
++/*
++ * Based on Markus Kuhn's wcwidth.c: 2003-05-20 (Unicode 4.0)
++ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
++ *
++ * { 0xF0000, 0xFFFFD } and { 0x100000, 0x10FFFD } is not contained in this
++ * map because wc_map_range_search takes wc_uint16 argument.
++ */
++
++#define N_ucs_ambwidth_map 154
++
++static wc_map ucs_ambwidth_map[ N_ucs_ambwidth_map ] = {
++  { 0x00A1, 0x00A1 },
++  { 0x00A4, 0x00A4 },
++  { 0x00A7, 0x00A8 },
++  { 0x00AA, 0x00AA },
++  { 0x00AE, 0x00AE },
++  { 0x00B0, 0x00B4 },
++  { 0x00B6, 0x00BA },
++  { 0x00BC, 0x00BF },
++  { 0x00C6, 0x00C6 },
++  { 0x00D0, 0x00D0 },
++  { 0x00D7, 0x00D8 },
++  { 0x00DE, 0x00E1 },
++  { 0x00E6, 0x00E6 },
++  { 0x00E8, 0x00EA },
++  { 0x00EC, 0x00ED },
++  { 0x00F0, 0x00F0 },
++  { 0x00F2, 0x00F3 },
++  { 0x00F7, 0x00FA },
++  { 0x00FC, 0x00FC },
++  { 0x00FE, 0x00FE },
++  { 0x0101, 0x0101 },
++  { 0x0111, 0x0111 },
++  { 0x0113, 0x0113 },
++  { 0x011B, 0x011B },
++  { 0x0126, 0x0127 },
++  { 0x012B, 0x012B },
++  { 0x0131, 0x0133 },
++  { 0x0138, 0x0138 },
++  { 0x013F, 0x0142 },
++  { 0x0144, 0x0144 },
++  { 0x0148, 0x014B },
++  { 0x014D, 0x014D },
++  { 0x0152, 0x0153 },
++  { 0x0166, 0x0167 },
++  { 0x016B, 0x016B },
++  { 0x01CE, 0x01CE },
++  { 0x01D0, 0x01D0 },
++  { 0x01D2, 0x01D2 },
++  { 0x01D4, 0x01D4 },
++  { 0x01D6, 0x01D6 },
++  { 0x01D8, 0x01D8 },
++  { 0x01DA, 0x01DA },
++  { 0x01DC, 0x01DC },
++  { 0x0251, 0x0251 },
++  { 0x0261, 0x0261 },
++  { 0x02C4, 0x02C4 },
++  { 0x02C7, 0x02C7 },
++  { 0x02C9, 0x02CB },
++  { 0x02CD, 0x02CD },
++  { 0x02D0, 0x02D0 },
++  { 0x02D8, 0x02DB },
++  { 0x02DD, 0x02DD },
++  { 0x02DF, 0x02DF },
++  { 0x0391, 0x03A1 },
++  { 0x03A3, 0x03A9 },
++  { 0x03B1, 0x03C1 },
++  { 0x03C3, 0x03C9 },
++  { 0x0401, 0x0401 },
++  { 0x0410, 0x044F },
++  { 0x0451, 0x0451 },
++  { 0x2010, 0x2010 },
++  { 0x2013, 0x2016 },
++  { 0x2018, 0x2019 },
++  { 0x201C, 0x201D },
++  { 0x2020, 0x2022 },
++  { 0x2024, 0x2027 },
++  { 0x2030, 0x2030 },
++  { 0x2032, 0x2033 },
++  { 0x2035, 0x2035 },
++  { 0x203B, 0x203B },
++  { 0x203E, 0x203E },
++  { 0x2074, 0x2074 },
++  { 0x207F, 0x207F },
++  { 0x2081, 0x2084 },
++  { 0x20AC, 0x20AC },
++  { 0x2103, 0x2103 },
++  { 0x2105, 0x2105 },
++  { 0x2109, 0x2109 },
++  { 0x2113, 0x2113 },
++  { 0x2116, 0x2116 },
++  { 0x2121, 0x2122 },
++  { 0x2126, 0x2126 },
++  { 0x212B, 0x212B },
++  { 0x2153, 0x2154 },
++  { 0x215B, 0x215E },
++  { 0x2160, 0x216B },
++  { 0x2170, 0x2179 },
++  { 0x2190, 0x2199 },
++  { 0x21B8, 0x21B9 },
++  { 0x21D2, 0x21D2 },
++  { 0x21D4, 0x21D4 },
++  { 0x21E7, 0x21E7 },
++  { 0x2200, 0x2200 },
++  { 0x2202, 0x2203 },
++  { 0x2207, 0x2208 },
++  { 0x220B, 0x220B },
++  { 0x220F, 0x220F },
++  { 0x2211, 0x2211 },
++  { 0x2215, 0x2215 },
++  { 0x221A, 0x221A },
++  { 0x221D, 0x2220 },
++  { 0x2223, 0x2223 },
++  { 0x2225, 0x2225 },
++  { 0x2227, 0x222C },
++  { 0x222E, 0x222E },
++  { 0x2234, 0x2237 },
++  { 0x223C, 0x223D },
++  { 0x2248, 0x2248 },
++  { 0x224C, 0x224C },
++  { 0x2252, 0x2252 },
++  { 0x2260, 0x2261 },
++  { 0x2264, 0x2267 },
++  { 0x226A, 0x226B },
++  { 0x226E, 0x226F },
++  { 0x2282, 0x2283 },
++  { 0x2286, 0x2287 },
++  { 0x2295, 0x2295 },
++  { 0x2299, 0x2299 },
++  { 0x22A5, 0x22A5 },
++  { 0x22BF, 0x22BF },
++  { 0x2312, 0x2312 },
++  { 0x2460, 0x24E9 },
++  { 0x24EB, 0x254B },
++  { 0x2550, 0x2573 },
++  { 0x2580, 0x258F },
++  { 0x2592, 0x2595 },
++  { 0x25A0, 0x25A1 },
++  { 0x25A3, 0x25A9 },
++  { 0x25B2, 0x25B3 },
++  { 0x25B6, 0x25B7 },
++  { 0x25BC, 0x25BD },
++  { 0x25C0, 0x25C1 },
++  { 0x25C6, 0x25C8 },
++  { 0x25CB, 0x25CB },
++  { 0x25CE, 0x25D1 },
++  { 0x25E2, 0x25E5 },
++  { 0x25EF, 0x25EF },
++  { 0x2605, 0x2606 },
++  { 0x2609, 0x2609 },
++  { 0x260E, 0x260F },
++  { 0x2614, 0x2615 },
++  { 0x261C, 0x261C },
++  { 0x261E, 0x261E },
++  { 0x2640, 0x2640 },
++  { 0x2642, 0x2642 },
++  { 0x2660, 0x2661 },
++  { 0x2663, 0x2665 },
++  { 0x2667, 0x266A },
++  { 0x266C, 0x266D },
++  { 0x266F, 0x266F },
++  { 0x273D, 0x273D },
++  { 0x2776, 0x277F },
++  { 0xE000, 0xF8FF },
++  { 0xFFFD, 0xFFFD },
++};
++
+diff -Naur w3m-0.5.2.orig/libwc/status.c w3m-0.5.2/libwc/status.c
+--- w3m-0.5.2.orig/libwc/status.c	2003-09-23 06:02:23.000000000 +0900
++++ w3m-0.5.2/libwc/status.c	2007-09-27 17:34:58.000000000 +0900
+@@ -25,6 +25,7 @@
+     WC_FALSE,		/* gb18030_as_ucs */
+     WC_FALSE,		/* no_replace */
+     WC_TRUE,		/* use_wide */
++    WC_FALSE,		/* east_asian_width */
+ };
+ 
+ static wc_status output_st;
+diff -Naur w3m-0.5.2.orig/libwc/ucs.c w3m-0.5.2/libwc/ucs.c
+--- w3m-0.5.2.orig/libwc/ucs.c	2007-05-23 20:34:09.000000000 +0900
++++ w3m-0.5.2/libwc/ucs.c	2007-09-27 17:34:58.000000000 +0900
+@@ -17,6 +17,7 @@
+ 
+ #include "ucs.map"
+ 
++#include "map/ucs_ambwidth.map"
+ #include "map/ucs_wide.map"
+ #include "map/ucs_combining.map"
+ #include "map/ucs_precompose.map"
+@@ -511,11 +512,26 @@
+     if (0x80 <= ucs && ucs <= 0x9F)
+ 	return WC_CCS_C1;
+     return ((ucs <= WC_C_UCS2_END) ? WC_CCS_UCS2 : WC_CCS_UCS4)
++	| ((WcOption.east_asian_width && wc_is_ucs_ambiguous_width(ucs))
++		    ? WC_CCS_A_WIDE : 0)
+ 	| (wc_is_ucs_wide(ucs) ? WC_CCS_A_WIDE : 0)
+ 	| (wc_is_ucs_combining(ucs) ? WC_CCS_A_COMB : 0);
+ }
+ 
+ wc_bool
++wc_is_ucs_ambiguous_width(wc_uint32 ucs)
++{
++    if (0xa1 <= ucs && ucs <= 0xfe && WcOption.use_jisx0213)
++	return 1;
++    else if (ucs <= WC_C_UCS2_END)
++	return (wc_map_range_search((wc_uint16)ucs,
++		    ucs_ambwidth_map, N_ucs_ambwidth_map) != NULL);
++    else
++	return ((0xF0000 <= ucs && ucs <= 0xFFFFD)
++		|| (0x100000 <= ucs && ucs <= 0x10FFFD));
++}
++
++wc_bool
+ wc_is_ucs_wide(wc_uint32 ucs)
+ {
+     if (ucs <= WC_C_UCS2_END)
+diff -Naur w3m-0.5.2.orig/libwc/ucs.h w3m-0.5.2/libwc/ucs.h
+--- w3m-0.5.2.orig/libwc/ucs.h	2007-05-23 20:34:09.000000000 +0900
++++ w3m-0.5.2/libwc/ucs.h	2007-09-27 17:34:58.000000000 +0900
+@@ -44,6 +44,7 @@
+ extern wc_wchar_t wc_ucs_to_iso2022(wc_uint32 ucs);
+ extern wc_wchar_t wc_ucs_to_iso2022w(wc_uint32 ucs);
+ extern wc_ccs     wc_ucs_to_ccs(wc_uint32 ucs);
++extern wc_bool    wc_is_ucs_ambiguous_width(wc_uint32 ucs);
+ extern wc_bool    wc_is_ucs_wide(wc_uint32 ucs);
+ extern wc_bool    wc_is_ucs_combining(wc_uint32 ucs);
+ extern wc_bool    wc_is_ucs_hangul(wc_uint32 ucs);
+diff -Naur w3m-0.5.2.orig/libwc/wc_types.h w3m-0.5.2/libwc/wc_types.h
+--- w3m-0.5.2.orig/libwc/wc_types.h	2004-04-05 01:47:20.000000000 +0900
++++ w3m-0.5.2/libwc/wc_types.h	2007-09-27 17:34:58.000000000 +0900
+@@ -91,6 +91,7 @@
+     wc_bool gb18030_as_ucs;	/* treat 4 bytes char. of GB18030 as Unicode */
+     wc_bool no_replace;		/* don't output replace character */
+     wc_bool use_wide;		/* use wide characters */
++    wc_bool east_asian_width;	/* East Asian Ambiguous characters are wide */
+ } wc_option;
+ 
+ typedef struct {
+diff -Naur w3m-0.5.2.orig/po/ja.po w3m-0.5.2/po/ja.po
+--- w3m-0.5.2.orig/po/ja.po	2007-05-31 21:17:05.000000000 +0900
++++ w3m-0.5.2/po/ja.po	2007-09-27 17:36:36.000000000 +0900
+@@ -614,6 +614,10 @@
+ msgstr "���ʸ����Ȥ�"
+ 
+ #: rc.c:219
++msgid "Use double width for some Unicode characters"
++msgstr "������Unicodeʸ�������Ѥˤ���"
++
++#: rc.c:219
+ msgid "Use Unicode language tags"
+ msgstr "Unicode �θ��쥿����Ȥ�"
+ 
+diff -Naur w3m-0.5.2.orig/po/w3m.pot w3m-0.5.2/po/w3m.pot
+--- w3m-0.5.2.orig/po/w3m.pot	2007-05-31 21:17:05.000000000 +0900
++++ w3m-0.5.2/po/w3m.pot	2007-09-27 17:37:12.000000000 +0900
+@@ -613,6 +613,10 @@
+ msgstr ""
+ 
+ #: rc.c:219
++msgid "Use double width for some Unicode characters"
++msgstr ""
++
++#: rc.c:219
+ msgid "Use Unicode language tags"
+ msgstr ""
+ 
+diff -Naur w3m-0.5.2.orig/proto.h w3m-0.5.2/proto.h
+--- w3m-0.5.2.orig/proto.h	2006-04-07 22:21:12.000000000 +0900
++++ w3m-0.5.2/proto.h	2007-09-27 17:34:58.000000000 +0900
+@@ -176,6 +176,9 @@
+ #define convertLine(uf,line,mode,charset,dcharset) convertLine0(uf,line,mode)
+ #endif
+ extern void push_symbol(Str str, char symbol, int width, int n);
++#ifdef USE_UNICODE
++extern void update_utf8_symbol(void);
++#endif
+ extern Buffer *loadFile(char *path);
+ extern Buffer *loadGeneralFile(char *path, ParsedURL *current, char *referer,
+ 			       int flag, FormList *request);
+diff -Naur w3m-0.5.2.orig/rc.c w3m-0.5.2/rc.c
+--- w3m-0.5.2.orig/rc.c	2007-05-24 00:06:06.000000000 +0900
++++ w3m-0.5.2/rc.c	2007-09-27 17:34:58.000000000 +0900
+@@ -216,6 +216,7 @@
+ #define CMT_EXT_HALFDUMP     N_("Output halfdump with display charset")
+ #define CMT_USE_WIDE         N_("Use multi column characters")
+ #define CMT_USE_COMBINING    N_("Use combining characters")
++#define CMT_EAST_ASIAN_WIDTH N_("Use double width for some Unicode characters")
+ #define CMT_USE_LANGUAGE_TAG N_("Use Unicode language tags")
+ #define CMT_UCS_CONV         N_("Charset conversion using Unicode map")
+ #define CMT_PRE_CONV         N_("Charset conversion when loading")
+@@ -640,6 +641,8 @@
+     {"use_combining", P_CHARINT, PI_ONOFF, (void *)&WcOption.use_combining,
+      CMT_USE_COMBINING, NULL},
+ #ifdef USE_UNICODE
++    {"east_asian_width", P_CHARINT, PI_ONOFF,
++     (void *)&WcOption.east_asian_width, CMT_EAST_ASIAN_WIDTH, NULL},
+     {"use_language_tag", P_CHARINT, PI_ONOFF,
+      (void *)&WcOption.use_language_tag, CMT_USE_LANGUAGE_TAG, NULL},
+     {"ucs_conv", P_CHARINT, PI_ONOFF, (void *)&WcOption.ucs_conv, CMT_UCS_CONV,
+@@ -1172,6 +1175,9 @@
+ 	AcceptEncoding = acceptableEncoding();
+     if (AcceptMedia == NULL || *AcceptMedia == '\0')
+ 	AcceptMedia = acceptableMimeTypes();
++#ifdef USE_UNICODE
++    update_utf8_symbol();
++#endif
+     if (fmInitialized) {
+ 	initKeymap(FALSE);
+ #ifdef USE_MOUSE
+diff -Naur w3m-0.5.2.orig/symbol.c w3m-0.5.2/symbol.c
+--- w3m-0.5.2.orig/symbol.c	2003-09-23 06:02:21.000000000 +0900
++++ w3m-0.5.2/symbol.c	2007-09-27 17:34:58.000000000 +0900
+@@ -18,7 +18,7 @@
+     wc_ces ces;
+     char width;
+     char **item;
+-    char encode;
++    char **conved_item;
+ } symbol_set;
+ 
+ typedef struct {
+@@ -27,17 +27,17 @@
+ } charset_symbol_set;
+ 
+ /* *INDENT-OFF* */
+-static symbol_set alt_symbol_set   = { WC_CES_US_ASCII, 1, alt_symbol,   1 };
+-static symbol_set alt2_symbol_set  = { WC_CES_US_ASCII, 2, alt2_symbol,  1 };
+-static symbol_set eucjp_symbol_set = { WC_CES_EUC_JP,   2, eucjp_symbol, 0 };
+-static symbol_set euckr_symbol_set = { WC_CES_EUC_KR,   2, euckr_symbol, 0 };
+-static symbol_set euccn_symbol_set = { WC_CES_EUC_CN,   2, euccn_symbol, 0 };
+-static symbol_set euctw_symbol_set = { WC_CES_EUC_TW,   2, euctw_symbol, 0 };
+-static symbol_set big5_symbol_set  = { WC_CES_BIG5,     2, big5_symbol,  0 };
++static symbol_set alt_symbol_set   = { WC_CES_US_ASCII, 1, alt_symbol,   alt_symbol };
++static symbol_set alt2_symbol_set  = { WC_CES_US_ASCII, 2, alt2_symbol,  alt2_symbol };
++static symbol_set eucjp_symbol_set = { WC_CES_EUC_JP,   2, eucjp_symbol, NULL };
++static symbol_set euckr_symbol_set = { WC_CES_EUC_KR,   2, euckr_symbol, NULL };
++static symbol_set euccn_symbol_set = { WC_CES_EUC_CN,   2, euccn_symbol, NULL };
++static symbol_set euctw_symbol_set = { WC_CES_EUC_TW,   2, euctw_symbol, NULL };
++static symbol_set big5_symbol_set  = { WC_CES_BIG5,     2, big5_symbol,  NULL };
+ #ifdef USE_UNICODE
+-static symbol_set utf8_symbol_set  = { WC_CES_UTF_8,    1, utf8_symbol,  0 };
++static symbol_set utf8_symbol_set  = { WC_CES_UTF_8,    1, utf8_symbol,  NULL };
+ #endif
+-static symbol_set cp850_symbol_set = { WC_CES_CP850,    1, cp850_symbol, 0 };
++static symbol_set cp850_symbol_set = { WC_CES_CP850,    1, cp850_symbol, NULL };
+ 
+ static charset_symbol_set charset_symbol_list[] = {
+     { WC_CES_EUC_JP,        &eucjp_symbol_set },
+@@ -73,11 +73,12 @@
+ {
+     int i;
+ 
++    for (i = 0; s->item[i]; i++) ;
++    s->conved_item = New_N(char *, i);
+     for (i = 0; s->item[i]; i++) {
+ 	if (*(s->item[i]))
+-	    s->item[i] = wc_conv(s->item[i], s->ces, InnerCharset)->ptr;
++	    s->conved_item[i] = wc_conv(s->item[i], s->ces, InnerCharset)->ptr;
+     }
+-    s->encode = 1;
+ }
+ 
+ char **
+@@ -89,7 +90,7 @@
+     if (charset == save_charset && save_symbol != NULL &&
+ 	*width == save_symbol->width) {
+ 	*width = save_symbol->width;
+-	return save_symbol->item;
++	return save_symbol->conved_item;
+     }
+     save_charset = charset;
+     for (p = charset_symbol_list; p->charset; p++) {
+@@ -102,12 +103,12 @@
+     if (s == NULL)
+ 	s = (*width == 2) ? &alt2_symbol_set : &alt_symbol_set;
+     if (s != save_symbol) {
+-	if (!s->encode)
++	if (!s->conved_item)
+ 	    encode_symbol(s);
+ 	save_symbol = s;
+     }
+     *width = s->width;
+-    return s->item;
++    return s->conved_item;
+ }
+ 
+ char **
+@@ -137,6 +138,21 @@
+     return symbol_buf;
+ }
+ 
++#ifdef USE_UNICODE
++void
++update_utf8_symbol(void)
++{
++    charset_symbol_set *p;
++    utf8_symbol_set.width = WcOption.east_asian_width ? 2 : 1;
++    for (p = charset_symbol_list; p->charset; p++) {
++	if (p->charset == WC_CES_UTF_8) {
++	    encode_symbol(p->symbol);
++	    break;
++	}
++    }
++}
++#endif
++
+ #else
+ 
+ char **
diff --git a/www-client/w3m/files/w3m-0.5.2-form.patch b/www-client/w3m/files/w3m-0.5.2-form.patch
new file mode 100644
index 000000000000..6616319c7b28
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.2-form.patch
@@ -0,0 +1,11 @@
+diff -Naur w3m-0.5.2.orig/form.c w3m-0.5.2/form.c
+--- w3m-0.5.2.orig/form.c	2004-02-06 02:23:07.000000000 +0900
++++ w3m-0.5.2/form.c	2008-05-16 08:34:48.000000000 +0900
+@@ -403,6 +403,7 @@
+     line->lineBuf = buf;
+     line->propBuf = prop;
+     line->len = len;
++    line->size = len;
+ 
+     return pos;
+ }
diff --git a/www-client/w3m/files/w3m-0.5.2-gc72.patch b/www-client/w3m/files/w3m-0.5.2-gc72.patch
new file mode 100644
index 000000000000..f2df44f06b30
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.2-gc72.patch
@@ -0,0 +1,27 @@
+diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
+--- w3m-0.5.2.orig/main.c	2007-05-31 10:19:50.000000000 +0900
++++ w3m-0.5.2/main.c	2009-11-09 08:20:02.184953443 +0900
+@@ -312,7 +312,11 @@
+ 	    lock = 0;
+ 	}
+     }
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++    else if (orig_GC_warn_proc = GC_get_warn_proc())
++#else
+     else if (orig_GC_warn_proc)
++#endif
+ 	orig_GC_warn_proc(msg, arg);
+     else
+ 	fprintf(stderr, msg, (unsigned long)arg);
+@@ -842,7 +846,11 @@
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++    GC_set_warn_proc(wrap_GC_warn_proc);
++#else
+     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++#endif
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */
diff --git a/www-client/w3m/files/w3m-0.5.3-button.patch b/www-client/w3m/files/w3m-0.5.3-button.patch
new file mode 100644
index 000000000000..a645e2563776
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-button.patch
@@ -0,0 +1,439 @@
+Description: Support the button element as defined in HTML 4.01
+Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/201009.month/4411.html
+Bug-Debian: http://bugs.debian.org/136810
+
+Index: file.c
+===================================================================
+RCS file: /cvsroot/w3m/w3m/file.c,v
+retrieving revision 1.264
+diff -u -r1.264 file.c
+--- w3m.orig/file.c	3 Aug 2010 10:02:16 -0000	1.264
++++ w3m/file.c	17 Sep 2010 12:18:55 -0000
+@@ -2467,6 +2467,7 @@
+     bcopy((void *)&obuf->anchor, (void *)&obuf->bp.anchor,
+ 	  sizeof(obuf->anchor));
+     obuf->bp.img_alt = obuf->img_alt;
++    obuf->bp.input_alt = obuf->input_alt;
+     obuf->bp.in_bold = obuf->in_bold;
+     obuf->bp.in_italic = obuf->in_italic;
+     obuf->bp.in_under = obuf->in_under;
+@@ -2484,6 +2485,7 @@
+     bcopy((void *)&obuf->bp.anchor, (void *)&obuf->anchor,
+ 	  sizeof(obuf->anchor));
+     obuf->img_alt = obuf->bp.img_alt;
++    obuf->input_alt = obuf->bp.input_alt;
+     obuf->in_bold = obuf->bp.in_bold;
+     obuf->in_italic = obuf->bp.in_italic;
+     obuf->in_under = obuf->bp.in_under;
+@@ -2727,7 +2729,7 @@
+     Str line = obuf->line, pass = NULL;
+     char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL,
+ 	*hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL,
+-	*hidden_ins = NULL, *hidden = NULL;
++	*hidden_ins = NULL, *hidden_input, *hidden = NULL;
+ 
+ #ifdef DEBUG
+     if (w3m_debug) {
+@@ -2759,6 +2761,12 @@
+ 		hidden = hidden_img;
+ 	}
+     }
++    if (obuf->input_alt.in) {
++	if ((hidden_input = has_hidden_link(obuf, HTML_INPUT_ALT)) != NULL) {
++	    if (!hidden || hidden_input < hidden)
++		hidden = hidden_input;
++	}
++    }
+     if (obuf->in_bold) {
+ 	if ((hidden_bold = has_hidden_link(obuf, HTML_B)) != NULL) {
+ 	    if (!hidden || hidden_bold < hidden)
+@@ -2810,6 +2818,8 @@
+ 	Strcat_charp(line, "</a>");
+     if (obuf->img_alt && !hidden_img)
+ 	Strcat_charp(line, "</img_alt>");
++    if (obuf->input_alt.in && !hidden_input)
++	Strcat_charp(line, "</input_alt>");
+     if (obuf->in_bold && !hidden_bold)
+ 	Strcat_charp(line, "</b>");
+     if (obuf->in_italic && !hidden_italic)
+@@ -3020,6 +3030,18 @@
+ 	Strcat_charp(tmp, "\">");
+ 	push_tag(obuf, tmp->ptr, HTML_IMG_ALT);
+     }
++    if (!hidden_input && obuf->input_alt.in) {
++	Str tmp;
++	if (obuf->input_alt.hseq > 0)
++	    obuf->input_alt.hseq = - obuf->input_alt.hseq;
++	tmp = Sprintf("<INPUT_ALT hseq=\"%d\" fid=\"%d\" name=\"%s\" type=\"%s\" value=\"%s\">",
++		     obuf->input_alt.hseq,
++		     obuf->input_alt.fid,
++		     obuf->input_alt.name->ptr,
++		     obuf->input_alt.type->ptr,
++		     obuf->input_alt.value->ptr);
++	push_tag(obuf, tmp->ptr, HTML_INPUT_ALT);
++    }
+     if (!hidden_bold && obuf->in_bold)
+ 	push_tag(obuf, "<B>", HTML_B);
+     if (!hidden_italic && obuf->in_italic)
+@@ -3730,6 +3752,63 @@
+ }
+ 
+ Str
++process_button(struct parsed_tag *tag)
++{
++    Str tmp = NULL;
++    char *p, *q, *r, *qq = NULL;
++    int qlen, v;
++
++    if (cur_form_id < 0) {
++       char *s = "<form_int method=internal action=none>";
++       tmp = process_form(parse_tag(&s, TRUE));
++    }
++    if (tmp == NULL)
++       tmp = Strnew();
++
++    p = "submit";
++    parsedtag_get_value(tag, ATTR_TYPE, &p);
++    q = NULL;
++    parsedtag_get_value(tag, ATTR_VALUE, &q);
++    r = "";
++    parsedtag_get_value(tag, ATTR_NAME, &r);
++
++    v = formtype(p);
++    if (v == FORM_UNKNOWN)
++       return NULL;
++
++    if (!q) {
++       switch (v) {
++       case FORM_INPUT_SUBMIT:
++       case FORM_INPUT_BUTTON:
++           q = "SUBMIT";
++           break;
++       case FORM_INPUT_RESET:
++           q = "RESET";
++           break;
++       }
++    }
++    if (q) {
++       qq = html_quote(q);
++       qlen = strlen(q);
++    }
++
++    //    Strcat_charp(tmp, "<pre_int>");
++    Strcat(tmp, Sprintf("<input_alt hseq=\"%d\" fid=\"%d\" type=%s "
++                       "name=\"%s\" value=\"%s\">",
++                       cur_hseq++, cur_form_id, p, html_quote(r), qq));
++    return tmp;
++}
++
++Str
++process_n_button(void)
++{
++    Str tmp = Strnew();
++    Strcat_charp(tmp, "</input_alt>");
++    //    Strcat_charp(tmp, "</pre_int>");
++    return tmp;
++}
++
++Str
+ process_select(struct parsed_tag *tag)
+ {
+     Str tmp = NULL;
+@@ -4859,7 +4938,35 @@
+ 	    if (i > obuf->bottom_margin)
+ 		obuf->bottom_margin = i;
+ 	}
++	if (parsedtag_get_value(tag, ATTR_HSEQ, &hseq)) {
++	    obuf->input_alt.hseq = hseq;
++	}
++	if (parsedtag_get_value(tag, ATTR_FID, &i)) {
++	    obuf->input_alt.fid = i;
++	}
++	if (parsedtag_get_value(tag, ATTR_TYPE, &p)) {
++	    obuf->input_alt.type = Strnew_charp(p);
++	}
++	if (parsedtag_get_value(tag, ATTR_VALUE, &p)) {
++	    obuf->input_alt.value = Strnew_charp(p);
++	}
++	if (parsedtag_get_value(tag, ATTR_NAME, &p)) {
++	    obuf->input_alt.name = Strnew_charp(p);
++	}
++	obuf->input_alt.in = 1;
+ 	return 0;
++    case HTML_N_INPUT_ALT:
++	if (obuf->input_alt.in) {
++	    if (!close_effect0(obuf, HTML_INPUT_ALT))
++		push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
++	    obuf->input_alt.hseq = 0;
++	    obuf->input_alt.fid = -1;
++	    obuf->input_alt.in = 0;
++	    obuf->input_alt.type = NULL;
++	    obuf->input_alt.name = NULL;
++	    obuf->input_alt.value = NULL;
++	}
++	return 1;
+     case HTML_TABLE:
+ 	close_anchor(h_env, obuf);
+ 	obuf->table_level++;
+@@ -4968,6 +5075,16 @@
+     case HTML_INPUT:
+ 	close_anchor(h_env, obuf);
+ 	tmp = process_input(tag);
++       if (tmp)
++           HTMLlineproc1(tmp->ptr, h_env);
++       return 1;
++    case HTML_BUTTON:
++       tmp = process_button(tag);
++       if (tmp)
++           HTMLlineproc1(tmp->ptr, h_env);
++       return 1;
++    case HTML_N_BUTTON:
++       tmp = process_n_button();
+ 	if (tmp)
+ 	    HTMLlineproc1(tmp->ptr, h_env);
+ 	return 1;
+@@ -5680,6 +5797,21 @@
+ 				putHmarker(buf->hmarklist, currentLn(buf),
+ 					   hpos, hseq - 1);
+ 			}
++			else if (hseq < 0) {
++			    int h = -hseq - 1;
++			    int hpos = pos;
++			    if (*str == '[')
++				hpos++;
++			    if (buf->hmarklist &&
++				h < buf->hmarklist->nmark &&
++				buf->hmarklist->marks[h].invalid) {
++				buf->hmarklist->marks[h].pos = hpos;
++				buf->hmarklist->marks[h].line = currentLn(buf);
++				buf->hmarklist->marks[h].invalid = 0;
++				hseq = -hseq;
++			    }
++			}
++
+ 			if (!form->target)
+ 			    form->target = buf->baseTarget;
+ 			if (a_textarea &&
+@@ -6747,6 +6879,12 @@
+     obuf->nobr_level = 0;
+     bzero((void *)&obuf->anchor, sizeof(obuf->anchor));
+     obuf->img_alt = 0;
++    obuf->input_alt.hseq = 0;
++    obuf->input_alt.fid = -1;
++    obuf->input_alt.in = 0;
++    obuf->input_alt.type = NULL;
++    obuf->input_alt.name = NULL;
++    obuf->input_alt.value = NULL;
+     obuf->in_bold = 0;
+     obuf->in_italic = 0;
+     obuf->in_under = 0;
+@@ -6782,6 +6920,15 @@
+ 	push_tag(obuf, "</img_alt>", HTML_N_IMG_ALT);
+ 	obuf->img_alt = NULL;
+     }
++    if (obuf->input_alt.in) {
++	push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
++	obuf->input_alt.hseq = 0;
++	obuf->input_alt.fid = -1;
++	obuf->input_alt.in = 0;
++	obuf->input_alt.type = NULL;
++	obuf->input_alt.name = NULL;
++	obuf->input_alt.value = NULL;
++    }
+     if (obuf->in_bold) {
+ 	push_tag(obuf, "</b>", HTML_N_B);
+ 	obuf->in_bold = 0;
+Index: fm.h
+===================================================================
+RCS file: /cvsroot/w3m/w3m/fm.h,v
+retrieving revision 1.149
+diff -u -r1.149 fm.h
+--- w3m.orig/fm.h	20 Aug 2010 09:47:09 -0000	1.149
++++ w3m/fm.h	17 Sep 2010 12:18:55 -0000
+@@ -562,6 +562,13 @@
+ #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0)
+ #define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1)
+ 
++struct input_alt_attr {
++  int hseq;
++  int fid;
++  int in;
++  Str type, name, value;
++};
++
+ typedef struct {
+     int pos;
+     int len;
+@@ -569,6 +576,7 @@
+     long flag;
+     Anchor anchor;
+     Str img_alt;
++    struct input_alt_attr input_alt;
+     char fontstat[FONTSTAT_SIZE];
+     short nobr_level;
+     Lineprop prev_ctype;
+@@ -591,6 +599,7 @@
+     short nobr_level;
+     Anchor anchor;
+     Str img_alt;
++    struct input_alt_attr input_alt;
+     char fontstat[FONTSTAT_SIZE];
+     char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE];
+     int fontstat_sp;
+Index: html.c
+===================================================================
+RCS file: /cvsroot/w3m/w3m/html.c,v
+retrieving revision 1.32
+diff -u -r1.32 html.c
+--- w3m.orig/html.c	14 Aug 2010 01:29:40 -0000	1.32
++++ w3m/html.c	17 Sep 2010 12:18:55 -0000
+@@ -56,6 +56,9 @@
+     ATTR_CORE
+ };
+ #define MAXA_INPUT      MAXA_CORE + 12
++unsigned char ALST_BUTTON[] =
++    { ATTR_TYPE, ATTR_VALUE, ATTR_NAME, ATTR_CORE };
++#define MAXA_BUTTON	MAXA_CORE + 3
+ unsigned char ALST_TEXTAREA[] =
+     { ATTR_COLS, ATTR_ROWS, ATTR_NAME, ATTR_READONLY, ATTR_CORE };
+ #define MAXA_TEXTAREA   MAXA_CORE + 4
+@@ -247,24 +250,24 @@
+     {"/bdo", NULL, 0, TFLG_END},	/* 121 HTML_N_BDO */
+     {"big", ALST_NOP, MAXA_NOP, 0},		/* 122 HTML_BIG */
+     {"/big", NULL, 0, TFLG_END},	/* 123 HTML_N_BIG */
+-    {"button", ALST_NOP, MAXA_NOP, 0},		/* 124 HTML_BUTTON */
+-    {"fieldset", ALST_NOP, MAXA_NOP, 0},	        /* 125 HTML_FIELDSET */
+-    {"/fieldset", NULL, 0, TFLG_END},	/* 126 HTML_N_FIELDSET */
+-    {"iframe", ALST_NOP, MAXA_NOP, 0},		/* 127 HTML_IFRAME */
+-    {"label", ALST_NOP, MAXA_NOP, 0}, 		/* 128 HTML_LABEL */
+-    {"/label", NULL, 0, TFLG_END},	/* 129 HTML_N_LABEL */
+-    {"legend", ALST_NOP, MAXA_NOP, 0},		/* 130 HTML_LEGEND */
+-    {"/legend", NULL, 0, TFLG_END},	/* 131 HTML_N_LEGEND */
+-    {"noscript", ALST_NOP, MAXA_NOP, 0},	        /* 132 HTML_NOSCRIPT */
+-    {"/noscript", NULL, 0, TFLG_END},	/* 133 HTML_N_NOSCRIPT */
+-    {"object", ALST_NOP, MAXA_NOP, 0},		/* 134 HTML_OBJECT */
+-    {"optgroup", ALST_NOP, MAXA_NOP, 0},	        /* 135 HTML_OPTGROUP */
+-    {"/optgroup", NULL, 0, TFLG_END},	/* 136 HTML_N_OPTGROUP */
+-    {"param", ALST_NOP, MAXA_NOP, 0},		/* 137 HTML_PARAM */
+-    {"small", ALST_NOP, MAXA_NOP, 0}, 		/* 138 HTML_SMALL */
+-    {"/small", NULL, 0, TFLG_END},	/* 139 HTML_N_SMALL */
++    {"button", ALST_BUTTON, MAXA_BUTTON, 0},	/* 124 HTML_BUTTON */
++    {"/button", NULL, 0, TFLG_END},	/* 125 HTML_N_BUTTON */
++    {"fieldset", ALST_NOP, MAXA_NOP, 0},	/* 126 HTML_FIELDSET */
++    {"/fieldset", NULL, 0, TFLG_END},	/* 127 HTML_N_FIELDSET */
++    {"iframe", ALST_NOP, MAXA_NOP, 0},		/* 128 HTML_IFRAME */
++    {"label", ALST_NOP, MAXA_NOP, 0}, 		/* 129 HTML_LABEL */
++    {"/label", NULL, 0, TFLG_END},	/* 130 HTML_N_LABEL */
++    {"legend", ALST_NOP, MAXA_NOP, 0},		/* 131 HTML_LEGEND */
++    {"/legend", NULL, 0, TFLG_END},	/* 132 HTML_N_LEGEND */
++    {"noscript", ALST_NOP, MAXA_NOP, 0},	        /* 133 HTML_NOSCRIPT */
++    {"/noscript", NULL, 0, TFLG_END},	/* 134 HTML_N_NOSCRIPT */
++    {"object", ALST_NOP, MAXA_NOP, 0},		/* 135 HTML_OBJECT */
++    {"optgroup", ALST_NOP, MAXA_NOP, 0},	        /* 136 HTML_OPTGROUP */
++    {"/optgroup", NULL, 0, TFLG_END},	/* 137 HTML_N_OPTGROUP */
++    {"param", ALST_NOP, MAXA_NOP, 0},		/* 138 HTML_PARAM */
++    {"small", ALST_NOP, MAXA_NOP, 0}, 		/* 139 HTML_SMALL */
++    {"/small", NULL, 0, TFLG_END},	/* 140 HTML_N_SMALL */
+ 
+-    {NULL, NULL, 0, 0},		/* 140 Undefined */
+     {NULL, NULL, 0, 0},		/* 141 Undefined */
+     {NULL, NULL, 0, 0},		/* 142 Undefined */
+     {NULL, NULL, 0, 0},		/* 143 Undefined */
+Index: html.h
+===================================================================
+RCS file: /cvsroot/w3m/w3m/html.h,v
+retrieving revision 1.31
+diff -u -r1.31 html.h
+--- w3m.orig/html.h	14 Aug 2010 01:29:40 -0000	1.31
++++ w3m/html.h	17 Sep 2010 12:18:55 -0000
+@@ -214,21 +214,22 @@
+ #define HTML_BIG        122
+ #define HTML_N_BIG      123
+ #define HTML_BUTTON     124
+-#define HTML_FIELDSET   125
+-#define HTML_N_FIELDSET 126
+-#define HTML_IFRAME     127
+-#define HTML_LABEL      128
+-#define HTML_N_LABEL    129
+-#define HTML_LEGEND     130
+-#define HTML_N_LEGEND   131
+-#define HTML_NOSCRIPT   132
+-#define HTML_N_NOSCRIPT 133
+-#define HTML_OBJECT     134
+-#define HTML_OPTGROUP   135
+-#define HTML_N_OPTGROUP 136
+-#define HTML_PARAM      137
+-#define HTML_SMALL      138
+-#define HTML_N_SMALL    139
++#define HTML_N_BUTTON   125
++#define HTML_FIELDSET   126
++#define HTML_N_FIELDSET 127
++#define HTML_IFRAME     128
++#define HTML_LABEL      129
++#define HTML_N_LABEL    130
++#define HTML_LEGEND     131
++#define HTML_N_LEGEND   132
++#define HTML_NOSCRIPT   133
++#define HTML_N_NOSCRIPT 134
++#define HTML_OBJECT     135
++#define HTML_OPTGROUP   136
++#define HTML_N_OPTGROUP 137
++#define HTML_PARAM      138
++#define HTML_SMALL      139
++#define HTML_N_SMALL    140
+ 
+    /* pseudo tag */
+ #define HTML_SELECT_INT     160
+Index: proto.h
+===================================================================
+RCS file: /cvsroot/w3m/w3m/proto.h,v
+retrieving revision 1.104
+diff -u -r1.104 proto.h
+--- w3m.orig/proto.h	25 Jul 2010 09:55:05 -0000	1.104
++++ w3m/proto.h	17 Sep 2010 12:18:55 -0000
+@@ -207,6 +207,8 @@
+ extern Str process_img(struct parsed_tag *tag, int width);
+ extern Str process_anchor(struct parsed_tag *tag, char *tagbuf);
+ extern Str process_input(struct parsed_tag *tag);
++extern Str process_button(struct parsed_tag *tag);
++extern Str process_n_button(void);
+ extern Str process_select(struct parsed_tag *tag);
+ extern Str process_n_select(void);
+ extern void feed_select(char *str);
+Index: table.c
+===================================================================
+RCS file: /cvsroot/w3m/w3m/table.c,v
+retrieving revision 1.58
+diff -u -r1.58 table.c
+--- w3m.orig/table.c	9 Aug 2010 11:59:19 -0000	1.58
++++ w3m/table.c	17 Sep 2010 12:18:55 -0000
+@@ -2878,6 +2878,14 @@
+ 	tmp = process_input(tag);
+ 	feed_table1(tbl, tmp, mode, width);
+ 	break;
++    case HTML_BUTTON:
++       tmp = process_button(tag);
++       feed_table1(tbl, tmp, mode, width);
++       break;
++    case HTML_N_BUTTON:
++       tmp = process_n_button();
++       feed_table1(tbl, tmp, mode, width);
++       break;
+     case HTML_SELECT:
+ 	tmp = process_select(tag);
+ 	if (tmp)
+Index: tagtable.tab
+===================================================================
+RCS file: /cvsroot/w3m/w3m/tagtable.tab,v
+retrieving revision 1.14
+diff -u -r1.14 tagtable.tab
+--- w3m.orig/tagtable.tab	14 Aug 2010 01:29:40 -0000	1.14
++++ w3m/tagtable.tab	17 Sep 2010 12:18:55 -0000
+@@ -176,6 +176,7 @@
+ big		HTML_BIG
+ /big		HTML_N_BIG
+ button		HTML_BUTTON
++/button		HTML_N_BUTTON
+ fieldset	HTML_FIELDSET
+ /fieldset	HTML_N_FIELDSET
+ iframe		HTML_IFRAME
diff --git a/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch b/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch
new file mode 100644
index 000000000000..acb10001d314
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch
@@ -0,0 +1,46 @@
+--- w3mimg/x11/x11_w3mimg.c	2004-11-08 18:14:06.000000000 +0100
++++ w3mimg/x11/x11_w3mimg.c	2012-05-19 06:31:08.908783927 +0200
+@@ -14,7 +14,7 @@
+ #elif defined(USE_GDKPIXBUF)
+ #if defined(USE_GTK2)
+ #include <glib-object.h>
+-#include <gdk/gdk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #else
+ #include <gdk-pixbuf/gdk-pixbuf-xlib.h>
+--- w3mimg/fb/fb_gdkpixbuf.c	2004-11-08 18:14:06.000000000 +0100
++++ w3mimg/fb/fb_gdkpixbuf.c	2012-05-20 05:06:07.744816661 +0200
+@@ -6,7 +6,7 @@
+ #include "config.h"
+ #if defined(USE_GTK2)
+ #include <glib-object.h>
+-#include <gdk/gdk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ #endif
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include "fb.h"
+--- acinclude.m4	2011-01-04 10:22:18.000000000 +0100
++++ acinclude.m4	2012-05-20 05:15:36.158981506 +0200
+@@ -705,8 +705,8 @@ AC_DEFUN([AC_W3M_IMAGE],
+      IMGTARGETS="x11"    
+      AC_DEFINE(USE_GDKPIXBUF)
+      AC_DEFINE(USE_GTK2)
+-     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
+-     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
++     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
++     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
+    elif test x"$have_gdkpixbuf" = xyes; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
+@@ -740,8 +740,8 @@ AC_DEFUN([AC_W3M_IMAGE],
+      IMGTARGETS="${IMGTARGETS} fb"
+      AC_DEFINE(USE_GDKPIXBUF)
+      AC_DEFINE(USE_GTK2)
+-     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`"
+-     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`"
++     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`"
++     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`"
+    elif test x"$have_gdkpixbuf" = xyes; then
+      AC_DEFINE(USE_W3MIMG_FB)
+      IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
diff --git a/www-client/w3m/files/w3m-0.5.3-gettext.patch b/www-client/w3m/files/w3m-0.5.3-gettext.patch
new file mode 100644
index 000000000000..3f330ccd4dce
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-gettext.patch
@@ -0,0 +1,12 @@
+diff -ur w3m-0.5.3.orig/po/ja.po w3m-0.5.3/po/ja.po
+--- w3m-0.5.3.orig/po/ja.po	2014-06-08 11:17:13.791260502 +0200
++++ w3m-0.5.3/po/ja.po	2014-06-08 11:24:27.887365926 +0200
+@@ -12,7 +12,7 @@
+ "PO-Revision-Date: 2010-08-20 18:45+0900\n"
+ "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n"
+ "Language-Team: Japanese\n"
+-"Language: \n"
++"Language: ja\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/www-client/w3m/files/w3m-0.5.3-glibc214.patch b/www-client/w3m/files/w3m-0.5.3-glibc214.patch
new file mode 100644
index 000000000000..2b18a8d112db
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-glibc214.patch
@@ -0,0 +1,58 @@
+--- istream.c.~1.27.~	2011-01-04 18:22:22.000000000 +0900
++++ istream.c	2011-06-24 08:15:23.522990618 +0900
+@@ -22,8 +22,8 @@
+ static void basic_close(int *handle);
+ static int basic_read(int *handle, char *buf, int len);
+ 
+-static void file_close(struct file_handle *handle);
+-static int file_read(struct file_handle *handle, char *buf, int len);
++static void file_close(struct afile_handle *handle);
++static int file_read(struct afile_handle *handle, char *buf, int len);
+ 
+ static int str_read(Str handle, char *buf, int len);
+ 
+@@ -114,7 +114,7 @@
+     stream = New(union input_stream);
+     init_base_stream(&stream->base, STREAM_BUF_SIZE);
+     stream->file.type = IST_FILE;
+-    stream->file.handle = New(struct file_handle);
++    stream->file.handle = New(struct afile_handle);
+     stream->file.handle->f = f;
+     if (closep)
+ 	stream->file.handle->close = closep;
+@@ -658,13 +658,13 @@
+ }
+ 
+ static void
+-file_close(struct file_handle *handle)
++file_close(struct afile_handle *handle)
+ {
+     handle->close(handle->f);
+ }
+ 
+ static int
+-file_read(struct file_handle *handle, char *buf, int len)
++file_read(struct afile_handle *handle, char *buf, int len)
+ {
+     return fread(buf, 1, len, handle->f);
+ }
+--- istream.h.~1.12.~	2003-10-21 01:41:56.000000000 +0900
++++ istream.h	2011-06-24 08:15:54.392991144 +0900
+@@ -20,7 +20,7 @@
+ 
+ typedef struct stream_buffer *StreamBuffer;
+ 
+-struct file_handle {
++struct afile_handle {
+     FILE *f;
+     void (*close) ();
+ };
+@@ -53,7 +53,7 @@
+ 
+ struct file_stream {
+     struct stream_buffer stream;
+-    struct file_handle *handle;
++    struct afile_handle *handle;
+     char type;
+     char iseos;
+     int (*read) ();
diff --git a/www-client/w3m/files/w3m-0.5.3-input-type-default.patch b/www-client/w3m/files/w3m-0.5.3-input-type-default.patch
new file mode 100644
index 000000000000..016d2a575ec2
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-input-type-default.patch
@@ -0,0 +1,13 @@
+Index: w3m-git/form.c
+===================================================================
+--- w3m-git.orig/form.c	2011-02-28 15:03:36.000000000 +0100
++++ w3m-git/form.c	2011-02-28 15:32:33.000000000 +0100
+@@ -196,7 +196,7 @@
+ 	if (!strcasecmp(typestr, _formtypetbl[i]))
+ 	    return i;
+     }
+-    return FORM_UNKNOWN;
++    return FORM_INPUT_TEXT;
+ }
+ 
+ void
diff --git a/www-client/w3m/files/w3m-0.5.3-parallel-make.patch b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
new file mode 100644
index 000000000000..427e3be20d55
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
@@ -0,0 +1,22 @@
+--- a/w3mimg/Makefile.in
++++ b/w3mimg/Makefile.in
+@@ -22,6 +22,8 @@
+ 	$(AR) rv $@ $(IMGOBJS)
+ 	$(RANLIB) $@
+ 
++$(IMGOBJS): @IMGTARGETS@
++
+ w3mimg.o: w3mimg.c
+ 	$(CC) $(CFLAGS) -c $<
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -250,7 +250,7 @@
+ 	 (cd $$subdir && $(MAKE) install); \
+ 	done
+ 
+-all-scripts:
++all-scripts: funcname.tab
+ 	for dir in $(SCRIPTSUBDIRS);	\
+ 	do	\
+ 		(cd $$dir && $(MAKE) $(MAKE_ARGS)); \
diff --git a/www-client/w3m/files/w3m-0.5.3-tinfo.patch b/www-client/w3m/files/w3m-0.5.3-tinfo.patch
new file mode 100644
index 000000000000..512f2cb10094
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -400,10 +400,10 @@
+ AC_ARG_WITH(termlib,
+  [  --with-termlib[=LIBS]		terminal library
+ 				LIBS is space separated list of:
+-				  terminfo mytinfo termcap ncurses curses],,
++				  terminfo mytinfo termcap tinfo ncurses curses],,
+  [with_termlib="yes"])
+  AC_MSG_RESULT($with_termlib)
+- test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
++ test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap tinfo ncurses curses"
+  for lib in $with_termlib; do
+    AC_CHECK_LIB($lib, tgetent, [W3M_LIBS="$W3M_LIBS -l$lib"; break])
+  done
diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
new file mode 100644
index 000000000000..1b034b46cb13
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
@@ -0,0 +1,15 @@
+Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
+
+--- w3m-0.5.3.orig/Makefile.in	2011-01-04 18:22:18.000000000 +0900
++++ w3m-0.5.3/Makefile.in	2011-02-06 12:05:40.000000000 +0900
+@@ -199,7 +199,7 @@
+ 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
+ 
+ $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
+-	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
++	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
+ 
+ w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
+ 	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff --git a/www-client/w3m/files/w3m-0.5.3-url-schema.patch b/www-client/w3m/files/w3m-0.5.3-url-schema.patch
new file mode 100644
index 000000000000..759e7c226c15
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-url-schema.patch
@@ -0,0 +1,91 @@
+X-Git-Url: http://anonscm.debian.org/gitweb/?p=collab-maint%2Fw3m.git;a=blobdiff_plain;f=url.c;h=6dbd5d3a43c51d96adca5ce5076b72a58c9d65fe;hp=ed6062ef3cb9e60a7e712ec054bcd46b49fd504d;hb=c155b93830b353a68468fb063df67987ed284142;hpb=dbd52ac2ca59d404bdcc29c5c90bda822f2c9334
+
+diff --git a/url.c b/url.c
+index ed6062e..6dbd5d3 100644
+--- a/url.c
++++ b/url.c
+@@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = {
+ };
+ 
+ static void add_index_file(ParsedURL *pu, URLFile *uf);
++static char * schemeNumToName(int scheme);
+ 
+ /* #define HTTP_DEFAULT_FILE    "/index.html" */
+ 
+@@ -1280,6 +1281,18 @@ getURLScheme(char **url)
+ }
+ 
+ static char *
++schemeNumToName(int scheme)
++{
++    int i;
++
++    for (i = 0; schemetable[i].cmdname != NULL; i++) {
++	if (schemetable[i].cmd == scheme)
++	    return schemetable[i].cmdname;
++    }
++    return NULL;
++}
++
++static char *
+ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
+ {
+     Str s = Strnew();
+@@ -1603,7 +1616,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
+ 	    pu->host != NULL && !check_no_proxy(pu->host)) {
+ 	    hr->flag |= HR_FLAG_PROXY;
+ 	    sock = openSocket(FTP_proxy_parsed.host,
+-			      schemetable[FTP_proxy_parsed.scheme].cmdname,
++			      schemeNumToName(FTP_proxy_parsed.scheme),
+ 			      FTP_proxy_parsed.port);
+ 	    if (sock < 0)
+ 		return uf;
+@@ -1645,15 +1658,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
+ 	    }
+ 	    else if (pu->scheme == SCM_HTTPS) {
+ 		sock = openSocket(HTTPS_proxy_parsed.host,
+-				  schemetable[HTTPS_proxy_parsed.scheme].
+-				  cmdname, HTTPS_proxy_parsed.port);
++				  schemeNumToName(HTTPS_proxy_parsed.scheme),
++				  HTTPS_proxy_parsed.port);
+ 		sslh = NULL;
+ 	    }
+ 	    else {
+ #endif				/* USE_SSL */
+ 		sock = openSocket(HTTP_proxy_parsed.host,
+-				  schemetable[HTTP_proxy_parsed.scheme].
+-				  cmdname, HTTP_proxy_parsed.port);
++				  schemeNumToName(HTTP_proxy_parsed.scheme),
++				  HTTP_proxy_parsed.port);
+ #ifdef USE_SSL
+ 		sslh = NULL;
+ 	    }
+@@ -1685,8 +1698,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
+ 	    }
+ 	}
+ 	else {
+-	    sock = openSocket(pu->host,
+-			      schemetable[pu->scheme].cmdname, pu->port);
++	    sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port);
+ 	    if (sock < 0) {
+ 		*status = HTST_MISSING;
+ 		return uf;
+@@ -1750,7 +1762,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
+ 	    pu->host != NULL && !check_no_proxy(pu->host)) {
+ 	    hr->flag |= HR_FLAG_PROXY;
+ 	    sock = openSocket(GOPHER_proxy_parsed.host,
+-			      schemetable[GOPHER_proxy_parsed.scheme].cmdname,
++			      schemeNumToName(GOPHER_proxy_parsed.scheme),
+ 			      GOPHER_proxy_parsed.port);
+ 	    if (sock < 0)
+ 		return uf;
+@@ -1758,8 +1770,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
+ 	    tmp = HTTPrequest(pu, current, hr, extra_header);
+ 	}
+ 	else {
+-	    sock = openSocket(pu->host,
+-			      schemetable[pu->scheme].cmdname, pu->port);
++	    sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port);
+ 	    if (sock < 0)
+ 		return uf;
+ 	    if (pu->file == NULL)
diff --git a/www-client/w3m/files/w3m-CVE-2010-2074.patch b/www-client/w3m/files/w3m-CVE-2010-2074.patch
new file mode 100644
index 000000000000..2863932824c4
--- /dev/null
+++ b/www-client/w3m/files/w3m-CVE-2010-2074.patch
@@ -0,0 +1,55 @@
+Index: istream.c
+===================================================================
+--- istream.c
++++ istream.c
+@@ -447,8 +447,17 @@ ssl_check_cert_ident(X509 * x, char *hos
+ 
+ 		    if (!seen_dnsname)
+ 			seen_dnsname = Strnew();
++		    /* replace \0 to make full string visible to user */
++		    if (sl != strlen(sn)) {
++			int i;
++			for (i = 0; i < sl; ++i) {
++			    if (!sn[i])
++				sn[i] = '!';
++			}
++		    }
+ 		    Strcat_m_charp(seen_dnsname, sn, " ", NULL);
+-		    if (ssl_match_cert_ident(sn, sl, hostname))
++		    if (sl == strlen(sn) /* catch \0 in SAN */
++			&& ssl_match_cert_ident(sn, sl, hostname))
+ 			break;
+ 		}
+ 	    }
+@@ -466,16 +475,27 @@ ssl_check_cert_ident(X509 * x, char *hos
+     if (match_ident == FALSE && ret == NULL) {
+ 	X509_NAME *xn;
+ 	char buf[2048];
++	int slen;
+ 
+ 	xn = X509_get_subject_name(x);
+ 
+-	if (X509_NAME_get_text_by_NID(xn, NID_commonName,
+-				      buf, sizeof(buf)) == -1)
++	slen = X509_NAME_get_text_by_NID(xn, NID_commonName, buf, sizeof(buf));
++	if ( slen == -1)
+ 	    /* FIXME: gettextize? */
+ 	    ret = Strnew_charp("Unable to get common name from peer cert");
+-	else if (!ssl_match_cert_ident(buf, strlen(buf), hostname))
++	else if (slen != strlen(buf)
++		|| !ssl_match_cert_ident(buf, strlen(buf), hostname)) {
++	    /* replace \0 to make full string visible to user */
++	    if (slen != strlen(buf)) {
++		int i;
++		for (i = 0; i < slen; ++i) {
++		    if (!buf[i])
++			buf[i] = '!';
++		}
++	    }
+ 	    /* FIXME: gettextize? */
+ 	    ret = Sprintf("Bad cert ident %s from %s", buf, hostname);
++	}
+ 	else
+ 	    match_ident = TRUE;
+     }
+
diff --git a/www-client/w3m/files/w3m.mailcap b/www-client/w3m/files/w3m.mailcap
new file mode 100644
index 000000000000..21603a6dc3a2
--- /dev/null
+++ b/www-client/w3m/files/w3m.mailcap
@@ -0,0 +1 @@
+application/xhtml+xml; cat %s; x-htmloutput
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
new file mode 100644
index 000000000000..eeaac1e0cc4b
--- /dev/null
+++ b/www-client/w3m/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<use>
+		<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">w3m</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild
new file mode 100644
index 000000000000..fa04611a64b7
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3-r5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="http://w3m.sourceforge.net/"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja"
+
+# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
+# allow us to build w/o X, so we have to give up framebuffer w3mimg....
+RDEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( x11-libs/libXext x11-libs/libXdmcp )
+	gtk? (
+		vanilla? ( x11-libs/gtk+:2 )
+		!vanilla? ( x11-libs/gdk-pixbuf ) )
+	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) )
+	xface? ( media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	migemo? ( >=app-text/migemo-0.40 )
+	ssl? ( >=dev-libs/openssl-0.9.6b:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-0.5.2-gc72.patch" \
+		"${FILESDIR}/${PN}-0.5.3-parallel-make.patch" \
+		"${FILESDIR}/${PN}-0.5.3-glibc214.patch" \
+		"${FILESDIR}/${PN}-0.5.3-underlinking.patch" \
+		"${FILESDIR}/${PN}-0.5.3-tinfo.patch" \
+		"${FILESDIR}/${PN}-0.5.3-gettext.patch"
+	use vanilla || \
+		epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \
+			"${FILESDIR}"/${P}-gdk-pixbuf.patch \
+			"${FILESDIR}"/${P}-input-type-default.patch \
+			"${FILESDIR}"/${P}-url-schema.patch
+	ecvs_clean
+	sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die
+	eautoconf
+}
+
+src_configure() {
+	local myconf migemo_command imagelibval imageval
+
+	if use gtk ; then
+		imagelibval="gtk2"
+	elif use imlib ; then
+		imagelibval="imlib2"
+	fi
+
+	if [ ! -z "${imagelibval}" ] ; then
+		use X && imageval="${imageval}${imageval:+,}x11"
+		use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
+	fi
+
+	if use migemo ; then
+		migemo_command="migemo -t egrep ${EPREFIX}/usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use linguas_ja ; then
+		if use unicode ; then
+			myconf="${myconf} --enable-japanese=U"
+		else
+			myconf="${myconf} --enable-japanese=E"
+		fi
+	elif use unicode ; then
+		myconf="${myconf} --with-charset=UTF-8"
+	else
+		myconf="${myconf} --with-charset=US-ASCII"
+	fi
+
+	# lynxkeymap IUSE flag. bug #49397
+	if use lynxkeymap ; then
+		myconf="${myconf} --enable-keymap=lynx"
+	else
+		myconf="${myconf} --enable-keymap=w3m"
+	fi
+
+	econf \
+		--with-editor="${EPREFIX}/usr/bin/vi" \
+		--with-mailer="${EPREFIX}/bin/mail" \
+		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
+		--with-termlib=yes \
+		--enable-image=${imageval:-no} \
+		--with-imagelib="${imagelibval:-no}" \
+		--with-migemo="${migemo_command}" \
+		--enable-m17n \
+		--enable-unicode \
+		$(use_enable gpm mouse) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		$(use_enable xface) \
+		${myconf}
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}.mailcap" mailcap
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/*
+	dodoc README NEWS TODO ChangeLog
+	docinto doc-en ; dodoc doc/*
+	if use linguas_ja ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf "${ED}"/usr/share/man/ja || die
+	fi
+}
diff --git a/www-client/w3mir/Manifest b/www-client/w3mir/Manifest
new file mode 100644
index 000000000000..35815ceffea8
--- /dev/null
+++ b/www-client/w3mir/Manifest
@@ -0,0 +1 @@
+DIST w3mir-1.0.10.tar.gz 82791 SHA256 c6a58939a89b2b469db54c639e63438f4fcba3c79ebcea69675d7115ba48369d SHA512 01d579f9e9b4472f2ed51e5d980d29fca9957004a946a5608ffc417930fed7cc545cd2f924ce2f2a3ad5fe2e64792bc2b95b133d883f9fa7d5b30247e5f2aa10 WHIRLPOOL 50c7a5d6a181b7a724c562d2f0346074113f17cbefda95c74a1e2b243527cd226b1ad9ee2dba22090bbf707e166811025037f9dea397520600af499812995502
diff --git a/www-client/w3mir/files/w3mir-1.0.10-cwd.diff b/www-client/w3mir/files/w3mir-1.0.10-cwd.diff
new file mode 100644
index 000000000000..83c3781efc43
--- /dev/null
+++ b/www-client/w3mir/files/w3mir-1.0.10-cwd.diff
@@ -0,0 +1,32 @@
+--- w3mir.PL	2005-12-10 20:39:58.000000000 +0100
++++ w3mir.PL	2005-12-11 12:49:26.000000000 +0100
+@@ -209,6 +209,8 @@
+ use URI::URL;
+ # For flush method
+ use FileHandle;
++# for determining current working directory
++use Cwd;
+ 
+ eval '
+ use URI;
+@@ -581,7 +583,8 @@
+     unless ref $rum_url_o;
+   
+   # Derive a filename from the url, the filename contains no URL-quoting
+-  my($lf_name) = (url "file:$lf_url")->unix_path;
++  # filename is relative to current working directory
++  my($lf_name) = (url "file:".getcwd()."/$lf_url")->unix_path;
+ 
+   # Make all intermediate directories
+   &mkdir($lf_name) if $s==0;
+@@ -680,9 +683,7 @@
+     push(@EXTRASTUFF,$w3http::NOUSER)
+       unless ($do_user);
+ 
+-    # YES, $lf_url is right, w3http::query handles this like an url so
+-    # the quoting must all be in place.
+-    my $binfile=$lf_url;
++    my $binfile=$lf_name;
+     $binfile='-' if $s==1;
+     $binfile=$nulldevice if $s==2;
+ 
diff --git a/www-client/w3mir/metadata.xml b/www-client/w3mir/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/www-client/w3mir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-client/w3mir/w3mir-1.0.10-r2.ebuild b/www-client/w3mir/w3mir-1.0.10-r2.ebuild
new file mode 100644
index 000000000000..87f30289f999
--- /dev/null
+++ b/www-client/w3mir/w3mir-1.0.10-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils perl-app
+
+DESCRIPTION="w3mir is a all purpose HTTP copying and mirroring tool"
+SRC_URI="http://langfeldt.net/w3mir/${P}.tar.gz"
+HOMEPAGE="http://langfeldt.net/w3mir/"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="alpha ~amd64 ppc ~sparc x86 ~arm-linux ~x86-linux"
+
+DEPEND="${DEPEND}
+	>=dev-perl/URI-1.0.9
+	>=dev-perl/libwww-perl-5.64-r1
+	>=virtual/perl-MIME-Base64-2.12"
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${P}-cwd.diff"
+}
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
new file mode 100644
index 000000000000..baa192c54014
--- /dev/null
+++ b/www-client/w3mmee/Manifest
@@ -0,0 +1 @@
+DIST w3mmee-p24-22.tar.gz 690094 SHA256 1a905a30786568a2c607fd296ea7c13a03c6930d4b9fcb3d0e084c71e30aa665 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761 WHIRLPOOL d4d3ba4ca690a2f41f2ce77292849fafbff320876b7e7df06ad599669d86b01762bd2036e8fcd7044545b5abd7345e02e0c172905f7306e073ac4cc98e1c9657
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
new file mode 100644
index 000000000000..81e6a6dea0f3
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 32afb35..3be66fd 100755
+--- a/configure
++++ b/configure
+@@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then
+ #include <gc.h>
+ main()
+ {
+-  extern unsigned GC_version;
++  unsigned GC_version = GC_get_version();
+   printf("%d%02d%03d\n",(GC_version>>16)&0xff,(GC_version>>8)&0xff,GC_version&0xff);
+ }
+ EOF
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch b/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch
new file mode 100644
index 000000000000..dc9be94732c6
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch
@@ -0,0 +1,35 @@
+diff --git a/istream.c b/istream.c
+index de5fbd3..6718b41 100644
+--- a/istream.c
++++ b/istream.c
+@@ -132,7 +132,7 @@ newFileStream(FILE *f, void (*closep)())
+   stream = New(struct input_stream);
+   init_base_stream(stream, STREAM_BUF_SIZE);
+   stream->type = IST_FILE;
+-  stream->handle.file = New(struct file_handle);
++  stream->handle.file = New(struct afile_handle);
+   stream->handle.file->f = f;
+ 
+   if (closep)
+diff --git a/istream.h b/istream.h
+index 168882f..3e7132f 100644
+--- a/istream.h
++++ b/istream.h
+@@ -20,7 +20,7 @@ struct stream_buffer {
+ 
+ typedef struct stream_buffer *StreamBuffer;
+ 
+-struct file_handle {
++struct afile_handle {
+   FILE *f;
+   void (*close)(FILE *);
+ };
+@@ -121,7 +121,7 @@ struct tee_handle {
+ union input_handle {
+   void *gen;
+   int fd;
+-  struct file_handle *file;
++  struct afile_handle *file;
+   struct delimited_handle *delimited;
+   Str str;
+ #ifdef USE_SSL
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch b/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch
new file mode 100644
index 000000000000..603e30bb4038
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 73e247b..32afb35 100755
+--- a/configure
++++ b/configure
+@@ -1354,7 +1354,7 @@ main()
+ EOF
+ 
+ if [ -z "$dtermlib" ]; then
+- TERM_LIBS='termcap termlib terminfo mytinfo curses ncurses'
++ TERM_LIBS='termcap termlib terminfo mytinfo curses ncurses tinfo'
+ 
+  for lib in $TERM_LIBS; do
+   for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib; do
diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc44.patch
new file mode 100644
index 000000000000..092adb5ba40c
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c
+--- w3mmee-p24-22.orig/indep.c	2002-11-27 16:35:37.000000000 +0200
++++ w3mmee-p24-22/indep.c	2009-07-25 23:06:52.000000000 +0300
+@@ -14,7 +14,7 @@
+ {
+ #ifdef HAVE_STRTOLL
+     return strtoll(s, NULL, base);
+-#elif HAVE_STRTOQ
++#elif defined(HAVE_STRTOQ)
+     return strtoq(s, NULL, base);
+ #else
+     int minus, digit;
diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc45.patch
new file mode 100644
index 000000000000..db6f86e4deee
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc45.patch
@@ -0,0 +1,17 @@
+Fixing build with gcc-4.5
+
+https://bugs.gentoo.org/show_bug.cgi?id=317815
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- configure
++++ configure
+@@ -2636,7 +2636,7 @@
+ fi
+ 
+ cat >do_mk_btri.sh <<END_OF_DO_MK_BTRI
+-$dcpp "\$1" | sed -n "/^[ 	]*[\\"'%]/p" | $mk_btri_cmd
++$dcpp -P "\$1" | sed -n "/^[ 	]*[\\"'%]/p" | $mk_btri_cmd
+ END_OF_DO_MK_BTRI
+ 
+ cat >TABMakefile <<END_OF_TABMAKEFILE1
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff
new file mode 100644
index 000000000000..967e679f02b2
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff
@@ -0,0 +1,23 @@
+diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in w3mmee-p24-19/scripts/w3mman/w3mman.in
+--- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in	2002-03-17 14:07:08.000000000 +0900
++++ w3mmee-p24-19/scripts/w3mman/w3mman.in	2003-12-06 20:49:15.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!@PERL@
+ 
+ @W3M = split(' ', '@W3M@');
+-$ENV{'MAN'} = '@MAN@';
++$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+ 
+ sub usage {
+diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in
+--- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in	2002-03-17 14:07:08.000000000 +0900
++++ w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in	2003-12-06 20:49:53.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!@PERL@
+ 
+-$MAN = $ENV{'MAN'} || '@MAN@';
++$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
+ $CGI = "file://$SCRIPT_NAME";
diff --git a/www-client/w3mmee/metadata.xml b/www-client/w3mmee/metadata.xml
new file mode 100644
index 000000000000..2d5852c16c60
--- /dev/null
+++ b/www-client/w3mmee/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
new file mode 100644
index 000000000000..fde62c6249e2
--- /dev/null
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit alternatives eutils toolchain-funcs multilib
+
+IUSE="gpm imlib nls ssl xface"
+
+MY_PV=${PV##*_}-22
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A variant of w3m with support for multiple character encodings"
+SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"
+HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-7.2
+	dev-lang/perl
+	>=dev-libs/libmoe-1.5.3
+	imlib? ( >=media-libs/imlib-1.9.8
+		xface? ( media-libs/compface ) )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	nls? ( sys-devel/gettext )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
+		"${FILESDIR}"/${PN}-gcc4{4,5}.patch \
+		"${FILESDIR}"/${P}-glibc214.patch \
+		"${FILESDIR}"/${P}-tinfo.patch \
+		"${FILESDIR}"/${P}-boehm-gc.patch
+	sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die
+}
+
+src_compile() {
+
+	local myconf myuse
+	myuse="use_cookie=y use_ansi_color=y use_history=y
+		display_code=E system_code=E"
+
+	if use ssl ; then
+		myconf="${myconf} --ssl-includedir=/usr/include/openssl
+			--ssl-libdir=/usr/$(get_libdir)"
+		myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y"
+	else
+		myuse="${myuse} use_ssl=n"
+	fi
+
+	if use gpm ; then
+		myuse="${myuse} use_mouse=y"
+	else
+		myuse="${myuse} use_mouse=n"
+	fi
+
+	if use nls ; then
+		myconf="${myconf} -locale_dir=/usr/share/locale"
+	else
+		myconf="${myconf} -locale_dir='(NONE)'"
+	fi
+
+	if use imlib ; then
+		myuse="${myuse} use_image=y use_w3mimg_x11=y
+		use_w3mimg_fb=n w3mimgdisplay_setuid=n"
+		if use xface ; then
+			myuse="${myuse} use_xface=y"
+		else
+			myuse="${myuse} use_xface=n"
+		fi
+	else
+		myuse="${myuse} use_image=n"
+	fi
+
+	cat >>config.param<<-EOF
+	lang=MANY
+	accept_lang=en
+	EOF
+
+	env CC=$(tc-getCC) ${myuse} ./configure -nonstop \
+		-prefix=/usr \
+		-suffix=mee \
+		-auxbindir=/usr/$(get_libdir)/w3mmee \
+		-libdir=/usr/$(get_libdir)/w3mmee/cgi-bin \
+		-helpdir=/usr/share/w3mmee \
+		-mandir=/usr/share/man \
+		-sysconfdir=/etc/w3mmee \
+		-model=custom \
+		-libmoe=/usr/$(get_libdir) \
+		-mb_h=/usr/include/moe \
+		-mk_btri=/usr/libexec/moe \
+		-cflags="${CFLAGS}" -ldflags="${LDFLAGS}" \
+		${myconf} || die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	# w3mman and manpages conflict with those from w3m
+	mv "${D}"/usr/share/man/ja/man1/w3m{,mee}.1 || die
+	mv "${D}"/usr/share/man/man1/w3m{,mee}.1 || die
+
+	dodoc ChangeLog NEWS* README
+	dohtml 00INCOMPATIBLE.html
+
+	docinto en
+	dodoc doc/HISTORY doc/README* doc/keymap.* doc/menu.*
+	dohtml doc/*
+
+	docinto jp
+	dodoc doc-jp/HISTORY doc-jp/README* doc-jp/keymap* doc-jp/menu.*
+	dohtml doc-jp/*
+}
+
+pkg_postinst() {
+
+	w3m_alternatives
+	einfo
+	einfo "If you want to render multilingual text, please refer to"
+	einfo "/usr/share/doc/${PF}/en/README.mee or"
+	einfo "/usr/share/doc/${PF}/jp/README.mee"
+	einfo "and set W3MLANG variable respectively."
+	einfo
+}
+
+pkg_postrm() {
+
+	w3m_alternatives
+}
+
+w3m_alternatives() {
+
+	if [ ! -f /usr/bin/w3m ] ; then
+		alternatives_makesym /usr/bin/w3m \
+			/usr/bin/w3m{m17n,mee}
+		alternatives_makesym /usr/bin/w3mman \
+			/usr/bin/w3m{man-m17n,meeman}
+		alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \
+			/usr/share/man/ja/man1/w3m{m17n,mee}.1.gz
+		alternatives_makesym /usr/share/man/man1/w3m.1.gz \
+			/usr/share/man/man1/w3m{m17n,mee}.1.gz
+		alternatives_makesym /usr/share/man/man1/w3mman.1.gz \
+			/usr/share/man/man1/w3m{man-m17n,meeman}.1.gz
+	fi
+}
diff --git a/www-client/weboob/Manifest b/www-client/weboob/Manifest
new file mode 100644
index 000000000000..80e534a60190
--- /dev/null
+++ b/www-client/weboob/Manifest
@@ -0,0 +1,2 @@
+DIST weboob-0.g.tar.gz 1465176 SHA256 ccf4643fa0573a905061b29603fc89ef9e953fa7d88c0d239807689c2eab5b2d SHA512 802b0f4cb10d1c2a13dc183d59aa642a9642b3b8f9417ce7bf66835a5f7028bc3fde9a8f3048b01cd5601585d37e6c95fa277b768723d05ab1b8eb4cb74a40bc WHIRLPOOL 4a42b4b48808f9590be1a4b0ab63cf79779905b9c4d789b24919241e85185bc07ace4a2cb8d6c34057ec86936828eeefc99e130ec4d9f7e507551340d3c86738
+DIST weboob-0.h.tar.gz 1700259 SHA256 070fe65d50ebac3901ec77b2062857be6a7174184d40634e50caefd1e5cb7ec2 SHA512 9ec34d184f965ec9124e7cb7e40e9337f781e2d79171fdc2f48b20d68bc21b8cabb349b56229b97f86257edb1d9f24886cbe3576a0fc80ed4440168119ea7e2b WHIRLPOOL 36e370ed0dd08a889dab58ea59903ed76168b689899811451a6add344b8fddbc433b7fa0b977db3b5f0c92dc5e6c7a26c8c664096e87b1f5c44cf8e40a0142ce
diff --git a/www-client/weboob/metadata.xml b/www-client/weboob/metadata.xml
new file mode 100644
index 000000000000..05b7d0179f07
--- /dev/null
+++ b/www-client/weboob/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<use>
+		<flag name="secure-updates">Enable secure updates</flag>
+		<flag name="fast-libs">Enable fast libs</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
new file mode 100644
index 000000000000..6da2649115ae
--- /dev/null
+++ b/www-client/weboob/weboob-0g.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+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}]
+	virtual/python-imaging[${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
new file mode 100644
index 000000000000..90fd7e99a287
--- /dev/null
+++ b/www-client/weboob/weboob-0h.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+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}]
+	virtual/python-imaging[${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-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
new file mode 100644
index 000000000000..6da2649115ae
--- /dev/null
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+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}]
+	virtual/python-imaging[${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-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
new file mode 100644
index 000000000000..6da2649115ae
--- /dev/null
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+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}]
+	virtual/python-imaging[${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/xombrero/Manifest b/www-client/xombrero/Manifest
new file mode 100644
index 000000000000..47f4bdaec139
--- /dev/null
+++ b/www-client/xombrero/Manifest
@@ -0,0 +1 @@
+DIST xombrero-1.6.3.tgz 290478 SHA256 481011c136206f7aa3ab4cdf49ad77f81df4d5585f9e9a20c651bfaaaa537f79 SHA512 420fdbb8c90e1009c7db41a6f3e6c77e03b70a8df732d1c6d37b83d7c8c873cbddf0ec9ed1fe95f3a8d62744a22d6bfcdde95b446d499aa4dc6d47d59d202e88 WHIRLPOOL 775157008fcc2cd12d42da35320f0f536fb6335dfd4c4c230b6824863e3c8eb94bd6415f80526df46eedc85eb2d27002b13949754e149f402788ac5c5ddb54dc
diff --git a/www-client/xombrero/metadata.xml b/www-client/xombrero/metadata.xml
new file mode 100644
index 000000000000..4e77b4b7ea2c
--- /dev/null
+++ b/www-client/xombrero/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+</pkgmetadata>
+
diff --git a/www-client/xombrero/xombrero-1.6.3.ebuild b/www-client/xombrero/xombrero-1.6.3.ebuild
new file mode 100644
index 000000000000..ac883c47970d
--- /dev/null
+++ b/www-client/xombrero/xombrero-1.6.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS=git-2
+fi
+
+inherit eutils fdo-mime toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="A minimalist web browser with sophisticated security features designed-in"
+HOMEPAGE="http://opensource.conformal.com/wiki/xombrero"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://opensource.conformal.com/${PN}.git
+		https://opensource.conformal.com/git/${PN}.git"
+	EGIT_SOURCEDIR="${WORKDIR}/${P}"
+	KEYWORDS=""
+else
+	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0
+	net-libs/libsoup
+	net-libs/gnutls
+	net-libs/webkit-gtk:3
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-apps/groff
+	dev-libs/atk
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:0
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/pixman"
+
+S="${WORKDIR}/${P}/linux"
+
+src_prepare() {
+	sed -i \
+		-e 's/-O2//' \
+		-e 's/-ggdb3//' \
+		-e 's,install: all,install: all\n\tinstall -m 755 -d $(DESTDIR)$(PREFIX)/share/applications,g' \
+		Makefile || die 'sed Makefile failed.'
+	sed -i \
+		-e 's#https://www\.cyphertite\.com#http://www.gentoo.org/#' \
+		-e "s#/usr/local#/usr#" \
+		../xombrero.h || die 'sed ../xombrero.c failed.'
+	sed -i \
+		"s#Icon=#Icon=/usr/share/${PN}/#" \
+		../xombrero.desktop || die 'sed ../xombrero.desktop failed.'
+	sed -i "s:Application;::" ../xombrero.desktop || die
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDADD="${LDFLAGS}" emake
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		install
+
+	if use examples;then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins \
+			../${PN}.conf \
+			../playflash.sh \
+			../favorites
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/www-client/xombrero/xombrero-9999.ebuild b/www-client/xombrero/xombrero-9999.ebuild
new file mode 100644
index 000000000000..684d17490d73
--- /dev/null
+++ b/www-client/xombrero/xombrero-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS=git-2
+fi
+
+inherit eutils fdo-mime toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="A minimalist web browser with sophisticated security features designed-in"
+HOMEPAGE="http://opensource.conformal.com/wiki/xombrero"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://opensource.conformal.com/${PN}.git
+		https://opensource.conformal.com/git/${PN}.git"
+	EGIT_SOURCEDIR="${WORKDIR}/${P}"
+	KEYWORDS=""
+else
+	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0
+	net-libs/libsoup
+	net-libs/gnutls
+	net-libs/webkit-gtk:3
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-apps/groff
+	dev-libs/atk
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:0
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/pixman"
+
+S="${WORKDIR}/${P}/linux"
+
+src_prepare() {
+	sed -i \
+		-e 's/-O2//' \
+		-e 's/-ggdb3//' \
+		Makefile || die 'sed Makefile failed.'
+	sed -i \
+		-e 's#https://www\.cyphertite\.com#http://www.gentoo.org/#' \
+		-e "s#/usr/local#/usr#" \
+		../xombrero.h || die 'sed ../xombrero.c failed.'
+	sed -i \
+		"s#Icon=#Icon=/usr/share/${PN}/#" \
+		../xombrero.desktop || die 'sed ../xombrero.desktop failed.'
+	sed -i "s:Application;::" ../xombrero.desktop || die
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDADD="${LDFLAGS}" emake
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		install
+
+	if use examples;then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins \
+			../${PN}.conf \
+			../playflash.sh \
+			../favorites
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}