1 |
commit: 3fd01bd87ec4e79653d66c4ec2ea617f83ae91db |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 3 12:32:37 2023 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 13:29:31 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd01bd8 |
7 |
|
8 |
app-shells/bash-completion: Reformat |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../bash-completion/bash-completion-2.11.ebuild | 22 ++++++++++++++++------ |
13 |
.../bash-completion/bash-completion-9999.ebuild | 17 ++++++++++++----- |
14 |
2 files changed, 28 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild |
17 |
index a1fa288f505d..6620da126225 100644 |
18 |
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild |
19 |
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild |
20 |
@@ -5,13 +5,17 @@ EAPI=7 |
21 |
|
22 |
BASHCOMP_P=bashcomp-2.0.3 |
23 |
PYTHON_COMPAT=( python3_{9..11} ) |
24 |
+ |
25 |
inherit python-any-r1 |
26 |
|
27 |
DESCRIPTION="Programmable Completion for bash" |
28 |
HOMEPAGE="https://github.com/scop/bash-completion" |
29 |
SRC_URI=" |
30 |
https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz |
31 |
- eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )" |
32 |
+ eselect? ( |
33 |
+ https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz |
34 |
+ ) |
35 |
+" |
36 |
|
37 |
LICENSE="GPL-2+" |
38 |
SLOT="0" |
39 |
@@ -20,9 +24,11 @@ IUSE="+eselect test" |
40 |
RESTRICT="!test? ( test )" |
41 |
|
42 |
# completion collision with net-fs/mc |
43 |
-RDEPEND=">=app-shells/bash-4.3_p30-r1:0 |
44 |
+RDEPEND=" |
45 |
+ >=app-shells/bash-4.3_p30-r1:0 |
46 |
sys-apps/miscfiles |
47 |
- !!net-fs/mc" |
48 |
+ !!net-fs/mc |
49 |
+" |
50 |
DEPEND=" |
51 |
test? ( |
52 |
${RDEPEND} |
53 |
@@ -30,8 +36,11 @@ DEPEND=" |
54 |
dev-python/pexpect[${PYTHON_USEDEP}] |
55 |
dev-python/pytest[${PYTHON_USEDEP}] |
56 |
') |
57 |
- )" |
58 |
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911" |
59 |
+ ) |
60 |
+" |
61 |
+PDEPEND=" |
62 |
+ >=app-shells/gentoo-bashcomp-20140911 |
63 |
+" |
64 |
|
65 |
strip_completions() { |
66 |
# Remove unwanted completions. |
67 |
@@ -76,8 +85,9 @@ pkg_setup() { |
68 |
} |
69 |
|
70 |
src_prepare() { |
71 |
- use eselect && |
72 |
+ if use eselect; then |
73 |
eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch" |
74 |
+ fi |
75 |
|
76 |
# redhat-specific, we strip these completions |
77 |
rm test/t/test_if{down,up}.py || die |
78 |
|
79 |
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild |
80 |
index db9e158ca8ee..b6d3b0aa9615 100644 |
81 |
--- a/app-shells/bash-completion/bash-completion-9999.ebuild |
82 |
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild |
83 |
@@ -4,6 +4,7 @@ |
84 |
EAPI=7 |
85 |
|
86 |
PYTHON_COMPAT=( python3_{9..11} ) |
87 |
+ |
88 |
inherit autotools git-r3 python-any-r1 |
89 |
|
90 |
DESCRIPTION="Programmable Completion for bash" |
91 |
@@ -17,9 +18,11 @@ IUSE="+eselect test" |
92 |
RESTRICT="!test? ( test )" |
93 |
|
94 |
# completion collision with net-fs/mc |
95 |
-RDEPEND=">=app-shells/bash-4.3_p30-r1:0 |
96 |
+RDEPEND=" |
97 |
+ >=app-shells/bash-4.3_p30-r1:0 |
98 |
sys-apps/miscfiles |
99 |
- !!net-fs/mc" |
100 |
+ !!net-fs/mc |
101 |
+" |
102 |
DEPEND=" |
103 |
test? ( |
104 |
${RDEPEND} |
105 |
@@ -27,8 +30,11 @@ DEPEND=" |
106 |
dev-python/pexpect[${PYTHON_USEDEP}] |
107 |
dev-python/pytest[${PYTHON_USEDEP}] |
108 |
') |
109 |
- )" |
110 |
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911" |
111 |
+ ) |
112 |
+" |
113 |
+PDEPEND=" |
114 |
+ >=app-shells/gentoo-bashcomp-20140911 |
115 |
+" |
116 |
|
117 |
strip_completions() { |
118 |
# Remove unwanted completions. |
119 |
@@ -116,9 +122,10 @@ src_install() { |
120 |
dodoc AUTHORS CHANGES CONTRIBUTING.md README.md |
121 |
|
122 |
# install the eselect module |
123 |
- use eselect && |
124 |
+ if use eselect; then |
125 |
emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \ |
126 |
PREFIX="${EPREFIX}/usr" install |
127 |
+ fi |
128 |
} |
129 |
|
130 |
pkg_postinst() { |