From f3d4bf0c95717749ab6493b45dbdc9723d9b8d7f Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 21 Dec 2022 01:33:49 +0100
Subject: [PATCH 01/17] www-client/woob: add 3.1, drop 3.0-r1

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 www-client/woob/Manifest                       |  2 +-
 .../{woob-3.0-r1.ebuild => woob-3.1.ebuild}    | 18 +++++++++---------
 www-client/woob/woob-9999.ebuild               | 18 +++++++++---------
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename www-client/woob/{woob-3.0-r1.ebuild => woob-3.1.ebuild} (83%)

diff --git a/www-client/woob/Manifest b/www-client/woob/Manifest
index babc31bee4..67d5adb524 100644
--- a/www-client/woob/Manifest
+++ b/www-client/woob/Manifest
@@ -1 +1 @@
-DIST woob-3.0.tar.gz 3122974 BLAKE2B 0faff4d917674496f3340465e176641d74e0c86e9c29350aaba1ee864a7477b504812b88144bf63c06c7515762916c971916fb59f720d0380de08d85f1c17b7b SHA512 bf4bb0bd7fd1643b867b03a78f59675c1ea0b8d4455883726d0803a3ed13d37c64795e2a98e8d580852650f6853809356955f583aac37cc6b8e08818b2f3abf1
+DIST woob-3.1.tar.gz 3327352 BLAKE2B 0737abe144374eb5edb81530a12baf2d3ea645a2320afb4f59a0f5e3bca90f0c59d277e3a12f8bd5fe78d47599447f1a5ddd0736e6cada728c1ea32ee55e9dfb SHA512 fbd4ceaa6072a86ea7451f068559e9dc11c2a721a7d028b8caa1639c06e8b7ca6c8a067d749ae7946f0b062aab41951a4e66eaf3f895dd8275651c2c17a03db4
diff --git a/www-client/woob/woob-3.0-r1.ebuild b/www-client/woob/woob-3.1.ebuild
similarity index 83%
rename from www-client/woob/woob-3.0-r1.ebuild
rename to www-client/woob/woob-3.1.ebuild
index 01af6eac83..239b5e2166 100644
--- a/www-client/woob/woob-3.0-r1.ebuild
+++ b/www-client/woob/woob-3.1.ebuild
@@ -40,19 +40,19 @@ RDEPEND="
 	sci-geosciences/geopy[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 distutils_enable_sphinx docs/source
 
-python_prepare_all() {
-	# disable failing tests
-	sed -i \
-		-e '/woob.browser.browsers,/d' \
-		-e '/woob.browser.pages,/d' \
-		-e '/woob.tools.application.formatters.table,/d' \
-		setup.cfg || die
+src_prepare() {
+	default
 
-	distutils-r1_python_prepare_all
+	# doctests depending on a network connection
+	sed -i -e '/browsers.py/d' -e '/pages.py/d' setup.cfg || die
+}
+
+python_test() {
+	epytest --doctest-modules
 }
 
 python_install_all() {
diff --git a/www-client/woob/woob-9999.ebuild b/www-client/woob/woob-9999.ebuild
index 01af6eac83..239b5e2166 100644
--- a/www-client/woob/woob-9999.ebuild
+++ b/www-client/woob/woob-9999.ebuild
@@ -40,19 +40,19 @@ RDEPEND="
 	sci-geosciences/geopy[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 distutils_enable_sphinx docs/source
 
-python_prepare_all() {
-	# disable failing tests
-	sed -i \
-		-e '/woob.browser.browsers,/d' \
-		-e '/woob.browser.pages,/d' \
-		-e '/woob.tools.application.formatters.table,/d' \
-		setup.cfg || die
+src_prepare() {
+	default
 
-	distutils-r1_python_prepare_all
+	# doctests depending on a network connection
+	sed -i -e '/browsers.py/d' -e '/pages.py/d' setup.cfg || die
+}
+
+python_test() {
+	epytest --doctest-modules
 }
 
 python_install_all() {

From 2aa3d2f13a0d6e893123515df790565103b6b506 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 1 Jan 2023 22:20:36 +0100
Subject: [PATCH 02/17] net-misc/tinyssh: drop 20220222

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 net-misc/tinyssh/Manifest                |  1 -
 net-misc/tinyssh/tinyssh-20220222.ebuild | 71 ------------------------
 2 files changed, 72 deletions(-)
 delete mode 100644 net-misc/tinyssh/tinyssh-20220222.ebuild

diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 3e400bcbbc..739578697f 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1,2 +1 @@
-DIST tinyssh-20220222.tar.gz 248788 BLAKE2B cabcd12d3cd6d862fea9c4cba03b72ed2edebe2584feb5cdcff9294b05f41e553fb1f9f127306a63890bc6481eb88b04953f357cf9c505e4678f85f7a38128c9 SHA512 ff6285abd5a963a031cb21fbfdd8fe38e7d7a4d17b053ebc2abeb503fdd2afb5d3a3c0921ea53624ae3d8c29cd64a7fa6810e2c053aaf4d2ad949d7c4ba21ad0
 DIST tinyssh-20220801.tar.gz 249071 BLAKE2B 77509d2e2c7f84d675bb1f64df6ee7925e5c1f3f1be998b8438fa6e63954fca5dcbc724eb9993f22267f23e840e5f66077d48dfaba0f8d3c0b4b51d5098b457f SHA512 fe9f45f7a06c7c30d56a2ce32e656b1d3a8d12ccdb99dfd4087a145fdf4c5b54a1f1739f5a83dc8158f1164f36c89c6e349b370e1946ca0cfc81d27cae143135
diff --git a/net-misc/tinyssh/tinyssh-20220222.ebuild b/net-misc/tinyssh/tinyssh-20220222.ebuild
deleted file mode 100644
index 27fb9b6155..0000000000
--- a/net-misc/tinyssh/tinyssh-20220222.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="A small SSH server with state-of-the-art cryptography"
-HOMEPAGE="https://tinyssh.org"
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"
-else
-	SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-
-IUSE="+sodium"
-
-DEPEND="
-	sodium? ( dev-libs/libsodium )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/ucspi-tcp
-"
-
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die
-
-	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
-	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
-	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
-
-	default
-}
-
-src_compile() {
-	if use sodium
-	then
-		emake \
-			CC="$(tc-getCC)"
-			LIBS="-lsodium" \
-			CFLAGS="${CFLAGS} -I/usr/include/sodium" \
-			LDFLAGS="${LDFLAGS} -L/usr/lib"
-	else
-		emake CC="$(tc-getCC)"
-	fi
-}
-
-src_install() {
-	dosbin build/bin/tinysshd{,-makekey}
-	dobin build/bin/tinysshd-printkey
-	doman man/*
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service"
-	systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket"
-	systemd_dounit "${FILESDIR}/${PN}-makekey.service"
-}
-
-pkg_postinst() {
-	einfo "TinySSH is in beta stage, and ready for production use."
-	einfo "See https://tinyssh.org for more information."
-}

From 9f92dcbfc481d575480b9f6df2b82270c7baf08c Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 1 Jan 2023 22:27:12 +0100
Subject: [PATCH 03/17] net-misc/tinyssh: add 20230101

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 net-misc/tinyssh/Manifest                |  1 +
 net-misc/tinyssh/tinyssh-20230101.ebuild | 71 ++++++++++++++++++++++++
 net-misc/tinyssh/tinyssh-99999999.ebuild |  4 +-
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 net-misc/tinyssh/tinyssh-20230101.ebuild

diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 739578697f..a02f1ece62 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1 +1,2 @@
 DIST tinyssh-20220801.tar.gz 249071 BLAKE2B 77509d2e2c7f84d675bb1f64df6ee7925e5c1f3f1be998b8438fa6e63954fca5dcbc724eb9993f22267f23e840e5f66077d48dfaba0f8d3c0b4b51d5098b457f SHA512 fe9f45f7a06c7c30d56a2ce32e656b1d3a8d12ccdb99dfd4087a145fdf4c5b54a1f1739f5a83dc8158f1164f36c89c6e349b370e1946ca0cfc81d27cae143135
+DIST tinyssh-20230101.tar.gz 249091 BLAKE2B 5efb6eab07c136763ab27588661618763d2ca174dce4b0f4b5fd5dcca56044f8361342de780931070cff8efe43f6efa68eaf912e9ae38febfcff733f79e23018 SHA512 6beaf266058a89a78c710abd1a02feff0641a93d0d92aa07a1ad1ba3f6b3344bc312bb5a4cd5c06c6dcc83d25e48a801f9cfcfbb3de0f73904f36d32d4430482
diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild
new file mode 100644
index 0000000000..cd991afca4
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-20230101.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A small SSH server with state-of-the-art cryptography"
+HOMEPAGE="https://tinyssh.org"
+if [[ "${PV}" == "99999999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"
+else
+	SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="CC0-1.0"
+SLOT="0"
+
+IUSE="+sodium"
+
+DEPEND="
+	sodium? ( dev-libs/libsodium )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/ucspi-tcp
+"
+
+src_prepare() {
+	# Leave optimization level to user CFLAGS
+	sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die
+
+	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
+	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
+	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
+
+	default
+}
+
+src_compile() {
+	if use sodium
+	then
+		emake \
+			CC="$(tc-getCC)"
+			LIBS="-lsodium" \
+			CFLAGS="${CFLAGS} -I/usr/include/sodium" \
+			LDFLAGS="${LDFLAGS} -L/usr/lib"
+	else
+		emake CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	dosbin build/bin/tinysshd{,-makekey}
+	dobin build/bin/tinysshd-printkey
+	doman man/*
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service"
+	systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket"
+	systemd_dounit "${FILESDIR}/${PN}-makekey.service"
+}
+
+pkg_postinst() {
+	einfo "TinySSH is in beta stage, and ready for production use."
+	einfo "See https://tinyssh.org for more information."
+}
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 99c90d3e6e..cd991afca4 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="public-domain"
+LICENSE="CC0-1.0"
 SLOT="0"
 
 IUSE="+sodium"

From 08285c8c5a479dce78ca70dfac51828aee4c59e9 Mon Sep 17 00:00:00 2001
From: Mathis Winterer <mrmagic223325@fedora.email>
Date: Mon, 2 Jan 2023 00:06:47 +0100
Subject: [PATCH 04/17] dev-util/lua-language-server: Stop prestripping
 binaries, Remove direct calls to gcc, patch build scripts to respect
 CFLAGS/CXXFLAGS/LDFLAGS

Closes: https://bugs.gentoo.org/889302
Closes: https://bugs.gentoo.org/889308
Closes: https://bugs.gentoo.org/889306
Closes: https://bugs.gentoo.org/889304
Signed-off-by: Mathis Winterer <mrmagic223325@fedora.email>
---
 .../files/build.ninja.patch                   | 142 ++++++++++++++++++
 .../files/linux.ninja.patch                   |  94 ++++++++++++
 .../lua-language-server-3.6.4.ebuild          |  35 ++++-
 3 files changed, 269 insertions(+), 2 deletions(-)
 create mode 100644 dev-util/lua-language-server/files/build.ninja.patch
 create mode 100644 dev-util/lua-language-server/files/linux.ninja.patch

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
new file mode 100644
index 0000000000..49111813b5
--- /dev/null
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -0,0 +1,142 @@
+--- a/build/build.ninja	2023-01-01 23:53:30.813718024 +0100
++++ b/build/build.ninja	2023-01-01 23:04:59.011627739 +0100
+@@ -2,7 +2,7 @@
+ builddir = build
+ bin = bin
+ obj = $builddir/obj
+-cc = x86_64-pc-linux-gnu-gcc
++cc = REPLACE_ME
+ luamake = $
+     /var/tmp/portage/dev-util/lua-language-server-3.6.4/work/3rd/luamake/luamake
+ rule configure
+@@ -13,17 +13,17 @@
+     3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
+     make/code_format.lua
+ rule c_source_bee
+-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I$builddir/lua54 $
+-    -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c11 $
++    -I3rd/bee.lua/3rd/lua-seri -I$builddir/lua54 $
++    -DNDEBUG -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_bee/lua-seri.obj: c_source_bee $
+     3rd/bee.lua/3rd/lua-seri/lua-seri.c
+ rule cxx_source_bee
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -31,8 +31,8 @@
+     3rd/bee.lua/bee/nonstd/fmt/format.cc
+ build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
+ rule cxx_source_bee_1
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -56,9 +56,9 @@
+ build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
+     3rd/bee.lua/bee/utility/path_helper.cpp
+ rule cxx_source_bee_2
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
+-    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
++    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -79,26 +79,26 @@
+ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
+     3rd/bee.lua/binding/lua_time.cpp
+ rule c_source_lua
+-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
+-    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c11 $
++    -DNDEBUG -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/utf8_crt.obj: c_source_lua $
+     3rd/bee.lua/3rd/lua/utf8_crt.c
+ rule c_source_lua_1
+-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
+-    -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $
+-    $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c11 $
++    -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -o $
++    $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c
+ build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c
+ rule cxx_source_bootstrap
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
+-    -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -108,7 +108,7 @@
+     3rd/bee.lua/bootstrap/progdir.cpp
+ rule link_bootstrap
+   command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
+-    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc -s
++    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc LDFLAGS
+   description = Link    Exe $out
+ build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+     $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
+@@ -146,10 +146,10 @@
+     3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
+     /bootstrap copy_script
+ rule cxx_code_format
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
+-    -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/include $
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/EmmyLuaCodeStyle/include $
+     -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
+-    -DNDEBUG -march=native -O2 -pipe -o $out -c $in
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -274,9 +274,9 @@
+ build $obj/code_format/Utf8.obj: cxx_code_format $
+     3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
+ rule c_lpeglabel
+-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
+-    -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c11 $
++    -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
++    -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+@@ -286,9 +286,9 @@
+ build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c
+ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
+ rule cxx_lua_language_server
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
+-    -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
+-    -DNDEBUG -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
new file mode 100644
index 0000000000..a9a853ed79
--- /dev/null
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -0,0 +1,94 @@
+--- a/3rd/luamake/compile/ninja/linux.ninja	2022-11-29 13:53:05.000000000 +0100
++++ b/3rd/luamake/compile/ninja/linux.ninja	2023-01-01 22:40:43.690777107 +0100
+@@ -2,20 +2,20 @@
+ builddir = build/linux
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = gcc
++cc = REPLACE_ME
+ luamake = luamake
+ rule c_source_bee
+-  command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -Itools/lua54 -DNDEBUG $
+-    -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d $
++    -I3rd/bee.lua/3rd/lua-seri -Itools/lua54 -DNDEBUG $
++    -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_bee/lua-seri.obj: c_source_bee $
+     3rd/bee.lua/3rd/lua-seri/lua-seri.c
+ rule cxx_source_bee
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -23,8 +23,8 @@
+     3rd/bee.lua/bee/nonstd/fmt/format.cc
+ build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
+ rule cxx_source_bee_1
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -48,9 +48,9 @@
+ build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
+     3rd/bee.lua/bee/utility/path_helper.cpp
+ rule cxx_source_bee_2
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
+-    -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
++    -Itools/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -71,24 +71,24 @@
+ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
+     3rd/bee.lua/binding/lua_time.cpp
+ rule c_source_lua
+-  command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror $
+-    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d $
++    -DNDEBUG -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/utf8_crt.obj: c_source_lua $
+     3rd/bee.lua/3rd/lua/utf8_crt.c
+ rule c_source_lua_1
+-  command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror -DMAKE_LIB $
+-    -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -DMAKE_LIB $
++    -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c
+ rule cxx_source_bootstrap
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
+-    -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
++    -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -98,7 +98,7 @@
+     3rd/bee.lua/bootstrap/progdir.cpp
+ rule link_luamake
+   command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
+-    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc -s
++    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc LDFLAGS
+   description = Link    Exe $out
+ build $bin/luamake: link_luamake $obj/source_bootstrap/main.obj $
+     $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
diff --git a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
index bd99b8d38a..f0cf3d9c38 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit ninja-utils
+inherit ninja-utils toolchain-funcs
 
 DESCRIPTION="Lua language server"
 HOMEPAGE="https://github.com/sumneko/lua-language-server"
@@ -18,14 +18,45 @@ BDPEND="
 	${NINJA_DEPEND}
 	app-arch/unzip
 	dev-util/ninja
-	sys-devel/gcc
 "
 RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/linux.ninja.patch" )
+
+src_prepare() {
+	# Remove hardcoded gcc references
+	sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
+		make.lua || die
+	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
+		3rd/lpeglabel/makefile || die
+	sed -i "s/flags = \"-Wall -Werror\"/flags =\"${CXXFLAGS}\"/" \
+		make/code_format.lua || die
+	# Patch
+	default
+	# Shipped file doesn't respect CFLAGS/CXXFLAGS
+	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		3rd/luamake/compile/ninja/linux.ninja || die
+}
 
 src_compile() {
 	eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
 	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
 	./3rd/luamake/luamake init || die
+
+	eapply "${FILESDIR}/build.ninja.patch"
+
+	sed -i "s/^cc = gcc/cc = $(tc-getCC)/" \
+		build/build.ninja || die
+
+	# Generated file doesn't respect CFLAGS/CXXFLAGS
+	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		build/build.ninja || die
+
 	# Tests are broken
 	eninja -f build/build.ninja all
 }

From a7198b06e45a0a37bfa3fdcf926c83d60f3db6fd Mon Sep 17 00:00:00 2001
From: Christopher Byrne <salah.coronya@gmail.com>
Date: Sun, 1 Jan 2023 17:31:22 -0600
Subject: [PATCH 05/17] profiles: Unmask app-crypt/openssl-engine now that
 dev-libs/openssl-3 is unmasked

Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
---
 profiles/package.mask | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index e95eb0bf5c..b740486f20 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,7 +39,3 @@ dev-python/pypandoc
 # Viorel Munteanu <ceamac.paragon@gmail.com>
 # depends on dev-python/PyQt6, which is currently masked with all of qt6
 >=net-misc/maestral-qt-1.6.0
-
-# Christopher Byrne <salah.coronya@gmail.com> (2022-04-15)
-# Depends on masked dev-libs/openssl-3.0.*
-app-crypt/tpm2-openssl

From ef69becc4d3bfe19aae9f15517b98eb4180dee52 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Mon, 2 Jan 2023 05:07:07 +0500
Subject: [PATCH 06/17] www-apps/nitter: add missing dep

Closes: https://bugs.gentoo.org/889310
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 ...1.0_p20230101.ebuild => nitter-0.1.0_p20230101-r1.ebuild} | 5 +++++
 1 file changed, 5 insertions(+)
 rename www-apps/nitter/{nitter-0.1.0_p20230101.ebuild => nitter-0.1.0_p20230101-r1.ebuild} (94%)

diff --git a/www-apps/nitter/nitter-0.1.0_p20230101.ebuild b/www-apps/nitter/nitter-0.1.0_p20230101-r1.ebuild
similarity index 94%
rename from www-apps/nitter/nitter-0.1.0_p20230101.ebuild
rename to www-apps/nitter/nitter-0.1.0_p20230101-r1.ebuild
index d30ad71a4b..0aca75d6a1 100644
--- a/www-apps/nitter/nitter-0.1.0_p20230101.ebuild
+++ b/www-apps/nitter/nitter-0.1.0_p20230101-r1.ebuild
@@ -18,11 +18,16 @@ KEYWORDS="~amd64"
 RESTRICT="test"
 PROPERTIES="test_network"
 
+COMMON_DEPEND="
+	dev-libs/libpcre:3
+"
 RDEPEND="
+	${COMMON_DEPEND}
 	acct-user/nitter
 	dev-db/redis
 "
 DEPEND="
+	${COMMON_DEPEND}
 	dev-nim/flatty
 	dev-nim/jester
 	dev-nim/jsony

From c024919714f564641175846bc194621c218556c2 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Mon, 2 Jan 2023 08:59:20 +0500
Subject: [PATCH 07/17] TODO.md: add some webapps

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 TODO.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/TODO.md b/TODO.md
index 272fbb921b..8b96a242e0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,6 +4,9 @@ If you find an interesting piece of software here, consider to package it, also
 
     Name     |  Buildsystem  |    Category   |     User      |    Need help  | Dependency
 ------------ | ------------- | ------------- | ------------- | ------------- | -------------
+[Whoogle](https://github.com/benbusby/whoogle-search/) | setuptools | www | Anna | ✔ | ✖
+[SearXNG](https://docs.searxng.org/) | setuptools | www | Anna | ✔ | ✖
+[Takahe](https://jointakahe.org/) | no (django) | www | Anna | ✔ | ✖
 [couchbase](https://pypi.org/project/couchbase/) | poetry | devel | Anna | ✔ | ✔
 [pyArango](https://pypi.org/project/pyArango/) | setuptools | devel | Anna | ✔ | ✔
 [pycouchdb](https://pypi.org/project/pycouchdb/) | poetry | devel | Anna | ✔ | ✔

From 9cc8437d5cda40d28bb102a5f0d0f8f0660297a3 Mon Sep 17 00:00:00 2001
From: Sergey Alirzaev <l29ah@riseup.net>
Date: Mon, 2 Jan 2023 13:17:28 +0100
Subject: [PATCH 08/17] net-p2p/monero: update SRC_URI

Signed-off-by: Sergey Alirzaev <l29ah@riseup.net>
---
 net-p2p/monero/monero-0.18.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/monero/monero-0.18.1.2.ebuild b/net-p2p/monero/monero-0.18.1.2.ebuild
index 936805e4a7..c12461f695 100644
--- a/net-p2p/monero/monero-0.18.1.2.ebuild
+++ b/net-p2p/monero/monero-0.18.1.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://patch-diff.githubusercontent.com/raw/monero-project/monero/pull/8682.patch -> ${PN}-8682.patch"
+	https://github.com/monero-project/monero/commit/96677fffcd436c5c108718b85419c5dbf5da9df2.patch -> ${PN}-8682.patch"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 

From ca65e89eca3f06cdc823dd24ef27b910e77a29f6 Mon Sep 17 00:00:00 2001
From: Michael Egger <egger.m@protonmail.com>
Date: Mon, 2 Jan 2023 18:01:46 +0100
Subject: [PATCH 09/17] app-portage/portage-lostfiles: add 0.5.2, drop 0.2.2

Signed-off-by: Michael Egger <egger.m@protonmail.com>
---
 app-portage/portage-lostfiles/Manifest        |  2 +-
 app-portage/portage-lostfiles/metadata.xml    | 37 ++++++++++---------
 ....ebuild => portage-lostfiles-0.5.2.ebuild} |  7 ++--
 3 files changed, 24 insertions(+), 22 deletions(-)
 rename app-portage/portage-lostfiles/{portage-lostfiles-0.2.2.ebuild => portage-lostfiles-0.5.2.ebuild} (77%)

diff --git a/app-portage/portage-lostfiles/Manifest b/app-portage/portage-lostfiles/Manifest
index 2ae44a8041..dd31f2636b 100644
--- a/app-portage/portage-lostfiles/Manifest
+++ b/app-portage/portage-lostfiles/Manifest
@@ -1 +1 @@
-DIST portage-lostfiles-0.2.2.tar.gz 10618 BLAKE2B a477bafc83d5af7d29759bcaa3c09a89f678a463a94f037689bdef3e85cf3b78bdc53aed87696aa351623c6be210937f50d6f71ef588d9e27dbed061300374af SHA512 cf7b17d9cd3214616f4bb60284275172e4270180a87f4934e6ee5750e62315b2728e4fa0f930c18fc02b4b173b404fa27c3e75fca4f5ae0b740fe0c91025cb36
+DIST portage-lostfiles-0.5.2.tar.gz 12554 BLAKE2B 3562c6e0fad3fb4d41b815bf8183826875ef169c068a9c2c0e1370aadf7524ff1b1c06f3a39133f626a6bf520e4ba27e6de31e5dd66dbbbe818a1d4719266ecd SHA512 6418a8bb526e2bd62f1dda1f2f3cc715db0a3df125ccec47347fb93cba12214270d92768d2aafeac2e5487f34832a5c1abab6e0e3dde7dd4ec44bc0881af6764
diff --git a/app-portage/portage-lostfiles/metadata.xml b/app-portage/portage-lostfiles/metadata.xml
index 5daf1a7515..a09f34b3de 100644
--- a/app-portage/portage-lostfiles/metadata.xml
+++ b/app-portage/portage-lostfiles/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>egger.m@protonmail.com</email>
-		<name>Michael Egger</name>
-	</maintainer>
-	<longdescription lang="en">
-		A simple script to identify files not tracked by Portage package manager.
-			Notes:
-		Symlinks are not reported as lost as long as the link target exists and is tracked.
-		Some common paths are not reported (e.g.: /etc/group, /etc/machine-id, ...). The full whitelist is defined by WHITELIST in lostfiles.py.
-			Usage
-		git clone https://github.com/gcarq/portage-lostfiles.git
-		cd portage-lostfiles
-		$ ./lostfiles.py
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/gcarq/portage-lostfiles/issues</bugs-to>
-		<doc>https://github.com/gcarq/portage-lostfiles/blob/master/README.md</doc>
-	</upstream>
+        <maintainer type="person">
+                <email>egger.m@protonmail.com</email>
+                <name>Michael Egger</name>
+        </maintainer>
+        <longdescription lang="en">
+                A simple script to identify files not tracked by Portage package manager.
+                        Notes
+                Symlinks are not reported as lost as long as the link target exists and is tracked,
+                this is the same behavior as implemented in `equery b path`.
+                Some common paths are not reported (e.g.: `/etc/group`, `/etc/machine-id`, ...),
+                those are defined in `IGNORED_PATHS` and `PKG_PATHS` in `lostfiles.py`.
+                        Usage
+                git clone https://github.com/gcarq/portage-lostfiles.git
+                cd portage-lostfiles
+                $ ./lostfiles.py
+        </longdescription>
+        <upstream>
+               <remote-id type="github">gcarq/portage-lostfiles</remote-id>
+        </upstream>
 </pkgmetadata>
diff --git a/app-portage/portage-lostfiles/portage-lostfiles-0.2.2.ebuild b/app-portage/portage-lostfiles/portage-lostfiles-0.5.2.ebuild
similarity index 77%
rename from app-portage/portage-lostfiles/portage-lostfiles-0.2.2.ebuild
rename to app-portage/portage-lostfiles/portage-lostfiles-0.5.2.ebuild
index 06a33a36ea..6cd8a74267 100644
--- a/app-portage/portage-lostfiles/portage-lostfiles-0.2.2.ebuild
+++ b/app-portage/portage-lostfiles/portage-lostfiles-0.5.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A simple script to identify files not tracked by Portage package manager"

From 23e8e520d9b8af85911db07a906da5f458bdc570 Mon Sep 17 00:00:00 2001
From: Mathis Winterer <mrmagic223325@fedora.email>
Date: Mon, 2 Jan 2023 18:21:19 +0100
Subject: [PATCH 10/17] dev-util/lua-language-server: Switch to patches

Signed-off-by: Mathis Winterer <mrmagic223325@fedora.email>
---
 dev-util/lua-language-server/files/build.ninja.patch        | 6 +++---
 dev-util/lua-language-server/files/linux.ninja.patch        | 4 ++--
 .../lua-language-server/lua-language-server-3.6.4.ebuild    | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index 49111813b5..d736f3619a 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,5 +1,5 @@
---- a/build/build.ninja	2023-01-01 23:53:30.813718024 +0100
-+++ b/build/build.ninja	2023-01-01 23:04:59.011627739 +0100
+--- a/build/build.ninja
++++ b/build/build.ninja
 @@ -2,7 +2,7 @@
  builddir = build
  bin = bin
@@ -109,7 +109,7 @@
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
 +    -I3rd/EmmyLuaCodeStyle/include $
      -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
--    -DNDEBUG -march=native -O2 -pipe -o $out -c $in
+-    -DNDEBUG -Wall -Werror -o $out -c $in
 +    -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
index a9a853ed79..b5dbb5348e 100644
--- a/dev-util/lua-language-server/files/linux.ninja.patch
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -1,5 +1,5 @@
---- a/3rd/luamake/compile/ninja/linux.ninja	2022-11-29 13:53:05.000000000 +0100
-+++ b/3rd/luamake/compile/ninja/linux.ninja	2023-01-01 22:40:43.690777107 +0100
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
 @@ -2,20 +2,20 @@
  builddir = build/linux
  bin = $builddir/bin
diff --git a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
index f0cf3d9c38..1284b7e959 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
@@ -28,8 +28,6 @@ src_prepare() {
 		make.lua || die
 	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
 		3rd/lpeglabel/makefile || die
-	sed -i "s/flags = \"-Wall -Werror\"/flags =\"${CXXFLAGS}\"/" \
-		make/code_format.lua || die
 	# Patch
 	default
 	# Shipped file doesn't respect CFLAGS/CXXFLAGS

From 1de6840536626cf285a4ee777baeadbd73f5cabb Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 2 Jan 2023 11:50:34 -0800
Subject: [PATCH 11/17] TODO.md: Fix Markdown table rendering

A line starting with four spaces may be treated as a code block instead
of a table header.

Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 TODO.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index 8b96a242e0..b07d9be772 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,7 @@
 
 If you find an interesting piece of software here, consider to package it, also you are free to add any package you want to see in GURU
 
-    Name     |  Buildsystem  |    Category   |     User      |    Need help  | Dependency
+   Name      |  Buildsystem  |    Category   |     User      |    Need help  | Dependency
 ------------ | ------------- | ------------- | ------------- | ------------- | -------------
 [Whoogle](https://github.com/benbusby/whoogle-search/) | setuptools | www | Anna | ✔ | ✖
 [SearXNG](https://docs.searxng.org/) | setuptools | www | Anna | ✔ | ✖

From bc220fd6550fde8c544c5d2ea03fe6c04cd422b9 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Mon, 2 Jan 2023 15:48:26 -0500
Subject: [PATCH 12/17] dev-python/mistletoe: fix python tests Closes:
 https://bugs.gentoo.org/888745

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 dev-python/mistletoe/mistletoe-0.9.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-python/mistletoe/mistletoe-0.9.0.ebuild b/dev-python/mistletoe/mistletoe-0.9.0.ebuild
index 36cb00ea66..37639c19e8 100644
--- a/dev-python/mistletoe/mistletoe-0.9.0.ebuild
+++ b/dev-python/mistletoe/mistletoe-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,3 +17,5 @@ KEYWORDS="~amd64"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest

From 2ebe61bbf7a443b78414cc8ab41a9350ad17bc0e Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Mon, 2 Jan 2023 15:53:42 -0500
Subject: [PATCH 13/17] dev-python/PGPy: fix python tests Closes:
 https://bugs.gentoo.org/888743

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 dev-python/PGPy/PGPy-0.6.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-python/PGPy/PGPy-0.6.0.ebuild b/dev-python/PGPy/PGPy-0.6.0.ebuild
index b9079c6ab9..7b883db63b 100644
--- a/dev-python/PGPy/PGPy-0.6.0.ebuild
+++ b/dev-python/PGPy/PGPy-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,3 +22,5 @@ DEPEND="${RDEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest

From 031553d7cf31d8df3b89086af7e0ff6d23d10b10 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Mon, 2 Jan 2023 16:13:41 -0500
Subject: [PATCH 14/17] dev-python/orderedmultidict: fix python tests Closes:
 https://bugs.gentoo.org/888689

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 dev-python/orderedmultidict/orderedmultidict-1.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/orderedmultidict/orderedmultidict-1.0.1.ebuild b/dev-python/orderedmultidict/orderedmultidict-1.0.1.ebuild
index c0bda8e608..bbdadae46f 100644
--- a/dev-python/orderedmultidict/orderedmultidict-1.0.1.ebuild
+++ b/dev-python/orderedmultidict/orderedmultidict-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,4 +21,4 @@ RDEPEND="test? ( dev-python/flake8[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest

From a84542474f02400b50d627b958495836e4a8fa42 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Mon, 2 Jan 2023 16:14:13 -0500
Subject: [PATCH 15/17] dev-python/furl: fix python tests Closes:
 https://bugs.gentoo.org/888691

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 dev-python/furl/furl-2.1.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/furl/furl-2.1.2.ebuild b/dev-python/furl/furl-2.1.2.ebuild
index d9530e0088..8056f61f1e 100644
--- a/dev-python/furl/furl-2.1.2.ebuild
+++ b/dev-python/furl/furl-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,4 +22,4 @@ RDEPEND="test? ( dev-python/flake8[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest

From f1c6442b9f3939e01510693fd5c1afad8eff6279 Mon Sep 17 00:00:00 2001
From: Tony Olagbaiye <bqv@fron.io>
Date: Tue, 3 Jan 2023 06:29:03 +0000
Subject: [PATCH 16/17] net-misc/gnome-ssh-askpass: new package, add 9.1_p1

Signed-off-by: Tony Olagbaiye <bqv@fron.io>
---
 net-misc/gnome-ssh-askpass/Manifest           |  2 +
 .../gnome-ssh-askpass-9.1_p1.ebuild           | 64 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 net-misc/gnome-ssh-askpass/Manifest
 create mode 100644 net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild

diff --git a/net-misc/gnome-ssh-askpass/Manifest b/net-misc/gnome-ssh-askpass/Manifest
new file mode 100644
index 0000000000..ee2d796698
--- /dev/null
+++ b/net-misc/gnome-ssh-askpass/Manifest
@@ -0,0 +1,2 @@
+DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 SHA512 a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70
+DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74 SHA512 47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd
diff --git a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
new file mode 100644
index 0000000000..a17b5e22c7
--- /dev/null
+++ b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs verify-sig
+
+PARCH=openssh-9.1p1
+
+DESCRIPTION="GTK-based passphrase dialog for use with OpenSSH"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="gtk2 +gtk3 verify-sig"
+REQUIRED_USE="|| ( gtk2 gtk3 )"
+
+RESTRICT="test"
+
+DEPEND="
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+src_unpack() {
+	default
+
+	# We don't have signatures for HPN, X509, so we have to write this ourselves
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
+}
+
+src_configure() {
+	true
+}
+
+src_compile() {
+	pushd contrib
+
+	use gtk2 && emake gnome-ssh-askpass2
+	use gtk3 && emake gnome-ssh-askpass3
+
+	popd
+}
+
+src_install() {
+	use gtk2 && ( dobin contrib/gnome-ssh-askpass2; \
+		echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass2'" > "${T}/99gnome_ssh_askpass" \
+		|| die "envd file creation failed" )
+
+	use gtk3 && ( dobin contrib/gnome-ssh-askpass3; \
+		echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass3'" > "${T}/99gnome_ssh_askpass" \
+		|| die "envd file creation failed" )
+
+	doenvd "${T}"/99gnome_ssh_askpass
+}

From 68b35832817cc0e2868603504fc81288c93a5758 Mon Sep 17 00:00:00 2001
From: Tony Olagbaiye <bqv@fron.io>
Date: Tue, 3 Jan 2023 07:23:58 +0000
Subject: [PATCH 17/17] net-misc/gnome-ssh-askpass: minor corrections

Signed-off-by: Tony Olagbaiye <bqv@fron.io>
---
 .../gnome-ssh-askpass-9.1_p1.ebuild           | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
index a17b5e22c7..4de717ec43 100644
--- a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
+++ b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
@@ -22,10 +22,11 @@ REQUIRED_USE="|| ( gtk2 gtk3 )"
 
 RESTRICT="test"
 
-DEPEND="
+RDEPEND="
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-openssh )
@@ -43,22 +44,24 @@ src_configure() {
 }
 
 src_compile() {
-	pushd contrib
+	pushd contrib || die
 
 	use gtk2 && emake gnome-ssh-askpass2
 	use gtk3 && emake gnome-ssh-askpass3
 
-	popd
+	popd || die
 }
 
 src_install() {
-	use gtk2 && ( dobin contrib/gnome-ssh-askpass2; \
-		echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass2'" > "${T}/99gnome_ssh_askpass" \
-		|| die "envd file creation failed" )
+	if use gtk2; then
+		dobin contrib/gnome-ssh-askpass2;
+	fi
 
-	use gtk3 && ( dobin contrib/gnome-ssh-askpass3; \
-		echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass3'" > "${T}/99gnome_ssh_askpass" \
-		|| die "envd file creation failed" )
+	if use gtk3; then
+		dobin contrib/gnome-ssh-askpass3;
+	fi
 
-	doenvd "${T}"/99gnome_ssh_askpass
+	newenvd - 99gnome_ssh_askpass <<-EOF
+	export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass$(usex gtk3 3 2)'
+	EOF
 }