[gentoo-commits] repo/gentoo:master commit in: app-shells/atuin/

["Florian Schmaus" <flow@gentoo.org>]

commit:     d8cda4beebb8cf112236181810e3b0ea71094243
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 13:24:52 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 13:26:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8cda4be

app-shells/atuin: backport build fix, s/self-hosted/server/ USE, other fixes

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-shells/atuin/Manifest            |  1 +
 app-shells/atuin/atuin-16.0.0.ebuild | 22 +++++++++++++++-------
 app-shells/atuin/metadata.xml        |  4 +++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app-shells/atuin/Manifest b/app-shells/atuin/Manifest
index a31d26acd42a..36281abab4ea 100644
--- a/app-shells/atuin/Manifest
+++ b/app-shells/atuin/Manifest
@@ -9,6 +9,7 @@ DIST async-trait-0.1.58.crate 26783 BLAKE2B 6ea40439b0d57169ae3346f4cc3b57322be7
 DIST atoi-1.0.0.crate 7768 BLAKE2B d7505c494a249e83eb7f5fb52815f29382d1c44a56938afe510ee7a23684fa7c19fc96347390c3f32a13e0a45993d705e3d3e85e51d9c4fbc7615c17493b28af SHA512 25c0aa22ec31d8c8a254dd9403eb08b719ecc1101df48ba1a39b273a53e95f2e4f224ead0465a7fdaec910497a485863674da7e8b68081de4b991c4196af2a23
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST atuin-15.0.0.tar.gz 1558068 BLAKE2B 0e746d8676f0689aeaf2614010a18d0f225bd28408ef1fc1dc2185bcdb92d0beaba218b300ef5d3a2946c3fafe64fd31f3f3e8524799d0a4b74eb765e64e9c7f SHA512 9b3ae7c400707c522750126136d5f95d9ab3e9ab6469557b26783cd02d11e15e5a86a5e7eb50ea6c09c417583f58fff0fe4589ab048893c1ece3cf163201c942
+DIST atuin-16.0.0-fix-client-only-builds.patch 1947 BLAKE2B cb434327e0acb88ed25b2752cac62d3e571a9e52e8e85dfa1959e6aaca5d73940f201eaa21f4b4da4e6abcd07aabfeaf5075e03d9c75fe10877bc1d5e793e81a SHA512 165b8b19fc63fd228919b22ef8d1589eb7792add1ba3dadba90c95817e72a38d57fb412c59486232d97ebd0307fea45630574c04beec26adf39cd64759010653
 DIST atuin-16.0.0.tar.gz 2760413 BLAKE2B 84bf4f27d5918d83d3576ba8370008f66eb4f38a00b5a744ac60db2f081d07cbd769249a8bfc807dcfda1cd876b0331947d2184faf6751331c4b3e3a58c0b8bd SHA512 c67b4c07e668dafd992552872c1fb9fdfd676bfcb653aa6103087e3245e780f02d07b1d9a7f195480c289b78340ec0212aa02030cff5cd16f997da77e06eff38
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST axum-0.6.4.crate 135322 BLAKE2B a38c423a34a5393c116b82fc9729b0700200a73e58b3dd7d7030903f4db53c577c6ac9a8422c91a416560026b6af39ed484e62db6029f30f6778dab9f08ed163 SHA512 1df1220342c72de24e4adea84c67f236a3410d1b8919f99f0581a80a0372751a275bd97a662f66b7a2a623eb3341b9a869dd9d52d3347270a85a93f0f7e2e00e

diff --git a/app-shells/atuin/atuin-16.0.0.ebuild b/app-shells/atuin/atuin-16.0.0.ebuild
index 29b34dd289b5..0bf3cff6081f 100644
--- a/app-shells/atuin/atuin-16.0.0.ebuild
+++ b/app-shells/atuin/atuin-16.0.0.ebuild
@@ -359,6 +359,8 @@ HOMEPAGE="https://github.com/atuinsh/atuin"
 SRC_URI="
 	https://github.com/atuinsh/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	${CARGO_CRATE_URIS}
+	https://github.com/atuinsh/atuin/commit/613218f0d80e7dd9bd688d6a30d06d33fd83d0c4.patch ->
+		${PN}-16.0.0-fix-client-only-builds.patch
 "
 
 LICENSE="MIT"
@@ -366,8 +368,11 @@ LICENSE="MIT"
 LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="self-hosting"
-
+IUSE="+client server +sync"
+REQUIRED_USE="
+	|| ( client server )
+	sync? ( client )
+"
 BDEPEND=">=virtual/rust-1.71.0"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
@@ -378,11 +383,15 @@ DOCS=(
 	docs/docs
 )
 
+PATCHES=(
+	"${DISTDIR}/${PN}-16.0.0-fix-client-only-builds.patch"
+)
+
 src_configure() {
 	local myfeatures=(
-		client
-		sync
-		$(usex self-hosting server "")
+		$(usev client)
+		$(usev server)
+		$(usev sync)
 	)
 	cargo_src_configure --no-default-features
 }
@@ -407,8 +416,7 @@ src_install() {
 	exeinto "/usr/bin"
 	doexe "${ATUIN_BIN}"
 
-	if ! use self-hosting
-	then
+	if ! use server; then
 		rm -r "docs/docs/self-hosting" || die
 	fi
 

diff --git a/app-shells/atuin/metadata.xml b/app-shells/atuin/metadata.xml
index 0f7efc4465d6..60336a277862 100644
--- a/app-shells/atuin/metadata.xml
+++ b/app-shells/atuin/metadata.xml
@@ -14,7 +14,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="self-hosting">Build the feature to self-host a sync server</flag>
+		<flag name="client">Enable the autin client</flag>
+		<flag name="server">Enable the autin server</flag>
+		<flag name="sync">Enable the server-sync feature in the autin client</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">atuinsh/atuin</remote-id>