8 files changed, 369 insertions, 9 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d5462674b976..82ea732782dc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 0dc7c1a32985..be876373d743 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,7 +1,9 @@
 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
+DIST iputils-20231222.tar.xz 445548 BLAKE2B a76d4e9741c4ce8d2a2b6337873400543c5bb51d61a794fdfed8c8f4228c41020f5203c8af7ca44a36877d246d4f67019d31f1a58e48c6fca7964d6ebc9d764b SHA512 33e1eb6d90d43909b23bc8f3ef2f349e6655deefe1d9d51880705e8e84674a82ed6721c805cec18f188667d83577e701d39ff515f9406d16eaadc64c4bc28221
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
 EBUILD iputils-20211215.ebuild 4754 BLAKE2B f5e6b11dcf1642695fb3fe8be537a5df04359d397c28f7a86fff5b11c8dc37743597df22721d41bdd8c45f3f06f76325c236e3159602b15bc8cd1200d3389c41 SHA512 aa0565d5645f4acba4bfa3ca6d425e2538922ec9f3405ba1f4542941e7f21f5399e8709b71d76292a927109911226cdaa2be56ad63b62006e59a759556747bd5
 EBUILD iputils-20221126-r1.ebuild 3185 BLAKE2B 65869e38c722027f8ac43639b54862d04a1bb98c2c3758488fd73de25071100595c3cd83220efa0e076297f90af62b475868ed7a8b759c1a50f8e89f2aadded0 SHA512 2e4e741c9ff0c44699c491474f6a201ec95a4f0753bb3f45f48ddd55c3342da4afb2ca8a7a71a7467b4a6e025dc1c1a3661c98c2abc71e4dae04027b2a3d32a0
-EBUILD iputils-99999999.ebuild 3193 BLAKE2B 522e0a2988c3c2dc78f5e490478940bf1b288b12789a259c69933b2ad85dfaea9a9ba6672d17f0e4b526a08f63c4a47a6fb17f45846c29a92a056ff793bdb7db SHA512 f86c0b24ee292ef655f869fa6bf666c1a8963be6ce948598f8506d4f7d1f67c04b40834d8f9e7886e48b7fe548336bf4f453c94549c194607ed3846878020b5b
+EBUILD iputils-20231222.ebuild 3305 BLAKE2B 5fe4b2ef96db361f3e71da7b52acb167ddf6683787083cc7f7d266ef0acf5e5ed8894c632a2c28d26e6c1a9e9ed7484217487495154a887f1f1f62fd7e4efc09 SHA512 5e9a771ff13b5378361960f37411970681960ccc1d4c8499f21f3bf7fd5fbbba17b76dd8680e2ac19d816141f753cfb6b6ce3152a7d123ce85a644d207390f17
+EBUILD iputils-99999999.ebuild 3305 BLAKE2B 5fe4b2ef96db361f3e71da7b52acb167ddf6683787083cc7f7d266ef0acf5e5ed8894c632a2c28d26e6c1a9e9ed7484217487495154a887f1f1f62fd7e4efc09 SHA512 5e9a771ff13b5378361960f37411970681960ccc1d4c8499f21f3bf7fd5fbbba17b76dd8680e2ac19d816141f753cfb6b6ce3152a7d123ce85a644d207390f17
 MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/iputils-20231222.ebuild b/net-misc/iputils/iputils-20231222.ebuild
new file mode 100644
index 000000000000..2ca11e44d741
--- /dev/null
+++ b/net-misc/iputils/iputils-20231222.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
+
+inherit fcaps meson plocale systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+# We install ping unconditionally so BSD is listed by itself
+# See LICENSE on each release, it summaries per-component
+LICENSE="
+	BSD
+	arping? ( GPL-2+ )
+	clockdiff? ( BSD )
+	tracepath? ( GPL-2+ )
+"
+SLOT="0"
+IUSE="+arping caps clockdiff doc idn nls test tracepath"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	caps? ( sys-libs/libcap )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sys-apps/iproute2 )
+	nls? ( sys-devel/gettext )
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	"
+fi
+
+src_prepare() {
+	default
+
+	plocale_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-DUSE_CAP=$(usex caps true false)
+		-DUSE_IDN=$(usex idn true false)
+		-DBUILD_ARPING=$(usex arping true false)
+		-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
+		-DBUILD_PING=true
+		-DBUILD_TRACEPATH=$(usex tracepath true false)
+		-DNO_SETCAP_OR_SUID=true
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		-DUSE_GETTEXT=$(usex nls true false)
+		$(meson_use !test SKIP_TESTS)
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=$(usex doc true false)
+			-DBUILD_MANS=true
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	tc-export CC
+
+	meson_src_compile
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Tests require root privileges. Skipping ..."
+		return
+	fi
+
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	FILECAPS=( cap_net_raw usr/bin/ping )
+	use arping && FILECAPS+=( usr/bin/arping )
+	use clockdiff && FILECAPS+=( usr/bin/clockdiff )
+
+	dosym ping /usr/bin/ping4
+	dosym ping /usr/bin/ping6
+
+	if use tracepath ; then
+		dosym tracepath /usr/bin/tracepath4
+		dosym tracepath /usr/bin/tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath4.8
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use doc ; then
+		mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+}
+
+pkg_preinst() {
+	local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+	if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+		HAD_TFTPD_VERSION=1
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+		ewarn "This upstream version (>= 20211215) drops two tools:"
+		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+		ewarn "Please install one of the listed alternatives if needed!"
+	fi
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index f1fd401dbdc4..2ca11e44d741 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -40,16 +40,21 @@ DEPEND="
 	virtual/os-headers
 "
 BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-ns-stylesheets
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	virtual/pkgconfig
 	test? ( sys-apps/iproute2 )
 	nls? ( sys-devel/gettext )
 "
 
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	"
+fi
+
 src_prepare() {
 	default
 
@@ -68,10 +73,15 @@ src_configure() {
 		-Dsystemdunitdir=$(systemd_get_systemunitdir)
 		-DUSE_GETTEXT=$(usex nls true false)
 		$(meson_use !test SKIP_TESTS)
-		-DBUILD_HTML_MANS=$(usex doc true false)
-		-DBUILD_MANS=true
 	)
 
+	if [[ ${PV} == 9999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=$(usex doc true false)
+			-DBUILD_MANS=true
+		)
+	fi
+
 	meson_src_configure
 }
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 61dd64a98110..09af191b14f0 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -10,5 +10,6 @@ DIST stunnel-5.71.tar.gz 895646 BLAKE2B d323363c7bfdd6c0b7931b84a6069cf9a8337e96
 EBUILD stunnel-5.64-r2.ebuild 2914 BLAKE2B 3983e2163da5f52ac0515eaf28ebe7d993a8c665ffbdd20f9823b57427a1409d5f1065903d503ee13f17b54cf3a12600f8bbe5b1a6e9d34e873dcf090da41ceb SHA512 6a3a22bbd63ee234a280df39dd97245b40dd8a4420e3956d32f8f1a2617fb6edcc2cbc7149734a515c750b98b747960212acd5ace9fd4a6c6e6ed02a836bdc12
 EBUILD stunnel-5.65-r2.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58
 EBUILD stunnel-5.68.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58
+EBUILD stunnel-5.71-r1.ebuild 3710 BLAKE2B 480a72356d41f646cd8f9912bf9a600f680ffbf6c9746129400599d02f279846da3dfddf36a88ded48ef94494bc35e05deb12a13a787334b16e26db35275f9b9 SHA512 1aae77aef0563917ce6b4c86664c2c7fd26917a7a8af9953280da0241449a39c9f1704a3e123b30b7bc33c49b6fd4b908a895a5d5b8c4e5af9d68a217feb159f
 EBUILD stunnel-5.71.ebuild 3548 BLAKE2B 4d59dc621b9add01f2d01941bd26d2abcc46c9467d53b601c3da4bafff22313e91c3dea1d5af0fc7601746fd1d1291b37eecb8812bbd22eb0cb7d95cf9130e4b SHA512 8e746f3772fd259f2d2b4afcecde76849ccb8c42de83ca485de1a742db6e3e4c58558ee219f5f09c05b7ed7759030b10396efd849aa1da75cf96dc79ddfe3d29
 MISC metadata.xml 712 BLAKE2B abb0d57cf71591afbd71b86118435b149bb2a12ade506bac04e93fc0a334c7c458e58be0d428343582aa5738f2062307206bbfe4b79a809ab09e0e69e673459c SHA512 c6538a699b0135a536a8df4ab8355d7a8ca0ed25ff32e822a2e27dfdd896a2ba4b2a5398b75f692bcf5e77a88f9c64af358c14fdbaab213cafad882cb3f0deb3
diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild b/net-misc/stunnel/stunnel-5.71-r1.ebuild
new file mode 100644
index 000000000000..a68b9b329299
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-any-r1 ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="selinux stunnel3 systemd tcpd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:=
+	tcpd? ( sys-apps/tcp-wrappers )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/stunnel
+	acct-group/stunnel
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+# autoconf-archive for F_S patch
+BDEPEND="
+	sys-devel/autoconf-archive
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/cryptography[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.71-dont-clobber-fortify-source.patch
+	"${FILESDIR}"/${PN}-5.71-respect-EPYTHON-for-tests.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.am || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel || die
+
+	# We pass --disable-fips to configure, so avoid spurious test failures
+	rm tests/plugins/p10_fips.py tests/plugins/p11_fips_cipher.py || die
+
+	# Needed for FORTIFY_SOURCE patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+		$(use_enable tcpd libwrap)
+		$(use_enable systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 || die
+
+	if ! use stunnel3 ; then
+		rm -f "${ED}"/usr/bin/stunnel3 || die
+	fi
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	tmpfiles_process stunnel.conf
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index dbd6bbdd2f52..2c6ce5621da5 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1,4 +1,6 @@
 DIST Tuba-0.5.0.gh.tar.gz 1022753 BLAKE2B d17fed8b93d217a26ad38e3a0a1e576e34b309e80e445dab7054c999eadd78ed579a81af3971ecbe3cdb5f29ea7fd0ae60c2fbcd65b5591a375ad2e38c476d87 SHA512 220cd905d82711dd915bb8dfebb9ca8d840cca3ca707cea0bc1b0b78c27dc2fbf37e779ebfeb4aff123bcda4d2b59786169f8645585868498cca2bb7a87904f1
+DIST Tuba-0.6.0.gh.tar.gz 1098534 BLAKE2B 249b58d21683870f4fa67d19dd729de9f863b105d4798d7db06845a27c2639724393a4843793da0df77c17c528606edb9307a9cace1b3ad5c35bee93a664e174 SHA512 f578e17381d282848ea0dd10e9c9c65680be8f29bb8277e7f6afb5e2a855f5189e5db34f5db14ea88b57265d6d1911eb64db75510ea102de6cb16a4202c64f9d
 EBUILD tuba-0.5.0.ebuild 1433 BLAKE2B 22fd47cfe7f83efd265d49840b66f96cb9d7ee2c8508efe9edce14b0d896b113bb3491e0a03d0d121d2fa966d7c04b10a761a1e00490228557741bdf2491ff84 SHA512 57875c76cb2c31b8e100969fc914fd40b3f665ae0e8290f961cd75fc5c2e5d9c5ac64c540063098075881643e85bc0bfd3ea18c158e61b1d17177ff5bc1c0dbc
+EBUILD tuba-0.6.0.ebuild 1421 BLAKE2B 6dd09f14ca7d41dd77539266d0674d76dcb4be73a02596c050221d771b061aec9e721f3c173507b994351c58b9d81b78d3591b77fb26b9e6ef8d827244a0163c SHA512 686d7c4243c8faf9dea11be6ad43ea4e998b1361cdb8b5127e0f9a8096b1af10357ac08b32f8fb64b0915f72fa83098f65b662000a2a8dd9739a5d044d44db94
 EBUILD tuba-9999.ebuild 1333 BLAKE2B a4a69c1e5c9d87edd6942573d6d00de2020a62a708eb7bb1ad14da9483305bb97de0688c70a2e59062effaabfae2b85ff7575a695c7051666574cf68ed147ca9 SHA512 d377b9123527ae2f9362bbe5ad6695851e8fd48e95e76d3002ed69c5a6c1ee24d8bcd71fa456744de90d7d4b4966e80b8ed55774e6a5f60a0c2a55f9fd363129
 MISC metadata.xml 324 BLAKE2B b9364b6c365bfaeda33ec6e0600582271501e80f0af0c075545a9d577e823bc4ce35ec37903f2f7f1f22c016b6bb0e7c40ef7d9ba8882fb924a865491bbb8dc7 SHA512 867574ad6665a12cb09aa75c525de101955dabdea5b744e688ab0b7214482ca5d151ed2007c5b050fbc69c48205fdbe5784aea0cb7ebce455d785200048b0a41
diff --git a/net-misc/tuba/tuba-0.6.0.ebuild b/net-misc/tuba/tuba-0.6.0.ebuild
new file mode 100644
index 000000000000..1f835348cda9
--- /dev/null
+++ b/net-misc/tuba/tuba-0.6.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson optfeature vala
+
+MY_P=${P^}
+DESCRIPTION="Browse the Fediverse (GTK client)"
+HOMEPAGE="
+	https://tuba.geopjr.dev/
+	https://github.com/GeopJr/Tuba/
+"
+SRC_URI="
+	https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# TODO: optional dep on libspelling-1
+DEPEND="
+	app-crypt/libsecret[introspection]
+	>=dev-libs/glib-2.76.0:2
+	>=dev-libs/json-glib-1.4.4[introspection]
+	>=dev-libs/libgee-0.8.5:0.8[introspection]
+	dev-libs/libxml2
+	>=gui-libs/gtk-4.11.3:4[gstreamer,introspection]
+	>=gui-libs/libadwaita-1.4:1[introspection,vala]
+	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
+	net-libs/libsoup:3.0[introspection]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	$(vala_depend)
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		# disable calling updaters (see pkg_post*)
+		-Ddistro=true
+	)
+
+	vala_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dosym dev.geopjr.Tuba /usr/bin/tuba
+}
+
+pkg_postinst() {
+	optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
+
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}