[gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/

[Michael Weber]

commit:     d7806bc77176c8ff9793994d7473abd32019b14c
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 09:46:57 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 12:17:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7806bc7

www-client/netsurf: Remove old verion(s).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 www-client/netsurf/Manifest                        |   2 -
 .../netsurf/files/netsurf-3.3-pdf-writer.patch     |  85 -----------
 www-client/netsurf/files/netsurf-3.4-CFLAGS.patch  |  71 ---------
 ...f-3.4-conditionally-include-image-headers.patch |  49 -------
 .../files/netsurf-3.4-framebuffer-pkgconfig.patch  |  30 ----
 www-client/netsurf/netsurf-3.4.ebuild              | 162 ---------------------
 www-client/netsurf/netsurf-3.5.ebuild              | 162 ---------------------
 7 files changed, 561 deletions(-)

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index a2c77ca..2b78706 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,5 +1,3 @@
-DIST netsurf-3.4-src.tar.gz 4133201 SHA256 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 SHA512 d9f95ff88d572a36e906bdb25dddbb51aa683a2105ca9eff53ea61c154a34a888420811f8a2b58a1b5a10f77d8aa914e3201b937934243527edb8a897f7bd60e WHIRLPOOL 1c8e3d6ac8a1ecd7bfa2554d56bd6e6cbd6c025112110f596a1db551d3b18029ee2761ddb288cdbc0cd517a90a54081d9d8aca3399339160addb2aedce14a55b
-DIST netsurf-3.5-src.tar.gz 4094532 SHA256 98f3a66d3ae24ab34becdab2ea690f8f20c0f49f86723f133ede6df57e451dcc SHA512 0bbb64d7dfbe105a0c9ace6f17655feef1b63ed8ae1ceaca647d0fce828cef27f4871949351694b5836f0bbc0b2614a3671235a1682b0810b9194cd89a68659a WHIRLPOOL 2c0d7cc6096607105da5049e46ea9c08ba3b20fdf1992853a2a85c78e0937bfb8d5b9a5f55751ea18f46d68e64bd13d24f7a13d7d7d52a63796df62e217a7c3c
 DIST netsurf-3.6-src.tar.gz 4129091 SHA256 59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d WHIRLPOOL 20776d928a60a8da5d1871d2ce1e15af7853a07e3ec995135019bbf579f1b0dde0918f960fe2c51546c6a08b218f9e4143fae5777f52203f831f877382b94740
 DIST netsurf-buildsystem-1.5.tar.gz 38196 SHA256 dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71 SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4 WHIRLPOOL 7b7d595a2e399b361e71769e509a129af42da5ce823f1b55183efb53898ac2ae731593eb13e1ecc2271ea26ee0948ac35bf99fea280eb72a2bb00164b4b29f09
 DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767

diff --git a/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch
deleted file mode 100644
index e2c709e..00000000
--- a/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- netsurf-3.3/desktop/font_haru.c
-+++ netsurf-3.3/desktop/font_haru.c
-@@ -40,7 +40,7 @@
- #include "css/utils.h"
- 
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
- 
---- netsurf-3.3/desktop/save_pdf.c
-+++ netsurf-3.3/desktop/save_pdf.c
-@@ -57,6 +57,8 @@
- 
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "desktop/plotters.h"
- #include "desktop/print.h"
- #include "desktop/printer.h"
-@@ -450,11 +452,11 @@
- 
- 		switch(content_get_type(content)){
- 		/*Handle "embeddable" types of images*/
--		case CONTENT_JPEG:
-- 			image = HPDF_LoadJpegImageFromMem(pdf_doc,
-- 					(const HPDF_BYTE *) source_data,
-- 					source_size);
-- 			break;
-+		//case CONTENT_JPEG:
-+ 		//	image = HPDF_LoadJpegImageFromMem(pdf_doc,
-+ 		//			(const HPDF_BYTE *) source_data,
-+ 		//			source_size);
-+ 		//	break;
- 
- 		/*Disabled until HARU PNG support will be more stable.
- 
-@@ -700,7 +702,7 @@
- 
- 
- #ifndef PDF_DEBUG
--	if (option_enable_PDF_compression)
-+	if (nsoption_bool(enable_PDF_compression))
- 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
- #endif
- 	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -774,7 +776,7 @@
- 	assert(settings->output != NULL);
- 
- 	/*Encryption on*/
--	if (option_enable_PDF_password)
-+	if (nsoption_bool(enable_PDF_password))
- 		guit->browser->pdf_password(&owner_pass, &user_pass,
- 				(void *)settings->output);
- 	else
-@@ -789,7 +791,7 @@
- {
- 	bool success = false;
- 
--	if (option_enable_PDF_password && owner_pass != NULL ) {
-+	if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
- 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
- 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
- 		free(owner_pass);
---- netsurf-3.3/gtk/scaffolding.c
-+++ netsurf-3.3/gtk/scaffolding.c
-@@ -709,14 +709,14 @@
- 
- 	free(url_name);
- 
--	strncpy(dirname, option_downloads_directory, PATH_MAX);
-+	strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
- 	strncat(dirname, "/", PATH_MAX - strlen(dirname));
- 	dirname[PATH_MAX - 1] = '\0';
- 
- 	/* this way the scale used by PDF functions is synchronized with that
- 	 * used by the all-purpose print interface
- 	 */
--	haru_nsfont_set_scale((float)option_export_scale / 100);
-+	haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
- 
- 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
- 		GTK_FILE_CHOOSER_ACTION_SAVE,

diff --git a/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch
deleted file mode 100644
index 2dc8a14..00000000
--- a/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- netsurf-3.4/Makefile.defaults
-+++ netsurf-3.4/Makefile.defaults
-@@ -89,12 +89,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.4/framebuffer/Makefile.defaults
-+++ netsurf-3.4/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.4/framebuffer/Makefile.target
-+++ netsurf-3.4/framebuffer/Makefile.target
-@@ -30,7 +30,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.4/gtk/Makefile.defaults
-+++ netsurf-3.4/gtk/Makefile.defaults
-@@ -37,6 +37,3 @@
- 
- # Set default GTK version to build for (2 or 3)
- NETSURF_GTK_MAJOR ?= 2
--
--# Optimisation levels
--CFLAGS += -O2
---- netsurf-3.4/gtk/Makefile.target
-+++ netsurf-3.4/gtk/Makefile.target
-@@ -49,7 +49,7 @@
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
---- netsurf-3.4/test/Makefile
-+++ netsurf-3.4/test/Makefile
-@@ -45,8 +45,9 @@
-   TESTROOT := build-$(HOST)-test
- endif
- 
--TESTCFLAGS := -std=c99 -g -Wall \
-+TESTCFLAGS := -std=c99 -Wall \
- 		-D_BSD_SOURCE \
-+		-D_DEFAULT_SOURCE \
- 		-D_POSIX_C_SOURCE=200809L \
- 		-D_XOPEN_SOURCE=600 \
- 		-Itest -I. -I.. \

diff --git a/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch
deleted file mode 100644
index e78d71c..00000000
--- a/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- netsurf-3.4/image/image.c
-+++ netsurf-3.4/image/image.c
-@@ -26,14 +26,28 @@
- #include "desktop/gui_internal.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_NSSPRITE
- #include "image/nssprite.h"
-+#endif
-+#ifdef WITH_PNG
- #include "image/png.h"
-+#endif
-+#ifdef WITH_RSVG
- #include "image/rsvg.h"
-+#endif
-+#ifdef WITH_NS_SVG
- #include "image/svg.h"
-+#endif
- #include "image/image.h"
- 
- /**
-@@ -68,6 +82,16 @@
- 	if (error != NSERROR_OK)
- 		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
- 	error = nspng_init();

diff --git a/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch b/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch
deleted file mode 100644
index 31aaa0a..00000000
--- a/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- netsurf-3.4/framebuffer/Makefile.target
-+++ netsurf-3.4/framebuffer/Makefile.target
-@@ -4,13 +4,17 @@
- 
- # 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_PNG_CFLAGS := -DWITH_PNG
- 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 
- 
-@@ -65,6 +69,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/netsurf-3.4.ebuild b/www-client/netsurf/netsurf-3.4.ebuild
deleted file mode 100644
index 5eda2d9..00000000
--- a/www-client/netsurf/netsurf-3.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-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 +duktape 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? ( duktape ) ) )
-	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
-		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}]
-	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}]
-		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.3[${MULTILIB_USEDEP}]
-		!duktape? ( 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}
-	dev-libs/check[${MULTILIB_USEDEP}]
-	dev-perl/HTML-Parser
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
-	"${FILESDIR}"/${P}-framebuffer-pkgconfig.patch
-	"${FILESDIR}"/${P}-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.3-pdf-writer.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
-
-	sed -e 's:-DG_DISABLE_DEPRECATED::' \
-		-i gtk/Makefile.target || die
-
-	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 $(usex duktape NO YES) NO)
-		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) 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
-		eshopts_push -s nullglob
-		# bug 552562
-		local binaries=(netsurf{,.*})
-		eshopts_pop
-		for f in "${binaries[@]}" ; 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 /dev/input/mice readable to the account using netsurf-fb."
-		elog "Either use chmod a+r /dev/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
-		eshopts_push -s nullglob
-		# bug 552562
-		local binaries=(netsurf{,.*})
-		eshopts_pop
-		for f in "${binaries[@]}" ; 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/netsurf/netsurf-3.5.ebuild b/www-client/netsurf/netsurf-3.5.ebuild
deleted file mode 100644
index aa99c97..00000000
--- a/www-client/netsurf/netsurf-3.5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-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 ~ppc"
-IUSE="+bmp +duktape 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? ( duktape ) ) )
-	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
-		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}]
-	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}]
-		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.3[${MULTILIB_USEDEP}]
-		!duktape? ( 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}
-	dev-libs/check[${MULTILIB_USEDEP}]
-	dev-perl/HTML-Parser
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4-CFLAGS.patch
-	"${FILESDIR}"/${PN}-3.4-framebuffer-pkgconfig.patch
-	"${FILESDIR}"/${PN}-3.4-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.3-pdf-writer.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
-
-	sed -e 's:-DG_DISABLE_DEPRECATED::' \
-		-i gtk/Makefile.target || die
-
-	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 $(usex duktape NO YES) NO)
-		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) 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
-		eshopts_push -s nullglob
-		# bug 552562
-		local binaries=(netsurf{,.*})
-		eshopts_pop
-		for f in "${binaries[@]}" ; 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 /dev/input/mice readable to the account using netsurf-fb."
-		elog "Either use chmod a+r /dev/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
-		eshopts_push -s nullglob
-		# bug 552562
-		local binaries=(netsurf{,.*})
-		eshopts_pop
-		for f in "${binaries[@]}" ; 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
-}