gentoo resync : 18.11.2018

4 files changed, 139 insertions, 171 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index ea87dc7377dd..2f633868d7df 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -2,7 +2,5 @@ AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b
 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.8.ebuild 6404 BLAKE2B 903bc25775d1b5aa09f154b8e6e6b846f3e407caeb5c0d38d7764fe7ebe9b55a524cb4f9d72461f5e328461325299363ce33dd2e2eba59aa7db4683041749211 SHA512 2e35e4adf4c2c5e99beb3777136bbc15d13291326f92a4a63e41213d6a87507703ba8452d5c6bbf74b07c48d6378e9c6027fdb91bd974d2f8e67fadbd23f4b4c
-MISC metadata.xml 1903 BLAKE2B 2bbf38d061d0e1ad59c99b451f008619553442c436fa065f2066c964d9189d805f38b6571f7f54aeaa9d2512c403d2b4390afaed4a5559f5b273720aae416562 SHA512 79648e993db4b42d50244d1ec3efcb781d7c12f41f01056de5ce88aec9884bf6f23408421823970ccb3e46211d39736ae997f2e18a3d883a9cf553bb93923636
+EBUILD netsurf-3.8-r2.ebuild 4297 BLAKE2B 5114faef59e44eb67e90a3feed51a1b40287783df94bb336ecc2e71f1ef89020c31c35bfe5efea7f53882e6e6d54a59794dd619d6fe846ed8d2e5f6c66747b84 SHA512 b037257751752b0e530e62e0e6733b43ec7c010cf119845fc1ce212fc4d13b9defaa62f12f0619048db289be382f539a562c4549b24661bc1f1d9c1a1ab693de
+MISC metadata.xml 1701 BLAKE2B 66ecdce1df195466bed3384b4aa0e658cd0a9949d02db8bae89437309f0336943d7080e4b1f58505964a1834cbb8f57d298b5a754c13e2546c26bb8e267e8535 SHA512 815e95e2f662a42b3ac91f8c8a1402389bad75420bef36c3ddde06452b9e1cd2a2c23b8aaa38b78364a907a61fae16c6dd2df3ec743d72d682134c615d8316d1
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index a35fcb05331d..579e62fe44c2 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -14,8 +14,6 @@
 </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>
@@ -23,9 +21,8 @@
 	<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="psl">Use public suffix list via media-libs/libnspsl</flag>
-	<flag name="gtk">Build GTK GUI, defaults to GTK3</flag>
+	<flag name="gtk">Build GTK3 GUI</flag>
 	<flag name="gtk2">Build GTK2 GUI</flag>
-	<flag name="gtk3">Build GTK3 GUI</flag>
 	<flag name="duktape">Use duktape.org javascript engine</flag>
 </use>
 <longdescription lang="en">
diff --git a/www-client/netsurf/netsurf-3.8-r2.ebuild b/www-client/netsurf/netsurf-3.8-r2.ebuild
new file mode 100644
index 000000000000..b13e2d5c5677
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.8-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs desktop
+
+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"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
+	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_sdl
+	fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 )
+	fbcon? ( || ( fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x ) )
+	duktape? ( javascript )"
+
+RDEPEND="
+	>=dev-libs/libcss-0.8
+	>=net-libs/libdom-0.3
+	>=net-libs/libhubbub-0.3
+	>=dev-libs/libnsutils-0.0.5
+	>=dev-libs/libutf8proc-2.2
+	dev-libs/libxml2:2
+	net-misc/curl
+	bmp? ( >=media-libs/libnsbmp-0.1 )
+	fbcon? ( >=dev-libs/libnsfb-0.2
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1 )
+	)
+	gif? ( >=media-libs/libnsgif-0.1 )
+	gtk? ( dev-libs/glib:2
+		x11-libs/gtk+:3 )
+	gtk2? ( dev-libs/glib:2
+		x11-libs/gtk+:2 )
+	javascript? ( >=dev-libs/nsgenbind-0.3
+		!duktape? ( dev-lang/spidermonkey:0= ) )
+	jpeg? ( >=virtual/jpeg-0-r2:0 )
+	mng? ( >=media-libs/libmng-1.0.10-r2 )
+	pdf-writer? ( media-libs/libharu )
+	png? ( >=media-libs/libpng-1.2.51:0 )
+	psl? ( media-libs/libnspsl )
+	rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
+		!svgtiny? ( gnome-base/librsvg:2 ) )
+	webp? ( >=media-libs/libwebp-0.3.0 )"
+DEPEND="${RDEPEND}
+	dev-libs/check
+	dev-perl/HTML-Parser"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
+	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+)
+
+DOCS=( README docs/using-framebuffer.md
+	docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	default
+	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	local netsurf_makeconf=(
+		"${NETSURF_MAKECONF[@]}"
+		COMPONENT_TYPE=binary
+		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_NSPSL=$(usex psl YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp 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)
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
+		NETSURF_USE_VIDEO=NO
+	)
+	emake "${netsurf_makeconf[@]}" $@
+}
+
+src_compile() {
+	use fbcon && _emake TARGET=framebuffer
+	use gtk2 && _emake TARGET=gtk
+	use gtk && _emake TARGET=gtk3
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		_emake TARGET=framebuffer DESTDIR="${ED}" install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+	fi
+	if use fbcon_frontend_sdl; then
+		elog "To be able to use netsurf without X, don't forget to enable the "
+		elog "proper USE flags in libsdl (fbcon). Also, make /dev/input/mice "
+		elog "readable to the account using netsurf-fb. Either use chmod a+r "
+		elog "/dev/input/mice (security!!!) or use a group."
+	fi
+	if use gtk2 ; then
+		_emake TARGET=gtk DESTDIR="${ED}" install
+		elog "netsurf gtk2 version has been installed as netsurf-gtk"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+	fi
+	if use gtk ; then
+		_emake TARGET=gtk3 DESTDIR="${ED}" install
+		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
+		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+	fi
+
+	insinto /usr/share/pixmaps
+	doins frontends/gtk/res/netsurf.xpm
+}
diff --git a/www-client/netsurf/netsurf-3.8.ebuild b/www-client/netsurf/netsurf-3.8.ebuild
deleted file mode 100644
index 5722a925d819..000000000000
--- a/www-client/netsurf/netsurf-3.8.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.7
-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 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"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
-	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.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.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[${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}] )
-	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}] )
-	psl? ( media-libs/libnspsl[${MULTILIB_USEDEP}] )
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
-	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
-	"${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() {
-	# working around broken netsurf eclass
-	default
-	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-
-	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
-
-	multilib_copy_sources
-}
-
-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_NSPSL=$(usex psl YES NO)
-		NETSURF_USE_MNG=$(usex mng YES NO)
-		NETSURF_USE_WEBP=$(usex webp 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
-		NETSURF_USE_VIDEO=dummy
-	)
-}
-
-src_compile() {
-	if use fbcon ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
-		netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
-		netsurf_src_compile
-	fi
-	if use gtk2 ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		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=NO}" )
-		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_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"
-		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 gtk2 ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
-		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"
-	fi
-	if use gtk3 || use gtk ; then
-		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
-		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"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins frontends/gtk/res/netsurf.xpm
-}