commit: d19cb57201ce6c6ea4a7da5646cd02a9a8b579fa Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Sun Jan 21 09:38:56 2024 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sun Jan 28 22:42:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19cb572
www-apps/ttyd: fix deps and install 1. Unless 'net-libs/libwebsockets[mbedtls]' is installed, ttyd links with 'dev-libs/openssl:=', so dependency on it should be added. 2. Use 'cmake_src_install' to install the binary and manpage. Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> Closes: https://github.com/gentoo/gentoo/pull/34937 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> www-apps/ttyd/metadata.xml | 3 +++ www-apps/ttyd/{ttyd-9999.ebuild => ttyd-1.7.4-r1.ebuild} | 10 ++++++---- www-apps/ttyd/ttyd-9999.ebuild | 10 ++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) 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>[email protected]</email> </maintainer> + <use> + <flag name="mbedtls" restrict=">=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-9999.ebuild b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild similarity index 83% copy from www-apps/ttyd/ttyd-9999.ebuild copy to www-apps/ttyd/ttyd-1.7.4-r1.ebuild index adbcac55b7f7..3fdbd114e567 100644 --- a/www-apps/ttyd/ttyd-9999.ebuild +++ b/www-apps/ttyd/ttyd-1.7.4-r1.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 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
