gentoo auto-resync : 15:08:2023 - 06:14:43

3 files changed, 48 insertions, 51 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 18844a22fdb7..c4616de4b198 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -3,6 +3,6 @@ AUX netsurf-3.10-gcc10-fno-common.patch 821 BLAKE2B 7560c370dbc41312644c4f3b2df0
 AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
 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-3.10-r7.ebuild 4014 BLAKE2B cf57e22232ff536db0e7f86cf40755d433705b0f29b489c915111eb5871260377aa16091b4a94b2c1d81abb3ca83ac517a35f57ec47a121425b832e1e11dd25d SHA512 dcb9f5f7d44319b4ec8917bf7be4f0fe7abe32ad4c77aebec2fe640254d5e45a04b9e0501302ba2939806b562eb91c8bb0f39eb0cc0c0a7afd87dfe84037c423
 EBUILD netsurf-9999.ebuild 3821 BLAKE2B b10ef654f644efd34c92f25a83c99c0a364ee4991c69ec4936a055f28cc3b8c3019ba29cfc1e69b3b26d912d4d75b95776a216e5bd7b144cba35ceaf6e0388bd SHA512 e66ab74bdd77b3c383fc47ed03b45d57e71c11b88aef781782cd00a208e4f3a2d0433f0072369036dd271e5e290f83c20524ef9b569bfa6dd54e4c1396aa3228
-MISC metadata.xml 1807 BLAKE2B e9d4cc9bfac764e6496e9bff73cd9f6b8415679197b2c5ba36d2467919d5e84f36f1198a9b3aea21b0d79e925d8699429d96fb1815e03f0d41bc83ed388f1f0c SHA512 56f57dccf09dc5830e005eca3dbe8e9d3a0c1335c7d13edb073614c8379e082fd6fd1f9f99e8c3a131149fb767b581401a3c73d9b2854510ac361d80e3204f36
+MISC metadata.xml 1763 BLAKE2B be2710262e8b1890512dc57304a22adc03157a2ca39240b8899fae389fc9c3d6b7cb6ed3857c5e910a5ce0b8e3fe4a575904ce52e2b34324c762e6d1f24a9dbd SHA512 8d2bca1ceea4d5f9c095a681c79c3df69af72e4699c2761feee2033f07a43fbb7d3e82736a53adc14bf08243b2aaa80d483476a25636232836790b75ae38097b
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index cf54bac2e424..d435571eb507 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -20,7 +20,6 @@
       <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 from <pkg>media-libs/libnspsl</pkg> to
       detect supercookies (recommended)
diff --git a/www-client/netsurf/netsurf-3.10-r6.ebuild b/www-client/netsurf/netsurf-3.10-r7.ebuild
index b3f5b779a1f7..d1b77be87dfa 100644
--- a/www-client/netsurf/netsurf-3.10-r6.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit netsurf desktop toolchain-funcs
+inherit desktop netsurf toolchain-funcs
 
 DESCRIPTION="A free, open source web browser"
 HOMEPAGE="https://www.netsurf-browser.org/"
@@ -12,48 +12,53 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="bmp fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
+IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg
 	+png +psl rosprite +svg +svgtiny +webp"
 
-REQUIRED_USE="|| ( fbcon gtk gtk2 )"
+REQUIRED_USE="|| ( fbcon gtk )"
 
 RDEPEND="
-	>=dev-libs/libcss-0.9
-	>=net-libs/libdom-0.4.1-r1
-	>=net-libs/libhubbub-0.3
-	>=dev-libs/libnsutils-0.1.0
-	>=dev-libs/libutf8proc-2.4
+	dev-libs/libcss
+	dev-libs/libnsutils
+	dev-libs/openssl:=
+	dev-libs/libutf8proc
 	dev-libs/libxml2:2
 	net-misc/curl
-	bmp? ( >=media-libs/libnsbmp-0.1 )
-	fbcon? ( >=dev-libs/libnsfb-0.2.2
-		truetype? ( media-fonts/dejavu
-			>=media-libs/freetype-2.5.0.1 )
+	net-libs/libdom
+	net-libs/libhubbub
+	bmp? ( media-libs/libnsbmp )
+	fbcon? (
+		dev-libs/libnsfb
+		truetype? (
+			media-fonts/dejavu
+			media-libs/freetype
+		)
+	)
+	gif? ( media-libs/libnsgif )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
 	)
-	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
+		dev-libs/nsgenbind
 		dev-lang/duktape:=
 	)
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	mng? ( >=media-libs/libmng-1.0.10-r2 )
-	png? ( >=media-libs/libpng-1.2.51:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng: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 )"
+	rosprite? ( media-libs/librosprite )
+	svg? (
+		svgtiny? ( media-libs/libsvgtiny )
+		!svgtiny? ( gnome-base/librsvg:2 )
+	)
+	webp? ( media-libs/libwebp )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	javascript? ( app-editors/vim-core )
 	dev-libs/check
 	dev-perl/HTML-Parser
-	>=dev-util/netsurf-buildsystem-1.7-r1
+	dev-util/netsurf-buildsystem
 	virtual/pkgconfig
+	javascript? ( app-editors/vim-core )
 "
 
 PATCHES=(
@@ -63,8 +68,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.10-gcc10-fno-common.patch"
 )
 
-DOCS=( README docs/using-framebuffer.md
-	docs/ideas/{cache,css-engine,render-library}.txt )
+DOCS=(
+	README
+	docs/using-framebuffer.md
+	docs/ideas/{cache,css-engine,render-library}.txt
+)
 
 src_prepare() {
 	default
@@ -76,22 +84,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[@]}" $@
@@ -107,7 +114,6 @@ src_compile() {
 	# need some mangling to ensure that svgtiny is installed.
 	use fbcon && _emake NETSURF_USE_RSVG=NO TARGET=framebuffer
 
-	use gtk2 && _emake TARGET=gtk2
 	use gtk && _emake TARGET=gtk3
 }
 
@@ -128,14 +134,6 @@ src_install() {
 						   netsurf \
 						   "Network;WebBrowser"
 	fi
-	if use gtk2 ; then
-		_emake TARGET=gtk2 DESTDIR="${D}" install
-		elog "netsurf gtk2 version has been installed as netsurf-gtk2"
-		make_desktop_entry "${EPREFIX}/usr/bin/netsurf-gtk2 %u" \
-						   NetSurf-gtk2 \
-						   netsurf \
-						   "Network;WebBrowser"
-	fi
 	if use gtk ; then
 		_emake TARGET=gtk3 DESTDIR="${D}" install
 		elog "netsurf gtk3 version has been installed as netsurf-gtk3"