www-client/netsurf: add 3.10-r7, drop 3.10-r6

Signed-off-by: orbea <orbea@riseup.net>

2 files changed, 46 insertions, 49 deletions

diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index cf54bac..d435571 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 69bb6d7..dd8707c 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=(
@@ -64,8 +69,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.10-libressl-3.5.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
@@ -77,22 +85,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[@]}" $@
@@ -108,7 +115,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
 }
 
@@ -129,14 +135,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"