| 1 |
commit: 1cc122c65b90ef807a014fc0cfe4f7a4ddc0bf4d |
| 2 |
Author: Luciano Degni <degni.public <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jan 4 13:27:24 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 4 13:27:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1cc122c6 |
| 7 |
|
| 8 |
app-misc/xplr: fixed build in all ebuilds |
| 9 |
|
| 10 |
Signed-off-by: Luciano Degni <degni.public <AT> gmail.com> |
| 11 |
|
| 12 |
app-misc/xplr/xplr-0.15.2.ebuild | 22 +++++++++++++++------- |
| 13 |
app-misc/xplr/xplr-0.17.0.ebuild | 22 +++++++++++++++------- |
| 14 |
2 files changed, 30 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/xplr/xplr-0.15.2.ebuild b/app-misc/xplr/xplr-0.15.2.ebuild |
| 17 |
index ae20f4617..b40379f94 100644 |
| 18 |
--- a/app-misc/xplr/xplr-0.15.2.ebuild |
| 19 |
+++ b/app-misc/xplr/xplr-0.15.2.ebuild |
| 20 |
@@ -1,8 +1,10 @@ |
| 21 |
-# Copyright 2021-2022 Gentoo Authors |
| 22 |
+# Copyright 2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=8 |
| 26 |
|
| 27 |
+LUA_COMPAT=( luajit ) |
| 28 |
+ |
| 29 |
CRATES=" |
| 30 |
ansi-to-tui-0.4.1 |
| 31 |
anyhow-1.0.51 |
| 32 |
@@ -129,7 +131,7 @@ CRATES=" |
| 33 |
yaml-rust-0.4.5 |
| 34 |
" |
| 35 |
|
| 36 |
-inherit cargo |
| 37 |
+inherit cargo flag-o-matic desktop lua-single |
| 38 |
|
| 39 |
DESCRIPTION="A hackable, minimal, fast TUI file explorer" |
| 40 |
# Double check the homepage as the cargo_metadata crate |
| 41 |
@@ -153,18 +155,24 @@ LICENSE=" |
| 42 |
SLOT="0" |
| 43 |
KEYWORDS="~amd64" |
| 44 |
|
| 45 |
+REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 46 |
+RDEPEND=" |
| 47 |
+ ${LUA_DEPS} |
| 48 |
+" |
| 49 |
DEPEND=" |
| 50 |
- dev-vcs/git |
| 51 |
- sys-devel/make |
| 52 |
- sys-devel/gcc |
| 53 |
+ ${RDEPEND} |
| 54 |
" |
| 55 |
|
| 56 |
QA_FLAGS_IGNORED="usr/bin/.*" |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
- cargo_src_configure --locked --bin xplr |
| 60 |
- sed "s:\$(CROSS)::g" -i ../cargo_home/gentoo/luajit-src-210.3.2+resty1085a4d/luajit2/src/Makefile || die |
| 61 |
+ cargo_src_configure --bin xplr |
| 62 |
+} |
| 63 |
|
| 64 |
+src_prepare() { |
| 65 |
+ sed -i Cargo.toml -e 's/"vendored"\s*,//' || die |
| 66 |
+ # for dynamic linking with lua |
| 67 |
+ default |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
|
| 72 |
diff --git a/app-misc/xplr/xplr-0.17.0.ebuild b/app-misc/xplr/xplr-0.17.0.ebuild |
| 73 |
index ae20f4617..b40379f94 100644 |
| 74 |
--- a/app-misc/xplr/xplr-0.17.0.ebuild |
| 75 |
+++ b/app-misc/xplr/xplr-0.17.0.ebuild |
| 76 |
@@ -1,8 +1,10 @@ |
| 77 |
-# Copyright 2021-2022 Gentoo Authors |
| 78 |
+# Copyright 2021 Gentoo Authors |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
EAPI=8 |
| 82 |
|
| 83 |
+LUA_COMPAT=( luajit ) |
| 84 |
+ |
| 85 |
CRATES=" |
| 86 |
ansi-to-tui-0.4.1 |
| 87 |
anyhow-1.0.51 |
| 88 |
@@ -129,7 +131,7 @@ CRATES=" |
| 89 |
yaml-rust-0.4.5 |
| 90 |
" |
| 91 |
|
| 92 |
-inherit cargo |
| 93 |
+inherit cargo flag-o-matic desktop lua-single |
| 94 |
|
| 95 |
DESCRIPTION="A hackable, minimal, fast TUI file explorer" |
| 96 |
# Double check the homepage as the cargo_metadata crate |
| 97 |
@@ -153,18 +155,24 @@ LICENSE=" |
| 98 |
SLOT="0" |
| 99 |
KEYWORDS="~amd64" |
| 100 |
|
| 101 |
+REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 102 |
+RDEPEND=" |
| 103 |
+ ${LUA_DEPS} |
| 104 |
+" |
| 105 |
DEPEND=" |
| 106 |
- dev-vcs/git |
| 107 |
- sys-devel/make |
| 108 |
- sys-devel/gcc |
| 109 |
+ ${RDEPEND} |
| 110 |
" |
| 111 |
|
| 112 |
QA_FLAGS_IGNORED="usr/bin/.*" |
| 113 |
|
| 114 |
src_configure() { |
| 115 |
- cargo_src_configure --locked --bin xplr |
| 116 |
- sed "s:\$(CROSS)::g" -i ../cargo_home/gentoo/luajit-src-210.3.2+resty1085a4d/luajit2/src/Makefile || die |
| 117 |
+ cargo_src_configure --bin xplr |
| 118 |
+} |
| 119 |
|
| 120 |
+src_prepare() { |
| 121 |
+ sed -i Cargo.toml -e 's/"vendored"\s*,//' || die |
| 122 |
+ # for dynamic linking with lua |
| 123 |
+ default |
| 124 |
} |
| 125 |
|
| 126 |
src_compile() { |
Archives