gentoo resync : 15.12.2019

4 files changed, 202 insertions, 19 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 9b74f15c7323..16a7c0b9ad76 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,6 +1,9 @@
 AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
 AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
 AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
+DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
 EBUILD netsurf-3.8-r2.ebuild 3901 BLAKE2B 05e18fe99ada4d93333c4cc00c7083850423d41e6326b9b40b475b68fa9ad21b65b8fcaa6bba3b9e56bee6ccb6712362f8cfdbfe934b3043ff348145bdf77237 SHA512 38647c20bc9a6dc97ec3168f6b52280fec876bf3eef3ba29c7294f918be05467c628c7288c90ecf4c69c5dfadb7b53b3977ace67f22ccc8321c5c6645ee83707
-MISC metadata.xml 1314 BLAKE2B bbf75e81ce096d7f7c0704572599730e8d1347c502e2e9b3635c59dbb623e5cc462953216196c91a60d5cb9f24a04f2a123bbdc6b3d46fc76354caf0707d8f34 SHA512 1bd2cc76abdc435922379e62e90cbbff0bd520ca812b77d67d557523792669940546d1981d315d1ea93e810bbc6fa922178dbcb17a4c090a5ba5d6e5728f64b2
+EBUILD netsurf-3.9.ebuild 3906 BLAKE2B 47797b8f43c566cd2c758a69dbdeae37133ad1e3bf3a648e1397e528affc7b3f7769a0673a5760890105b35abbd2715972e4af8aaa2f9634e1ea34b2f5b92361 SHA512 9e55f7d46404a942db368c3a644edf318215c00125c2a08b59449c87dd7a141777c2077f378fd6cfb747e40af8c4024a0d59a1fa193b795ba1f6a8f643ef75e9
+MISC metadata.xml 1556 BLAKE2B 4ce7e6462525c4091f3a6e6226afaa29748d11728e4e4574147f317cb3b0ec650b247023e7b1c74e29f28e60fba3116084730e831daa6ad11e01267ccac896f4 SHA512 b529c7584bed60fa7b9d84f629314a1d902cdfbfe381e5a5975c77218aa7cbb58c4c4e66de96cb2029192c25956b05e6d47ee6baf394a192154806f46979febf
diff --git a/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
new file mode 100644
index 000000000000..603c20913da3
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
@@ -0,0 +1,35 @@
+diff -rup a/content/handlers/image/image.c b/content/handlers/image/image.c
+--- a/content/handlers/image/image.c	2019-07-17 10:28:13.000000000 +0000
++++ b/content/handlers/image/image.c	2019-09-27 15:09:03.860000000 +0000
+@@ -27,15 +27,31 @@
+ #include "netsurf/content.h"
+ #include "desktop/gui_internal.h"
+
++#ifdef WITH_BMP
+ #include "image/bmp.h"
++#endif
++#ifdef WITH_GIF
+ #include "image/gif.h"
++#endif
+ #include "image/ico.h"
++#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
++#ifdef WITH_WEBP
+ #include "image/webp.h"
++#endif
+ #include "image/image.h"
+
+ /**
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 152de9fcc3c6..c0afc0380304 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<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="duktape">Use duktape.org javascript engine</flag>
-	<flag name="gtk">Build GTK3 GUI</flag>
-	<flag name="gtk2">Build GTK2 GUI</flag>
-	<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
-	<flag name="psl">Use public suffix list via media-libs/libnspsl</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>
-</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>
+	<maintainer type="person">
+		<email>philipp.ammann@posteo.de</email>
+		<name>Philipp Ammann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</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="duktape">Use duktape.org javascript engine</flag>
+		<flag name="gtk">Build GTK3 GUI</flag>
+		<flag name="gtk2">Build GTK2 GUI</flag>
+		<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
+		<flag name="psl">Use public suffix list via media-libs/libnspsl</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>
+	</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.9.ebuild b/www-client/netsurf/netsurf-3.9.ebuild
new file mode 100644
index 000000000000..89bfe438c733
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.9.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 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 ~ppc64"
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
+	pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 )
+	duktape? ( javascript )"
+
+RDEPEND="
+	>=dev-libs/libcss-0.9
+	>=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.7
+		!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 )"
+BDEPEND="
+	duktape? ( app-editors/vim-core )
+	dev-libs/check
+	dev-perl/HTML-Parser
+	>=dev-util/netsurf-buildsystem-1.7-r1"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.9-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 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
+}