5 files changed, 107 insertions, 18 deletions
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index d31970a60962..4b3eee71c609 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,6 +1,8 @@
 AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2
-AUX surf-9999-gentoo.patch 1082 BLAKE2B 6884164a69609c432976c87dbb470394786c7d85328e3a6e0b7e29f471a1b7b8f03212c1cbf101ca5deb4e4c4e63fabf5f0b2963f2494e95316e696875890f12 SHA512 7befff3259b4aa8887de238d2a3fd61e536cecb3bb944e64105e4ad1f56c1a3b0b060abccbeb258efe45d901e20fba40fd5af69c3058941f57f4de6e415f442b
+AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3cda8c4a386f8f4a4e5a40ce40c82736b33619f14c770031366aecfb0df4404982b834df8013845ff3f392de SHA512 2dbcdbbc869780a5b265dd909164e9764771e9a6c20664927f7df358daaadc83f65a915aabe65559756f6fedfcebad5496433ecb555ed0de55ced988102681ef
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
+DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
-EBUILD surf-9999.ebuild 1331 BLAKE2B 0181a924a03247c3a60aece43b5029702162df785c208082df610f38b8d499ba33d4824b2b5f99985f7de45dcca68028fe7dd4d1b4037fcd9cfa978acd679af0 SHA512 ffefee4fe16bd708b8c09ffe590a39553a53266797a92509df108faf495a83f6da5e509bf8a8d743dd2a29bd5f4f836f87a93256a5e1a958c12ea3b807c3ba6c
-MISC metadata.xml 463 BLAKE2B 1c11d2d7ca09b28800b060f289acb8250669d30792765d89f5afe8372150efea49317db94bd0b8ba7a40fb46c38778cfe519d4081270dc77976650b9d99417db SHA512 22d63cb756b13ed0f054a91c9c202ea71aed493f9eb41344eb80ae8fd9d6c9effd1df5d636d50021be10afec6d2f67a4982cfdfd1acc43cdcc9a276ef4d420e6
+EBUILD surf-2.1.ebuild 1403 BLAKE2B 927a745af173f49f4c33c2d47f087611f457eb5281423b6076b282fe1a99174d38457e98a234ccee933161c03994fe19a3f487e05e55a4ae68d4b52c1f20e515 SHA512 266442cc185292cd2751e95f252f56e86d743d5b3dcb0ceac6460b77c1c9c5908a8b667d6877062227b80296c9e8c2f50f21a4f0e4d9fe34e16a49fe84793999
+EBUILD surf-9999.ebuild 1408 BLAKE2B 249f77689e9884282f0ceeebe759c2a3c145563e3117e0a8b1e90fc76d3df03a19220fec0821986843d87a2382e177d67e72036a2d529d2611ab0ea0c0189509 SHA512 c63155a275f7e57e163f4a46424c6d96e2cbf776616291b6aa874925d4a038d423315582e55883d974d4a66050609b7e888e2ef3d18466778273f05112e9de19
+MISC metadata.xml 697 BLAKE2B 80822c37adf6994ccf8277a1f618ade740bdadd90040adf5e5f4a2662da26c6be937796d991754bb420eebb9cae8cc320366ec4c76e838fc19aa4e45178048a3 SHA512 eedcd0841b7d3994c675240fcb812c16b0f1a5032a7a6d828880a039aa60090668fae92ac6d54252c50f7492bc439c0da48018b2defffadb89bf563444474c27
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-2.1-gentoo.patch
index fe6324ddbc9f..9ef89da23668 100644
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ b/www-client/surf/files/surf-2.1-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -4,18 +4,18 @@ VERSION = 2.0
+@@ -4,18 +4,18 @@ VERSION = 2.1
  # Customize below to fit your system
  
  # paths
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 52593948c041..7f6462d4bbc0 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>arkamar@atlas.cz</email>
+    <name>Petr Vaněk</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
     <flag name="tabbed">Install surf-open.sh script for running surf in <pkg>x11-misc/tabbed</pkg></flag>
diff --git a/www-client/surf/surf-2.1.ebuild b/www-client/surf/surf-2.1.ebuild
new file mode 100644
index 000000000000..15922a19958a
--- /dev/null
+++ b/www-client/surf/surf-2.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit savedconfig toolchain-funcs
+
+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 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tabbed"
+
+DEPEND="
+	app-crypt/gcr[gtk]
+	dev-libs/glib:2
+	net-libs/webkit-gtk:4
+	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.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
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index d6b737a623dc..2b48a07f1c22 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -2,42 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"
 HOMEPAGE="https://surf.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/surf"
-EGIT_BRANCH="surf-webkit2"
+
+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 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="tabbed"
 
-COMMON_DEPEND="
+DEPEND="
 	app-crypt/gcr[gtk]
 	dev-libs/glib:2
 	net-libs/webkit-gtk:4
 	x11-libs/gtk+:3
 	x11-libs/libX11
 "
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
+RDEPEND="${DEPEND}
 	!sci-chemistry/surf
-	${COMMON_DEPEND}
 	!savedconfig? (
-		>=x11-misc/dmenu-4.7
 		net-misc/curl
 		x11-apps/xprop
+		x11-misc/dmenu
 		x11-terms/st
 	)
 	tabbed? ( x11-misc/tabbed )
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-gentoo.patch
+	"${FILESDIR}"/${PN}-2.1-gentoo.patch
 )
 
 pkg_setup() {