gentoo resync : 22.10.2018

7 files changed, 141 insertions, 149 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index ed3a37130f5a..ea87dc7377dd 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,9 +1,8 @@
-AUX netsurf-3.6-CFLAGS.patch 1821 BLAKE2B eb0bfa30abb7dc23845a6ade5edec90a607019298d917932ddcbfcb13e1c468f453eb256719c33e2494b0bee6858600d6d2b9b9ca93735029410bf67b5c582c4 SHA512 4eed05c11dc548cce4a0d88fcff547d8efabf3d2bab2067136585fefc5b96ee79be318304c31ed7aa5bebca479d8af082198059de9a05782eb939f0c3f8338e9
 AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
-AUX netsurf-3.6-gstreamer.patch 900 BLAKE2B 1182c00378c796e9ca11b0070094b8b2dc7ce17b47ecd58a264125a7b672b22c802d3c1bf42401f477de3b734563ea97e3e4f04391491925c22dd9f33ca31306 SHA512 9dd8510cc343c2b627001e7ec80603d8e0de8cb4bbd1e8f53e8ffea5b2adfa915633e50a0b6d99b13a453d3375fa66cfb466658931a0f5454f36363d56d53bb3
-AUX netsurf-3.6-pdf-writer.patch 2408 BLAKE2B 65c4356531d7de89708e0ffe79f900e95d74cdce383621b7d41afacd0ca516bc3abab7da85b6c29e6db0eff1d6e0f8fada2e1c343c7551a11b87009886caea7c SHA512 d3aee4ce0b509743a7efbf2262ca4ae64564d5e4b01453c621868eba20ef97bef8322a042a27606196456be38f09a7ca6be82fee3747cb93140e24b265133225
-DIST netsurf-3.6-src.tar.gz 4129091 BLAKE2B d6b08069e34a8fd4f2010c6b3efbde9d7b13e40d3f3fdceeee92eb9d2bbeb92fac6f0a1ca9ac263ebc1904ad04a42c97a6418da7e095d18eda3be952129ac718 SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
+AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 DIST netsurf-fb.modes-example.gz 4586 BLAKE2B 89c76fde1ddc79e46f22d9f628f8d75ec57be2a29d31383550137e3b502aa4d8c0a733b755731c916d4d544679a4253323bc343528c5e2c4f145c3318ac1d86d SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981
-EBUILD netsurf-3.6.ebuild 6584 BLAKE2B 0ad265b70d65e1e3fde6529fb75de17c7e5faa0682e73fb490935692614de0500f47ae532330589a81e0c72699eea9509348b316176a4b335fe7b519ab4ae6aa SHA512 5c0ca0d136ef9b2ed899a0626409117288f60424e1c6aee1ef0e0afc9ce32cf51384c9b861498fc13d487282fb705f3f9748e0dc9f557ea3d77e1e296e9ea553
-MISC metadata.xml 1855 BLAKE2B e4c0c4b14d68ce4f9036c984a6f543211b69bcd5e519eb7e889d75766d5bebb54cd4a40fd3af0c301061ded8f108a2f884b8f62bdb5409c3212a4c5f658fa111 SHA512 bef58b8b699cd7d7259c6affd5fb4a12f0358b57b9a1e0b7db938a7ef5c633c82acd5136b047b42f55794cc9c555825bd7a407c9a15d2ade72ba2d1d831e21c1
+EBUILD netsurf-3.8.ebuild 6404 BLAKE2B 903bc25775d1b5aa09f154b8e6e6b846f3e407caeb5c0d38d7764fe7ebe9b55a524cb4f9d72461f5e328461325299363ce33dd2e2eba59aa7db4683041749211 SHA512 2e35e4adf4c2c5e99beb3777136bbc15d13291326f92a4a63e41213d6a87507703ba8452d5c6bbf74b07c48d6378e9c6027fdb91bd974d2f8e67fadbd23f4b4c
+MISC metadata.xml 1903 BLAKE2B 2bbf38d061d0e1ad59c99b451f008619553442c436fa065f2066c964d9189d805f38b6571f7f54aeaa9d2512c403d2b4390afaed4a5559f5b273720aae416562 SHA512 79648e993db4b42d50244d1ec3efcb781d7c12f41f01056de5ce88aec9884bf6f23408421823970ccb3e46211d39736ae997f2e18a3d883a9cf553bb93923636
diff --git a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
deleted file mode 100644
index 8004aa4c6206..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- netsurf-3.6/Makefile.defaults
-+++ netsurf-3.6/Makefile.defaults
-@@ -96,12 +96,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.6/frontends/framebuffer/Makefile
-+++ netsurf-3.6/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
- 
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- 	  -D_BSD_SOURCE \
- 	  -D_DEFAULT_SOURCE \
- 	  -D_XOPEN_SOURCE=600 \
---- netsurf-3.6/frontends/framebuffer/Makefile.defaults
-+++ netsurf-3.6/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
- 
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
---- netsurf-3.6/frontends/gtk/Makefile.defaults
-+++ netsurf-3.6/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
---- netsurf-3.6/test/Makefile
-+++ netsurf-3.6/test/Makefile
-@@ -105,7 +105,7 @@
-   COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
- 
--TESTCFLAGS := -std=c99 -g \
-+TESTCFLAGS := -std=c99 \
- 		$(COMMON_WARNFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
deleted file mode 100644
index 6aca4f6abdf9..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -16,7 +16,6 @@
- 
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
--		-DG_DISABLE_DEPRECATED \
- 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
- 		-DGTK_MULTIHEAD_SAFE \
- 		-DPANGO_DISABLE_DEPRECATED
---- netsurf-3.6/content/handlers/image/video.c
-+++ netsurf-3.6/content/handlers/image/video.c
-@@ -22,6 +22,8 @@
- #include "content/content_protected.h"
- 
- #include "image/video.h"
-+#include "utils/http/parameter.h"
-+#include "content/llcache.h"
- 
- typedef struct nsvideo_content {
- 	struct content base;
---- netsurf-3.6/content/content_factory.h
-+++ netsurf-3.6/content/content_factory.h
-@@ -25,6 +25,7 @@
- 
- #include "netsurf/content_type.h"
- #include "utils/errors.h"
-+#include "utils/utils.h"
- 
- #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER)	\
- 									\
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
new file mode 100644
index 000000000000..c52422dcb92b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile.defaults b/Makefile.defaults
+index 51090109e..f1ec46f73 100644
+--- a/Makefile.defaults
++++ b/Makefile.defaults
+@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
+ # But recover after sanitizer failure
+ NETSURF_RECOVER_SANITIZERS := YES
+ 
+-# 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
+ 
+diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
+index bdedd903b..35179138a 100644
+--- a/frontends/framebuffer/Makefile
++++ b/frontends/framebuffer/Makefile
+@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
+ CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
+ CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
+ 
+-CFLAGS += -std=c99 -g -Dsmall \
++CFLAGS += -std=c99 -Dsmall \
+ 	  -D_BSD_SOURCE \
+ 	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
+index cc712e992..f132c97d6 100644
+--- a/frontends/framebuffer/Makefile.defaults
++++ b/frontends/framebuffer/Makefile.defaults
+@@ -3,7 +3,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+ 
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
+index ec60ce70c..04af6df8f 100644
+--- a/frontends/gtk/Makefile
++++ b/frontends/gtk/Makefile
+@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
+ endif
+ 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+ 		-D_BSD_SOURCE \
+ 		-D_DEFAULT_SOURCE \
+diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
+index a98043eb9..bb5371230 100644
+--- a/frontends/gtk/Makefile.defaults
++++ b/frontends/gtk/Makefile.defaults
+@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
+ NETSURF_GTK_MAJOR ?= 2
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+diff --git a/test/Makefile b/test/Makefile
+index 4f9dd22c9..8bec9b88a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
+   COMMON_WARNFLAGS += -Wno-unused-parameter
+ endif
+ 
+-BASE_TESTCFLAGS := -std=c99 -g \
++BASE_TESTCFLAGS := -std=c99 \
+ 	$(COMMON_WARNFLAGS) \
+ 	-D_DEFAULT_SOURCE \
+ 	-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
index 5824adc1ecbf..e9c2420a33fd 100644
--- a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
+++ b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
@@ -1,5 +1,7 @@
---- netsurf-3.6/desktop/font_haru.c
-+++ netsurf-3.6/desktop/font_haru.c
+diff --git a/desktop/font_haru.c b/desktop/font_haru.c
+index 4ee9824f0..3304ba82a 100644
+--- a/desktop/font_haru.c
++++ b/desktop/font_haru.c
 @@ -37,7 +37,7 @@
  #include <hpdf.h>
  
@@ -9,8 +11,10 @@
  #include "desktop/font.h"
  #include "utils/log.h"
  
---- netsurf-3.6/desktop/save_pdf.c
-+++ netsurf-3.6/desktop/save_pdf.c
+diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
+index 889190089..9e6265cfb 100644
+--- a/desktop/save_pdf.c
++++ b/desktop/save_pdf.c
 @@ -60,6 +60,8 @@
  #include "utils/useragent.h"
  #include "content/hlcache.h"
@@ -20,7 +24,7 @@
  #include "netsurf/bitmap.h"
  
  #include "netsurf/plotters.h"
-@@ -450,11 +452,6 @@
+@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
  
  		switch(content_get_type(content)){
  		/*Handle "embeddable" types of images*/
@@ -32,7 +36,7 @@
  
  		/*Disabled until HARU PNG support will be more stable.
  
-@@ -700,7 +697,7 @@
+@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
  
  
  #ifndef PDF_DEBUG
@@ -41,7 +45,7 @@
  		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
  #endif
  	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -774,7 +771,7 @@
+@@ -780,7 +777,7 @@ void pdf_end(void)
  	assert(settings->output != NULL);
  
  	/*Encryption on*/
@@ -50,7 +54,7 @@
  		guit->misc->pdf_password(&owner_pass, &user_pass,
  				(void *)settings->output);
  	else
-@@ -789,7 +786,7 @@
+@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
  {
  	nserror res = NSERROR_OK;
  
@@ -59,9 +63,11 @@
  		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
  		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
  		free(owner_pass);
---- netsurf-3.6/frontends/gtk/scaffolding.c
-+++ netsurf-3.6/frontends/gtk/scaffolding.c
-@@ -731,14 +731,14 @@
+diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
+index 8c46fd884..748518fdc 100644
+--- a/frontends/gtk/scaffolding.c
++++ b/frontends/gtk/scaffolding.c
+@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
  
  	free(url_name);
  
@@ -70,7 +76,7 @@
  	strncat(dirname, "/", PATH_MAX - strlen(dirname));
  	dirname[PATH_MAX - 1] = '\0';
  
- 	/* this way the scale used by PDF functions is synchronized with that
+ 	/* this way the scale used by PDF functions is synchronised with that
  	 * used by the all-purpose print interface
  	 */
 -	haru_nsfont_set_scale((float)option_export_scale / 100);
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index e53232c547c3..a35fcb05331d 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 <upstream>
 	<changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
 </upstream>
@@ -18,7 +22,6 @@
 	<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>
 	<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
 	<flag name="gtk">Build GTK GUI, defaults to GTK3</flag>
 	<flag name="gtk2">Build GTK2 GUI</flag>
diff --git a/www-client/netsurf/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.8.ebuild
index 4397fe9dfaa6..5722a925d819 100644
--- a/www-client/netsurf/netsurf-3.6.ebuild
+++ b/www-client/netsurf/netsurf-3.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="a free, open source web browser"
@@ -16,7 +16,7 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk gtk2 gtk3 +javascript +jpeg +mng
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 gtk3 +javascript +jpeg +mng
 	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
 	fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
 
@@ -26,26 +26,25 @@ REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
 		fbcon_frontend_vnc fbcon_frontend_x ) )
 	duktape? ( javascript )"
 
-RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
-	>=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/libnsutils-0.0.5[${MULTILIB_USEDEP}]
+	>=dev-libs/libutf8proc-2.2[${MULTILIB_USEDEP}]
 	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
 	net-misc/curl[${MULTILIB_USEDEP}]
-	>=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
-	>=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
-	bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
-	fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libcss-0.8[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3[${MULTILIB_USEDEP}]
+	>=net-libs/libdom-0.3[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.2[${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}] )
+	gif? ( >=media-libs/libnsgif-0.1[${MULTILIB_USEDEP}] )
 	gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
 	javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
 		!duktape? ( dev-lang/spidermonkey:0= ) )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -61,19 +60,23 @@ DEPEND="${RDEPEND}
 	dev-libs/check[${MULTILIB_USEDEP}]
 	dev-perl/HTML-Parser"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
 	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.6-pdf-writer.patch
-	"${FILESDIR}"/${PN}-3.6-gstreamer.patch )
-DOCS=( fb.modes README Docs/USING-Framebuffer
-	Docs/ideas/{cache,css-engine,render-library}.txt )
+	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+)
+
+DOCS=( fb.modes README docs/using-framebuffer.md
+	docs/ideas/{cache,css-engine,render-library}.txt )
 
 src_prepare() {
-	rm -r frontends/{amiga,atari,beos,cocoa,monkey,riscos,windows} || die
+	# working around broken netsurf eclass
+	default
+	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
 
 	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
 
-	netsurf_src_prepare
+	multilib_copy_sources
 }
 
 src_configure() {
@@ -115,12 +118,12 @@ src_compile() {
 	fi
 	if use gtk2 ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_compile
 	fi
 	if use gtk3 || use gtk ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_compile
 	fi
 }
@@ -134,7 +137,7 @@ src_install() {
 		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_install
 		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+		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 /dev/input/mice readable to the account using netsurf-fb."
@@ -142,17 +145,17 @@ src_install() {
 	fi
 	if use gtk2 ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_install
 		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
 	fi
 	if use gtk3 || use gtk ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
+		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
 		netsurf_src_install
 		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
 	fi
 
 	insinto /usr/share/pixmaps