gentoo auto-resync : 12:02:2023 - 09:56:54

4 files changed, 135 insertions, 5 deletions

diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index fcdb26044719..dbdd9760e0bc 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,5 +1,7 @@
+AUX surf-2.1-gentoo-webkit-4.1.patch 1082 BLAKE2B e03b6604715d9ba38b15bb491a4aab46216478f08eeabae3969e454fae088016fa05d7cf2457dbd1c79b96f2519332a87713a29e0beb6167ec803da9b24d9deb SHA512 e1f2eb2acc587ce1580e779a4ddb310e39dd6a28278a2e060b3eddcac41359c97aac6eaf2a5f12ff1f82c6d17bb192791870239f06932c7d75a02985d7ca45dc
 AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3cda8c4a386f8f4a4e5a40ce40c82736b33619f14c770031366aecfb0df4404982b834df8013845ff3f392de SHA512 2dbcdbbc869780a5b265dd909164e9764771e9a6c20664927f7df358daaadc83f65a915aabe65559756f6fedfcebad5496433ecb555ed0de55ced988102681ef
 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
 EBUILD surf-2.1-r2.ebuild 1860 BLAKE2B e73a7c72d77b0ccf545b2a9f899d0000f7603dfd7154350cb6bd322d1a482f9505a48102281b74b8545664108b86fc502bb29ced6171d07e90a840b2033551bb SHA512 d8736706f594bf11919d65b920dfa6d6587a1a060f4d3229b68d8b8e0a1411669e381edef0b773a17d5df3dee80306d990bf32b7bf78a0499fc2b543fc93deea
-EBUILD surf-9999.ebuild 1867 BLAKE2B 3957a728ca83500bd52c474716676f63a054b3692b3bda7806bc9883b316a04e3ba70d174e3a10eef002912a21371bf0463515c9363d95c7f3b3e450ec520d64 SHA512 29cda207b25e0da38f01af55f84e611d16a222aadc802cbae8d26d1d76d01fb1fe05f11a00ba244d28b5ddd91718d4baa6c57aedec53b687c067202e60d40402
+EBUILD surf-2.1-r3.ebuild 1877 BLAKE2B 82e3d6818c16307ee14e583edd28329089eeab4ada063be534a166d720ed1d2098338ca54f90dabd79a34d6559bfaf1b15a2485185ad5d8d9a983550d29ad7fa SHA512 9371bc3430acdff896dffde5e6eeee62348c53899c7e1253e46b35e2ab43ff698375c7f4dfbc533436c5b603a9d960610fafe545e7677d3611c9c599909f1092
+EBUILD surf-9999.ebuild 1882 BLAKE2B e6df9fcc7c97ef0c5e4c3db286b7d793d099e2fccac60c5c9636ebffc716d56e2ec469eafa73b3ad2e2f10362282be299c142b3db8959c6eff8715c7f244d1f8 SHA512 17087b55929abc0dc3860a6e454c076f017707daf8a436c51a380876855c5cf39040eb7d660865ebc7b850b40252c7246a759ec3615b9622bd7734a4bb95ca5e
 MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08
diff --git a/www-client/surf/files/surf-2.1-gentoo-webkit-4.1.patch b/www-client/surf/files/surf-2.1-gentoo-webkit-4.1.patch
new file mode 100644
index 000000000000..62036a190399
--- /dev/null
+++ b/www-client/surf/files/surf-2.1-gentoo-webkit-4.1.patch
@@ -0,0 +1,28 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,18 +4,18 @@ VERSION = 2.1
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = $(PREFIX)/share/man
+ LIBPREFIX = $(PREFIX)/lib
+ LIBDIR = $(LIBPREFIX)/surf
+ 
+-X11INC = `pkg-config --cflags x11`
+-X11LIB = `pkg-config --libs x11`
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ 
+-GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
+-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
+-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
+-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1)
++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0)
++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0)
+ 
+ # includes and libs
+ INCS = $(X11INC) $(GTKINC)
diff --git a/www-client/surf/surf-2.1-r3.ebuild b/www-client/surf/surf-2.1-r3.ebuild
new file mode 100644
index 000000000000..f656805c2e3e
--- /dev/null
+++ b/www-client/surf/surf-2.1-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop savedconfig toolchain-funcs xdg
+
+DESCRIPTION="A simple web browser based on WebKit/GTK+"
+HOMEPAGE="https://surf.suckless.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/surf"
+	EGIT_BRANCH="surf-webkit2"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tabbed"
+
+DEPEND="
+	app-crypt/gcr:0=[gtk]
+	dev-libs/glib:2
+	net-libs/webkit-gtk:4.1=
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!sci-chemistry/surf
+	!savedconfig? (
+		net-misc/curl
+		x11-apps/xprop
+		x11-misc/dmenu
+		x11-terms/st
+	)
+	tabbed? ( x11-misc/tabbed )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-webkit-4.1.patch"
+)
+
+pkg_setup() {
+	if ! use savedconfig; then
+		elog "The default config.h assumes you have"
+		elog " net-misc/curl"
+		elog " x11-terms/st"
+		elog "installed to support the download function."
+		elog "Without those, downloads will fail (gracefully)."
+		elog "You can fix this by:"
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	restore_config config.h
+
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	default
+
+	if use tabbed; then
+		dobin surf-open.sh
+	fi
+
+	save_config config.h
+
+	newicon "${S}/${PN}.png" "${PN}.png"
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;"
+	make_desktop_entry \
+		"surf %u" \
+		"Surf" \
+		"surf" \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=surf"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 1bcbc4596bdd..98184f11e4aa 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,7 +1,7 @@
-# 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 desktop savedconfig toolchain-funcs xdg
 
@@ -24,7 +24,7 @@ IUSE="tabbed"
 DEPEND="
 	app-crypt/gcr:0=[gtk]
 	dev-libs/glib:2
-	net-libs/webkit-gtk:4
+	net-libs/webkit-gtk:4.1=
 	x11-libs/gtk+:3
 	x11-libs/libX11
 "
@@ -41,8 +41,9 @@ RDEPEND="${DEPEND}
 BDEPEND="
 	virtual/pkgconfig
 "
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1-gentoo.patch
+	"${FILESDIR}/${PN}-2.1-gentoo-webkit-4.1.patch"
 )
 
 pkg_setup() {