gentoo auto-resync : 06:07:2023 - 04:12:55

3 files changed, 29 insertions, 19 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index d16828ba504e..df1ab80c2d8b 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -4,5 +4,5 @@ AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
 EBUILD netsurf-3.10-r6.ebuild 4522 BLAKE2B d9f8f044ac53fde47327b570019c63243042a9308d6849fda08e3be862e449857c0745af2b3a9b980d39a321dacd0415c30511f9a6ad2ce01f1081735f8c1bb5 SHA512 e405ecacbcb1efa80515848a9204001f241d1a21ca2f84f4b6063936563577f6a1a064425252b28b53f4679cdc25cd4e47736756ae51f32bbe4c5e6d4a594d7e
-EBUILD netsurf-9999.ebuild 3904 BLAKE2B 207ff02e7a9220324a6d457ce72af1eae31bdd18b02697b6a20c0b6cdd3b0d83ad8f0ba295272bd454d74b02144340a7439e27dd21a51044d18fbbd3c9fa92aa SHA512 1c9e5da740ccdf816a252f7047f3a24b3249f1606e2e8fc5e7a97e5ad39788888ea05df93e99280c476afb095d6b75daac65ff5d8282f398718eaa9e554605ad
-MISC metadata.xml 1573 BLAKE2B 9f18bc86b6f86be500f20fe857ffad4c6f7720af27766c8b5bdeb29eb02a7831ce3f8fd38f958507cfaf0a7d18e5cd139cc2d771d0ba6153bb76b343c6b01448 SHA512 411479884291b97a164bbaf434ce486354bb3525ad4cab408b46069235ed8ee9af89fff30ee837d14aae79a9b7d8f84206a1ee381afebd5ade4111e2ded8fbc4
+EBUILD netsurf-9999.ebuild 3821 BLAKE2B 5fcd2b6336d74c50111689618b795a4865b25b945143d8efd48d3fa31e3403a941a91b879a6ec7e8cd1cc40c69fc05df367b9d89fc7107ca6e401fcad7e3c760 SHA512 849ed40a56bae19aead95f0a1a39b9853ee81aca2bf7ca6e04fac251b4417972ebeaab214dc96f2f1f98233e4e99bafe353d60b8d0812ad4e6cf352606b6c094
+MISC metadata.xml 1807 BLAKE2B e9d4cc9bfac764e6496e9bff73cd9f6b8415679197b2c5ba36d2467919d5e84f36f1198a9b3aea21b0d79e925d8699429d96fb1815e03f0d41bc83ed388f1f0c SHA512 56f57dccf09dc5830e005eca3dbe8e9d3a0c1335c7d13edb073614c8379e082fd6fd1f9f99e8c3a131149fb767b581401a3c73d9b2854510ac361d80e3204f36
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 894274a5b1d1..cf54bac2e424 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -15,15 +15,27 @@
     </changelog>
   </upstream>
   <use>
-    <flag name="bmp">BMP bitmap image support (<pkg>media-libs/libnsbmp</pkg>)</flag>
+    <flag name="bmp">
+      Bitmap (BMP and ICO) image support via
+      <pkg>media-libs/libnsbmp</pkg>
+    </flag>
     <flag name="gtk">Build GTK3 GUI</flag>
     <flag name="gtk2">Build GTK2 GUI</flag>
-    <flag name="psl">Use public suffix list via <pkg>media-libs/libnspsl</pkg></flag>
+    <flag name="psl">
+      Use public suffix list from <pkg>media-libs/libnspsl</pkg> to
+      detect supercookies (recommended)
+    </flag>
     <flag name="rosprite">
-      RISC OS Sprite bitmap image support (<pkg>media-libs/librosprite</pkg>)
+      RISC OS Sprite bitmap image support via
+      <pkg>media-libs/librosprite</pkg>
     </flag>
     <flag name="svgtiny">
-      SVG image support via media-libs/svgatiny instead of <pkg>gnome-base/librsvg</pkg>
+      Use <pkg>media-libs/libsvgtiny</pkg> instead of
+      <pkg>gnome-base/librsvg</pkg> for SVG support
+    </flag>
+    <flag name="truetype">
+      Use <pkg>media-libs/freetype</pkg> for text in the framebuffer
+      frontend
     </flag>
   </use>
   <longdescription lang="en">
diff --git a/www-client/netsurf/netsurf-9999.ebuild b/www-client/netsurf/netsurf-9999.ebuild
index 0cf6ef50f6e0..d3675ca3a962 100644
--- a/www-client/netsurf/netsurf-9999.ebuild
+++ b/www-client/netsurf/netsurf-9999.ebuild
@@ -12,19 +12,20 @@ EGIT_REPO_URI="https://git.netsurf-browser.org/${PN}.git"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg mng
+IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg
 	+png +psl rosprite +svg +svgtiny +webp"
 
 REQUIRED_USE="|| ( fbcon gtk )"
 
 RDEPEND="
 	>=dev-libs/libcss-9999
-	>=net-libs/libdom-9999
-	net-libs/libhubbub
 	>=dev-libs/libnsutils-9999
+	dev-libs/openssl:=
 	dev-libs/libutf8proc
 	dev-libs/libxml2:2
 	net-misc/curl
+	>=net-libs/libdom-9999
+	net-libs/libhubbub
 	bmp? ( media-libs/libnsbmp )
 	fbcon? (
 		dev-libs/libnsfb
@@ -43,7 +44,6 @@ RDEPEND="
 		dev-lang/duktape:=
 	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
-	mng? ( media-libs/libmng:= )
 	png? ( media-libs/libpng:0= )
 	psl? ( media-libs/libnspsl )
 	rosprite? ( media-libs/librosprite )
@@ -54,7 +54,6 @@ RDEPEND="
 	webp? ( media-libs/libwebp )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	javascript? ( app-editors/vim-core )
 	dev-libs/check
 	dev-perl/HTML-Parser
 	dev-util/netsurf-buildsystem
@@ -83,22 +82,21 @@ _emake() {
 	local netsurf_makeconf=(
 		"${NETSURF_MAKECONF[@]}"
 		COMPONENT_TYPE=binary
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
 		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_DUKTAPE=$(usex javascript 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_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript YES NO)
 		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
-		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_OPENSSL=YES
 		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
-		PKG_CONFIG=$(tc-getPKG_CONFIG)
-		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
-		NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
 		NETSURF_USE_VIDEO=NO
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
 	)
 
 	emake "${netsurf_makeconf[@]}" $@