1 |
commit: e7dc9278189f2418a3389abe64774c75fde98c72 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Feb 25 20:26:21 2022 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Mar 5 01:42:50 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e7dc9278 |
7 |
|
8 |
app-misc/zellij: take and improve ebuild |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
app-misc/zellij/metadata.xml | 5 +- |
13 |
...ellij-0.25.0.ebuild => zellij-0.25.0-r1.ebuild} | 110 ++++++++++----------- |
14 |
2 files changed, 57 insertions(+), 58 deletions(-) |
15 |
|
16 |
diff --git a/app-misc/zellij/metadata.xml b/app-misc/zellij/metadata.xml |
17 |
index a013763c1..057a993c1 100644 |
18 |
--- a/app-misc/zellij/metadata.xml |
19 |
+++ b/app-misc/zellij/metadata.xml |
20 |
@@ -1,6 +1,10 @@ |
21 |
<?xml version="1.0" encoding="UTF-8"?> |
22 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
23 |
<pkgmetadata> |
24 |
+ <maintainer type="person"> |
25 |
+ <email>lssndrbarbieri@×××××.com</email> |
26 |
+ <name>Alessandro Barbieri</name> |
27 |
+ </maintainer> |
28 |
<maintainer type="person"> |
29 |
<email>degni.public@×××××.com</email> |
30 |
<name>Luciano Degni</name> |
31 |
@@ -10,4 +14,3 @@ |
32 |
<bugs-to>https://github.com/zellij-org/zellij/issues</bugs-to> |
33 |
</upstream> |
34 |
</pkgmetadata> |
35 |
- |
36 |
|
37 |
diff --git a/app-misc/zellij/zellij-0.25.0.ebuild b/app-misc/zellij/zellij-0.25.0-r1.ebuild |
38 |
similarity index 78% |
39 |
rename from app-misc/zellij/zellij-0.25.0.ebuild |
40 |
rename to app-misc/zellij/zellij-0.25.0-r1.ebuild |
41 |
index a095b0d85..43abc5249 100644 |
42 |
--- a/app-misc/zellij/zellij-0.25.0.ebuild |
43 |
+++ b/app-misc/zellij/zellij-0.25.0-r1.ebuild |
44 |
@@ -1,4 +1,4 @@ |
45 |
-# Copyright 2022 Gentoo Authors |
46 |
+# Copyright 1999-2022 Gentoo Authors |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
EAPI=8 |
50 |
@@ -295,96 +295,92 @@ CRATES=" |
51 |
zeroize-1.4.3 |
52 |
" |
53 |
|
54 |
-inherit cargo xdg-utils optfeature desktop |
55 |
+inherit bash-completion-r1 cargo desktop xdg-utils |
56 |
|
57 |
DESCRIPTION="A terminal workspace with batteries included" |
58 |
-HOMEPAGE="https://github.com/zellij-org/zellij" |
59 |
+HOMEPAGE=" |
60 |
+ https://zellij.dev |
61 |
+ https://github.com/zellij-org/zellij |
62 |
+" |
63 |
SRC_URI=" |
64 |
https://github.com/zellij-org/zellij/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
65 |
$(cargo_crate_uris) |
66 |
" |
67 |
LICENSE=" |
68 |
+ || ( 0BSD Apache-2.0 MIT ) |
69 |
+ || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) |
70 |
+ || ( Apache-2.0 BSD-2 MIT ) |
71 |
+ || ( Apache-2.0 Boost-1.0 ) |
72 |
|| ( Apache-2.0 MIT ) |
73 |
- || ( Apache-2.0 MIT ) |
74 |
- || ( Apache-2.0 MIT MPL-2.0 ) |
75 |
- || ( MIT ) |
76 |
+ || ( Apache-2.0 MIT ZLIB ) |
77 |
+ || ( Apache-2.0-with-LLVM-exceptions MIT ) |
78 |
|| ( MIT Unlicense ) |
79 |
Apache-2.0 |
80 |
- MIT |
81 |
+ Apache-2.0-with-LLVM-exceptions |
82 |
BSD |
83 |
- Unlicense |
84 |
+ BSD-2 |
85 |
+ CC0-1.0 |
86 |
+ ISC |
87 |
+ MIT |
88 |
MPL-2.0 |
89 |
- WTFPL |
90 |
+ WTFPL-2 |
91 |
" |
92 |
SLOT="0" |
93 |
KEYWORDS="~amd64" |
94 |
-IUSE="doc examples zsh-completion fish-completion bash-completion" |
95 |
-DEPEND=" |
96 |
- bash-completion? ( |
97 |
- app-shells/bash |
98 |
- ) |
99 |
- fish-completion? ( |
100 |
- app-shells/fish |
101 |
- ) |
102 |
- zsh-completion? ( |
103 |
- app-shells/zsh |
104 |
- ) |
105 |
- dev-lang/rust |
106 |
-" |
107 |
+ |
108 |
BDEPEND=" |
109 |
- $DEPEND |
110 |
-" |
111 |
-RDEPEND=" |
112 |
- $DEPEND |
113 |
- !app-misc/$PN-bin |
114 |
+ app-text/mandown |
115 |
" |
116 |
+# dev-util/binaryen |
117 |
+# dev-util/cargo-make |
118 |
+#" |
119 |
|
120 |
-QA_FLAGS_IGNORED="usr/bin/.*" |
121 |
+src_configure() { |
122 |
+ local myfeatures=( |
123 |
+ disable_automatic_asset_installation |
124 |
+ ) |
125 |
+ cargo_src_configure |
126 |
+} |
127 |
|
128 |
src_compile() { |
129 |
cargo_src_compile |
130 |
- ./target/release/zellij setup --generate-completion bash > target/zellij |
131 |
- ./target/release/zellij setup --generate-completion fish > target/zellij.fish |
132 |
- ./target/release/zellij setup --generate-completion zsh > target/_zellij |
133 |
+# cargo make build-release || die |
134 |
+# cargo make manpage || die |
135 |
+# cargo make wasm-opt-plugins || die |
136 |
+ mkdir -p assets/man || die |
137 |
+ mandown docs/MANPAGE.md ZELLIJ 1 > assets/man/zellij.1 || die |
138 |
+ mkdir -p assets/completions || die |
139 |
+ ./target/release/zellij setup --generate-completion bash > assets/completions/zellij.bash || die |
140 |
+ ./target/release/zellij setup --generate-completion fish > assets/completions/zellij.fish || die |
141 |
+ ./target/release/zellij setup --generate-completion zsh > assets/completions/_zellij || die |
142 |
} |
143 |
|
144 |
src_install() { |
145 |
- dobin target/release/"$PN" |
146 |
+# cargo make install --root "${ED}" || die |
147 |
+ cargo_src_install |
148 |
+# dobin "target/release/${PN}" |
149 |
|
150 |
- if use examples; then |
151 |
- insinto "/usr/share/zellij/layouts/" |
152 |
- doins -r assets/example/layouts/* |
153 |
- fi |
154 |
+ insinto /usr/share/zellij/layouts/ |
155 |
+ doins -r example/layouts/* |
156 |
|
157 |
- insinto "/usr/share/zellij/plugins/" |
158 |
+ insinto /usr/share/zellij/plugins/ |
159 |
doins -r assets/plugins/* |
160 |
|
161 |
- if use bash-completion; then |
162 |
- insinto "usr/share/bash-completion/completions/" |
163 |
- doins target/zellij |
164 |
- fi |
165 |
- |
166 |
- if use fish-completion; then |
167 |
- insinto "usr/share/fish/vendor_completions.d/" |
168 |
- doins target/zellij.fish |
169 |
- fi |
170 |
+ doman assets/man/zellij.1 |
171 |
|
172 |
- if use zsh-completion; then |
173 |
- insinto "usr/share/zsh/site-functions/" |
174 |
- doins target/_zellij |
175 |
- fi |
176 |
+ insinto /usr/share/xsessions/ |
177 |
+ doins assets/zellij.desktop |
178 |
|
179 |
- domenu assets/zellij.desktop |
180 |
- #doicon asserts/logo.png |
181 |
+ dodoc README.md CHANGELOG.md docs/*.md |
182 |
|
183 |
- use doc && dodoc README.md GOVERNANCE.md |
184 |
- use doc && dodoc docs/MANPAGE.md |
185 |
+ newbashcomp assets/completions/zellij.bash zellij |
186 |
+ insinto /usr/share/fish/vendor_completions.d |
187 |
+ doins assets/completions/zellij.fish |
188 |
+ insinto /usr/share/fish/vendor-completions |
189 |
+ doins assets/completions/_zellij |
190 |
} |
191 |
|
192 |
pkg_postinst() { |
193 |
- elog "Read the documentation for $PN at <https://zellij.dev/documentation>" |
194 |
- elog "for usage, customization and other instructions" |
195 |
- optfeature "install nerdfonts for best experience" |
196 |
xdg_desktop_database_update |
197 |
} |