gentoo auto-resync : 29:01:2024 - 00:57:18

5 files changed, 54 insertions, 6 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index abcf2553e48a..1408b8c8d449 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest
index 6676ad92b14d..6611848693a5 100644
--- a/www-apps/ttyd/Manifest
+++ b/www-apps/ttyd/Manifest
@@ -2,6 +2,7 @@ AUX ttyd.confd 2351 BLAKE2B 971fa19f54c194c3791a464d065ac1c4074bf8d1b16170704b87
 AUX ttyd.initd 308 BLAKE2B 9d78f775a0e529d55cddfd92488829d2aa79f2321b5f70c54649a8a6faeffb0ceaa899cf19187c6b51919092348659cb1d930bf144921dab65e1f007c6ef0054 SHA512 a955068ab20f06165c10af89ae7e02c38f24247f7b7a5aa86da38cf4361555c6bb009a76e34d1ff6fb41df2555d91d42bc1494a2324c30a89098fdf312015e35
 AUX ttyd.service 155 BLAKE2B 6be520f7b88c5e8b7e6dada0a923eff285743d5b97c995fc924da153d70641e0706b86a5a91bc6d2054ced4f1044a12584108262b916b948250cdbf092094aec SHA512 381d9dd122b7aca028e813e5369d8a8260165483e1c232ca1f6614d8d5d7bba069102c754c61813496461ce5c038a0ef7564026ea4373d7b5579af8b64995cf6
 DIST ttyd-1.7.4.tar.gz 603483 BLAKE2B 745ad302fdf17f31d941d3ae4b69b70257f87f3b6d624f3678e83269901577370fc6296726d8b2c61e94469f9970257b1192bcc2299fb0855bd0f3ea5960a498 SHA512 bbaa56389c224db9438b6dcce696deb0eeedfdf9b3a68cbc4c01c155340f71558e1d90c3fabe9a52de180728792b8dc7deed0c3512acdc246d651270d7fb82c6
+EBUILD ttyd-1.7.4-r1.ebuild 900 BLAKE2B 1955a0d153468c3b54de22e34f5ea0c69994abfa1e8ddf9a893963530c4c06ec9570289fbe23927f629a6e7d0d8957e5a9da57402f08842d62f5e5098d5ecc90 SHA512 141ef4de093a5afdf3aa491b358511faecc82aeb5c3c7d7ada4432d9d059fa92644231a7410b0d036bb8868b230cac0aae6d9126f6fb17c3e21c6f46e313091c
 EBUILD ttyd-1.7.4.ebuild 863 BLAKE2B efddecfbf8ac314ebcbec3d3d9ae342eca075600952d8ce891be7b8678e56bee5bba4bb21cc2df7d5780f1e8c1d1456f9b377e570f59cb27e0dfc27386843c17 SHA512 735e0e199ae715b75971fc328b55361b288babc45c1a40f3b7055765de7fce6f3e112f597d623de2edea4610f957f825f455537d81b8501cf19fee2aac890a45
-EBUILD ttyd-9999.ebuild 864 BLAKE2B 2349ccfc0bfb56699ec7b1a30f3e15d6825e33df6d751bdb0adb8b475e044f7fe0c1b255f94610f8000f1c8724ffc6634469951e0522fad4b6a8ee086a7058da SHA512 59b3e6aac334d3ac88ede9aca1e65356742817c631274ea08033730d1a1b203b35147ef9c90da6811201e0635ca07c57f7156740cfdb9d389d838263d3785ac9
-MISC metadata.xml 295 BLAKE2B 013599ca9cf89c3ca42d5adeea70d32f852bf090085eba9525ccfd3e1af91df4235eaebc252ac2d4c1474cd27a15a5fc5a735196979acb73d3ca3a9f2ed090d0 SHA512 8b4defd8be6208c50bba2dc4902d1b4c10bfa4bb4ef255e5736ca9f20f9f7a476c53f6f4cdfa47d839791fe7fda79128ce975592ca400b94e250ad2f9663295c
+EBUILD ttyd-9999.ebuild 900 BLAKE2B 1955a0d153468c3b54de22e34f5ea0c69994abfa1e8ddf9a893963530c4c06ec9570289fbe23927f629a6e7d0d8957e5a9da57402f08842d62f5e5098d5ecc90 SHA512 141ef4de093a5afdf3aa491b358511faecc82aeb5c3c7d7ada4432d9d059fa92644231a7410b0d036bb8868b230cac0aae6d9126f6fb17c3e21c6f46e313091c
+MISC metadata.xml 415 BLAKE2B b9b9c89804921cc4d79c3392e5d01a249135c875d325acb117e6e11f60a7e1132408c06a1a6818e8cb8da1e7bfa8e373f7a7ef0a4db2ea02c83ca703530720f5 SHA512 20e06608cc9be5bc06ca0b0627a5dfa0b653b23d39a1c4834df77582cee26bcc45f064aa17e5dd8ed87f75479227c3f85b847f574010b68715c618e7e41dfad5
diff --git a/www-apps/ttyd/metadata.xml b/www-apps/ttyd/metadata.xml
index cbc3ff79c423..6941e9b4ef09 100644
--- a/www-apps/ttyd/metadata.xml
+++ b/www-apps/ttyd/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="person">
 		<email>mpagano@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="mbedtls" restrict="&gt;=www-apps/ttyd-1.7.4-r1">Use mbedTLS replacement for OpenSSL</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">tsl0922/ttyd</remote-id>
 	</upstream>
diff --git a/www-apps/ttyd/ttyd-1.7.4-r1.ebuild b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild
new file mode 100644
index 000000000000..3fdbd114e567
--- /dev/null
+++ b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+MY_PV="$(ver_rs 3 '-')"
+
+DESCRIPTION="ttyd, a simple command-line tool for sharing terminal over the web"
+HOMEPAGE="https://github.com/tsl0922/ttyd"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/tsl0922/ttyd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tsl0922/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="mbedtls"
+
+DEPEND="
+	dev-libs/json-c:=
+	dev-libs/libuv:=
+	net-libs/libwebsockets:=[libuv,mbedtls=,ssl]
+	sys-libs/zlib:=
+	!mbedtls? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/www-apps/ttyd/ttyd-9999.ebuild b/www-apps/ttyd/ttyd-9999.ebuild
index adbcac55b7f7..3fdbd114e567 100644
--- a/www-apps/ttyd/ttyd-9999.ebuild
+++ b/www-apps/ttyd/ttyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,20 +20,22 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="mbedtls"
 
 DEPEND="
 	dev-libs/json-c:=
 	dev-libs/libuv:=
-	net-libs/libwebsockets:=[libuv,ssl]
+	net-libs/libwebsockets:=[libuv,mbedtls=,ssl]
 	sys-libs/zlib:=
+	!mbedtls? ( dev-libs/openssl:= )
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_install() {
-	dobin ../${P}_build/${PN}
-	doman man/*.1
+	cmake_src_install
+
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	systemd_dounit "${FILESDIR}"/${PN}.service