[gentoo-commits] repo/proj/guru:master commit in: app-misc/xplr/

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

commit:     1cc122c65b90ef807a014fc0cfe4f7a4ddc0bf4d
Author:     Luciano Degni <degni.public <AT> gmail <DOT> com>
AuthorDate: Tue Jan  4 13:27:24 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 13:27:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1cc122c6

app-misc/xplr: fixed build in all ebuilds

Signed-off-by: Luciano Degni <degni.public <AT> gmail.com>

 app-misc/xplr/xplr-0.15.2.ebuild | 22 +++++++++++++++-------
 app-misc/xplr/xplr-0.17.0.ebuild | 22 +++++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app-misc/xplr/xplr-0.15.2.ebuild b/app-misc/xplr/xplr-0.15.2.ebuild
index ae20f4617..b40379f94 100644
--- a/app-misc/xplr/xplr-0.15.2.ebuild
+++ b/app-misc/xplr/xplr-0.15.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+LUA_COMPAT=( luajit )
+
 CRATES="
 	ansi-to-tui-0.4.1
 	anyhow-1.0.51
@@ -129,7 +131,7 @@ CRATES="
 	yaml-rust-0.4.5
 "
 
-inherit cargo
+inherit cargo flag-o-matic desktop lua-single
 
 DESCRIPTION="A hackable, minimal, fast TUI file explorer"
 # Double check the homepage as the cargo_metadata crate
@@ -153,18 +155,24 @@ LICENSE="
 SLOT="0"
 KEYWORDS="~amd64"
 
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RDEPEND="
+	${LUA_DEPS}
+"
 DEPEND="
-	dev-vcs/git
-	sys-devel/make
-	sys-devel/gcc
+	${RDEPEND}
 "
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
 src_configure() {
-	cargo_src_configure --locked --bin xplr
-	sed "s:\$(CROSS)::g" -i ../cargo_home/gentoo/luajit-src-210.3.2+resty1085a4d/luajit2/src/Makefile || die
+	cargo_src_configure --bin xplr
+}
 
+src_prepare() {
+	sed -i Cargo.toml -e 's/"vendored"\s*,//' || die
+	# for dynamic linking with lua
+	default
 }
 
 src_compile() {

diff --git a/app-misc/xplr/xplr-0.17.0.ebuild b/app-misc/xplr/xplr-0.17.0.ebuild
index ae20f4617..b40379f94 100644
--- a/app-misc/xplr/xplr-0.17.0.ebuild
+++ b/app-misc/xplr/xplr-0.17.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+LUA_COMPAT=( luajit )
+
 CRATES="
 	ansi-to-tui-0.4.1
 	anyhow-1.0.51
@@ -129,7 +131,7 @@ CRATES="
 	yaml-rust-0.4.5
 "
 
-inherit cargo
+inherit cargo flag-o-matic desktop lua-single
 
 DESCRIPTION="A hackable, minimal, fast TUI file explorer"
 # Double check the homepage as the cargo_metadata crate
@@ -153,18 +155,24 @@ LICENSE="
 SLOT="0"
 KEYWORDS="~amd64"
 
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RDEPEND="
+	${LUA_DEPS}
+"
 DEPEND="
-	dev-vcs/git
-	sys-devel/make
-	sys-devel/gcc
+	${RDEPEND}
 "
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
 src_configure() {
-	cargo_src_configure --locked --bin xplr
-	sed "s:\$(CROSS)::g" -i ../cargo_home/gentoo/luajit-src-210.3.2+resty1085a4d/luajit2/src/Makefile || die
+	cargo_src_configure --bin xplr
+}
 
+src_prepare() {
+	sed -i Cargo.toml -e 's/"vendored"\s*,//' || die
+	# for dynamic linking with lua
+	default
 }
 
 src_compile() {