subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-shells\/fish\/"

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

2026-02-07 Thread Eli Schwartz

commit: 1c569431c6ae3768258fc1be4970f7a3a0f4f083
Author: Eli Schwartz  gentoo  org>
AuthorDate: Sun Feb  8 03:17:43 2026 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Sun Feb  8 06:02:45 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c569431

app-shells/fish: Stabilize 4.3.3 ppc64, #969676

Signed-off-by: Eli Schwartz  gentoo.org>

 app-shells/fish/fish-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.3.3.ebuild 
b/app-shells/fish/fish-4.3.3.ebuild
index 509598486ceb..41e1191ed9b0 100644
--- a/app-shells/fish/fish-4.3.3.ebuild
+++ b/app-shells/fish/fish-4.3.3.ebuild
@@ -28,7 +28,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
+   KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2026-02-07 Thread Sam James

commit: 04782a025c0658aeb703655be0f652b7b1215756
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb  7 23:00:10 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  7 23:00:10 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04782a02

app-shells/fish: Stabilize 4.3.3 amd64, #969676

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.3.3.ebuild 
b/app-shells/fish/fish-4.3.3.ebuild
index 27dbcfa307b8..509598486ceb 100644
--- a/app-shells/fish/fish-4.3.3.ebuild
+++ b/app-shells/fish/fish-4.3.3.ebuild
@@ -28,7 +28,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
+   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2026-02-07 Thread Sam James

commit: feb6d04edc233a49e6d749a37f47db7f7fdaaa65
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb  7 21:44:44 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  7 21:44:44 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb6d04e

app-shells/fish: Stabilize 4.3.3 arm64, #969676

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.3.3.ebuild 
b/app-shells/fish/fish-4.3.3.ebuild
index e8a14acd502c..27dbcfa307b8 100644
--- a/app-shells/fish/fish-4.3.3.ebuild
+++ b/app-shells/fish/fish-4.3.3.ebuild
@@ -28,7 +28,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
+   KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/

2026-02-07 Thread Arthur Zamarin

commit: d2024208ba6146efd3f93ed2d9d802c68d7d9b11
Author: idealseal  protonmail  com>
AuthorDate: Fri Feb  6 14:02:57 2026 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb  7 08:02:35 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2024208

app-shells/fish: add 4.4.0

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/45656
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/Manifest   |   2 +
 .../fish-4.4.0-use-cargo-eclass-for-build.patch|  46 +
 app-shells/fish/fish-4.4.0.ebuild  | 107 +
 3 files changed, 155 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index d743c564a2e3..85ac560e2229 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,10 +4,12 @@ DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
 DIST fish-4.3.3.tar.xz 2545388 BLAKE2B 
8d8ae67c4f97ef41d94ebcd728f9882e682eece6d21461eef48e71b293ce6fd6d2909d7e4aea4fb168b2fbb8c4b0a30b09a18e8844711003f1d22d78
 SHA512 
ab20c5d6c052319a1bb6ae5d0af0e4a4563528348ea61728ee812f31ded7f379e1df3687be47ee71af0b79ab46a3febe7f09f8a5312c9a06cb03269447513e8b
+DIST fish-4.4.0.tar.xz 2570412 BLAKE2B 
93b74dc8c17c8d1d437b2a170715e7963d29a78781520fbb7181bfbfc158c1c1f1a245f15621cb326d4f81dc097084cd54bb14c890fee7b7ab9022a5a41f98d1
 SHA512 
7d5f3f43e1478ffbf46119ad535b9ece57450751aea059ce520828733733ecc8dbe6b9581703bc3150b015eb2e3b910e28284bb8b25ee05fcad24e477fd99a93
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.3.0-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
 DIST fish-shell-4.3.2-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
 DIST fish-shell-4.3.3-crates.tar.xz 6696892 BLAKE2B 
98f6aac950b09ad069b74534b066ff0c31e6bbc1af34012833c5b5bf2e2aabbcbef3fa183afa7a569d23dbd21df5e4d028d8c98d548ad9a71686ba77ca597e0b
 SHA512 
9545ce539d38d47adf848aa153e1dfbe16008743a552b3bf08cbda924fe65907142dbba71508e302d9e5ac5dcf6e87a015da175d95afdcac19fb1fc9ecbff4ad
+DIST fish-shell-4.4.0-crates.tar.xz 7073424 BLAKE2B 
256672c8061cdb257abd9e9371476237cce12d3f3b7af1bdb133eec27a5b507611d512723eccaacb8579646002eb56e8924e83abf3b6bc267f6d1a1919d16199
 SHA512 
842925fac09a5ae741ff1a809776bfb700f5de303d7bbd3fb3b62bf685218e53ba7fc10d61893c78f98ba4bb7494e7431a31aeffe8b201862dabb3f077329838
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/files/fish-4.4.0-use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish-4.4.0-use-cargo-eclass-for-build.patch
new file mode 100644
index ..c15f2

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

2026-01-07 Thread Joonas Niilola

commit: 0c38805b14461898ae6fc616d804986d26a8fd02
Author: idealseal  protonmail  com>
AuthorDate: Wed Jan  7 11:29:32 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan  7 13:04:48 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c38805b

app-shells/fish: add 4.3.3

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45282
Closes: https://github.com/gentoo/gentoo/pull/45282
Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.3.3.ebuild | 107 ++
 2 files changed, 109 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b2c2534e2c0e..d743c564a2e3 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,9 +3,11 @@ DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdc
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
+DIST fish-4.3.3.tar.xz 2545388 BLAKE2B 
8d8ae67c4f97ef41d94ebcd728f9882e682eece6d21461eef48e71b293ce6fd6d2909d7e4aea4fb168b2fbb8c4b0a30b09a18e8844711003f1d22d78
 SHA512 
ab20c5d6c052319a1bb6ae5d0af0e4a4563528348ea61728ee812f31ded7f379e1df3687be47ee71af0b79ab46a3febe7f09f8a5312c9a06cb03269447513e8b
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.3.0-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
 DIST fish-shell-4.3.2-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
+DIST fish-shell-4.3.3-crates.tar.xz 6696892 BLAKE2B 
98f6aac950b09ad069b74534b066ff0c31e6bbc1af34012833c5b5bf2e2aabbcbef3fa183afa7a569d23dbd21df5e4d028d8c98d548ad9a71686ba77ca597e0b
 SHA512 
9545ce539d38d47adf848aa153e1dfbe16008743a552b3bf08cbda924fe65907142dbba71508e302d9e5ac5dcf6e87a015da175d95afdcac19fb1fc9ecbff4ad
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.3.3.ebuild 
b/app-shells/fish/fish-4.3.3.ebuild
new file mode 100644
index ..e8a14acd502c
--- /dev/null
+++ b/app-shells/fish/fish-4.3.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+RUST_MIN_VER="1.85.0"
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https:

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

2026-01-04 Thread Eli Schwartz

commit: 84fd9a0554a44553046bd1302f94171e2272cb7f
Author: Eli Schwartz  gentoo  org>
AuthorDate: Sun Jan  4 04:36:48 2026 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Sun Jan  4 11:50:42 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84fd9a05

app-shells/fish: Stabilize 4.2.1 ppc64, #968305

Signed-off-by: Eli Schwartz  gentoo.org>

 app-shells/fish/fish-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.2.1.ebuild 
b/app-shells/fish/fish-4.2.1.ebuild
index 2fa86197a33c..bbf7756dbe43 100644
--- a/app-shells/fish/fish-4.2.1.ebuild
+++ b/app-shells/fish/fish-4.2.1.ebuild
@@ -28,7 +28,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
+   KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2026-01-04 Thread Eli Schwartz

commit: 791d3a7f068d9a7799c41bdf49ea9adf491d447a
Author: Eli Schwartz  gentoo  org>
AuthorDate: Sun Jan  4 01:53:26 2026 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Sun Jan  4 11:50:37 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791d3a7f

app-shells/fish: Stabilize 4.2.1 amd64, #968305

Signed-off-by: Eli Schwartz  gentoo.org>

 app-shells/fish/fish-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.2.1.ebuild 
b/app-shells/fish/fish-4.2.1.ebuild
index e1a77051c151..2fa86197a33c 100644
--- a/app-shells/fish/fish-4.2.1.ebuild
+++ b/app-shells/fish/fish-4.2.1.ebuild
@@ -28,7 +28,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
+   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/

2026-01-03 Thread Sam James

commit: 83d6352eb4e11066396a0627e80ef06f11c454df
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  3 22:13:57 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:36:44 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d6352e

app-shells/fish: fix duplicate patch

Signed-off-by: Sam James  gentoo.org>

 .../fish--use-cargo-eclass-for-build.patch | 46 --
 app-shells/fish/fish-.ebuild   |  2 +-
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
deleted file mode 100644
index 5844e8f66b15..
--- a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c65b3e422..caf670f0c 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,18 +60,7 @@ add_custom_target(
-   fish ALL
-   COMMAND
- "${CMAKE_COMMAND}" -E
--  env ${VARS_FOR_CARGO}
--${Rust_CARGO}
--  build --bin fish
--  $<$:--release>
--  $<$:--profile=release-with-debug>
--  --target ${Rust_CARGO_TARGET}
--  --no-default-features
--  --features=${FISH_CARGO_FEATURES}
--  ${CARGO_FLAGS}
--&&
--"${CMAKE_COMMAND}" -E
--  copy "${rust_target_dir}/${rust_profile}/fish" 
"${CMAKE_CURRENT_BINARY_DIR}"
-+  copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/fish" 
"${CMAKE_CURRENT_BINARY_DIR}"
-   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-   USES_TERMINAL
- )
-diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index d99e621e4..4d6b47f2a 100644
 a/cmake/Rust.cmake
-+++ b/cmake/Rust.cmake
-@@ -1,7 +1,7 @@
- include(FindRust)
- find_package(Rust REQUIRED)
- 
--set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
-+set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
- 
- if(DEFINED ASAN)
- list(APPEND CARGO_FLAGS "-Z" "build-std")
-@@ -18,7 +18,7 @@ else()
- set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
- endif()
- 
--set(rust_profile 
$,debug,$,release-with-debug,release>>)
-+set(rust_profile $,debug,release>)
- 
- option(WITH_GETTEXT "Build with gettext localization support. Requires 
`msgfmt` to work." ON)
- # Enable gettext feature unless explicitly disabled.

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 63e2f1958082..bcfe706395d3 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}/${P}-use-cargo-eclass-for-build.patch"
+   "${FILESDIR}/${PN}-4.3.0-use-cargo-eclass-for-build.patch"
 )
 
 QA_FLAGS_IGNORED="usr/bin/.*"

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/

2026-01-03 Thread Sam James

commit: d3c05ba577bc08dac1f77d5aa519a759381ccdfc
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:27:34 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:27 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c05ba5

app-shells/fish: drop 4.0.8

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest   |   2 -
 .../fish-4.0.1-use-cargo-eclass-for-build.patch|  48 -
 app-shells/fish/fish-4.0.8.ebuild  | 110 -
 3 files changed, 160 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index e3dd557b38f2..c7abbcf4860e 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,3 @@
-DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
@@ -6,7 +5,6 @@ DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdc
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
-DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438

diff --git a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
deleted file mode 100644
index 0091d08fed86..
--- a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 496226e89..69bdf037d 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,18 +52,7 @@ function(CREATE_TARGET target)
- ${target} ALL
- COMMAND
-   "${CMAKE_COMMAND}" -E
--env ${VARS_FOR_CARGO}

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/

2026-01-03 Thread Sam James

commit: 49cc0a30764db4838ede7d1de44c41431774a343
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:44:42 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:28 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cc0a30

app-shells/fish: sync live

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Closes: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 .../fish--use-cargo-eclass-for-build.patch | 52 +++---
 app-shells/fish/fish-.ebuild   | 34 +++---
 2 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
index 964c7435d4ca..5844e8f66b15 100644
--- a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
+++ b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
@@ -1,29 +1,29 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0510cd2d7..84fa35e2e 100644
+index c65b3e422..caf670f0c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,18 +42,7 @@ function(CREATE_TARGET target)
- ${target} ALL
- COMMAND
-   "${CMAKE_COMMAND}" -E
--env ${VARS_FOR_CARGO}
--  ${Rust_CARGO}
--build --bin ${target}
--$<$:--release>
--$<$:--profile=release-with-debug>
----target ${Rust_CARGO_TARGET}
----no-default-features
--${CARGO_FLAGS}
--${FEATURES_ARG}
--  &&
--  "${CMAKE_COMMAND}" -E
--copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
-+copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- USES_TERMINAL
-   )
+@@ -60,18 +60,7 @@ add_custom_target(
+   fish ALL
+   COMMAND
+ "${CMAKE_COMMAND}" -E
+-  env ${VARS_FOR_CARGO}
+-${Rust_CARGO}
+-  build --bin fish
+-  $<$:--release>
+-  $<$:--profile=release-with-debug>
+-  --target ${Rust_CARGO_TARGET}
+-  --no-default-features
+-  --features=${FISH_CARGO_FEATURES}
+-  ${CARGO_FLAGS}
+-&&
+-"${CMAKE_COMMAND}" -E
+-  copy "${rust_target_dir}/${rust_profile}/fish" 
"${CMAKE_CURRENT_BINARY_DIR}"
++  copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/fish" 
"${CMAKE_CURRENT_BINARY_DIR}"
+   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+   USES_TERMINAL
+ )
 diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index 9cdd01c30..5c554dd2d 100644
+index d99e621e4..4d6b47f2a 100644
 --- a/cmake/Rust.cmake
 +++ b/cmake/Rust.cmake
 @@ -1,7 +1,7 @@
@@ -35,14 +35,12 @@ index 9cdd01c30..5c554dd2d 100644
  
  if(DEFINED ASAN)
  list(APPEND CARGO_FLAGS "-Z" "build-std")
-@@ -18,8 +18,8 @@ else()
+@@ -18,7 +18,7 @@ else()
  set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
  endif()
  
 -set(rust_profile 
$,debug,$,release-with-debug,release>>)
--set(rust_debugflags "$<$:-g>$<$:-g>")
 +set(rust_profile $,debug,release>)
-+set(rust_debugflags "$<$:-g>")
  
- 
- # Temporary hack to propagate CMake flags/options to build.rs. We need to get 
CMake to evaluate the
+ option(WITH_GETTEXT "Build with gettext localization support. Requires 
`msgfmt` to work." ON)
+ # Enable gettext feature unless explicitly disabled.

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index b573c7b0be13..63e2f1958082 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=""
+RUST_MIN_VER="1.85.0"
 
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
+if [[ ${PV} !=  ]]; then
+   declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+   )
+fi
 
 inherit cargo cmake readme.gentoo-r1 xdg
 
@@ -34,15 +37,16 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
 # Dependent crate licenses
-LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
+LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-3.0 WTFPL-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls test"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="nls? ( sys-devel/gettext )"
-# Release tarballs contain prebuilt docu

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

2026-01-03 Thread Sam James

commit: ded45d2bc46e62a9fb262fcf2f45f4b79b42
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:27:50 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:27 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded45d2b

app-shells/fish: drop 4.1.0

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 -
 app-shells/fish/fish-4.1.0.ebuild | 109 --
 2 files changed, 111 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c7abbcf4860e..7f4f8693a885 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,11 +1,9 @@
-DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
 DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38
 SHA512 
9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
-DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81

diff --git a/app-shells/fish/fish-4.1.0.ebuild 
b/app-shells/fish/fish-4.1.0.ebuild
deleted file mode 100644
index b573c7b0be13..
--- a/app-shells/fish/fish-4.1.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
-
-inherit cargo cmake readme.gentoo-r1 xdg
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV=

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

2026-01-03 Thread Sam James

commit: 905e3778ded8de2cf444fc6676674f5fc90e234b
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:28:01 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:28 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905e3778

app-shells/fish: drop 4.1.1

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 -
 app-shells/fish/fish-4.1.1.ebuild | 109 --
 2 files changed, 111 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 7f4f8693a885..b2c2534e2c0e 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,10 +1,8 @@
-DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
 DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38
 SHA512 
9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
-DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81

diff --git a/app-shells/fish/fish-4.1.1.ebuild 
b/app-shells/fish/fish-4.1.1.ebuild
deleted file mode 100644
index f37b812f42bf..
--- a/app-shells/fish/fish-4.1.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
-
-inherit cargo cmake readme.gentoo-r1 xdg
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
-else
-   SRC_URI="
-   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
-   
htt

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

2026-01-03 Thread Sam James

commit: 050b3477377193164050310d50b9760e410d8def
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:26:54 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:26 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=050b3477

app-shells/fish: drop 3.7.1

Closes: https://bugs.gentoo.org/965697
Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   1 -
 app-shells/fish/fish-3.7.1.ebuild | 121 --
 2 files changed, 122 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2b01be802854..4d2a66bbd263 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,3 @@
-DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
deleted file mode 100644
index 2f84538911a8..
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~x64-macos"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
-SLOT="0"
-IUSE="+doc nls split-usr test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-apps/coreutils
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   dev-tcltk/expect
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   if use split-usr; then
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   fi
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # installing into /bin breaks tests on merged usr systems.
-   # sbin -> bin symlink confuses tests.
-   # so on split-usr we install to /bin.
-   # on merge-usr we set sbindir to bin.
-   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
-   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-   -DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
-   )
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cmake_src_configure
-}
-

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

2026-01-03 Thread Sam James

commit: 7cd3b608f16ea897fcbf22dbc54597d642d38602
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:27:18 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:26 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd3b608

app-shells/fish: drop 4.0.6

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 -
 app-shells/fish/fish-4.0.6.ebuild | 110 --
 2 files changed, 112 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4d2a66bbd263..e3dd557b38f2 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,3 @@
-DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
@@ -7,7 +6,6 @@ DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdc
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
-DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438

diff --git a/app-shells/fish/fish-4.0.6.ebuild 
b/app-shells/fish/fish-4.0.6.ebuild
deleted file mode 100644
index 98de346d738c..
--- a/app-shells/fish/fish-4.0.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
-
-inherit cargo cmake readme.gentoo

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

2026-01-03 Thread Sam James

commit: 429ce0a695d449a406f3e0617758c873ff9d30e1
Author: idealseal  protonmail  com>
AuthorDate: Sat Jan  3 21:26:23 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  3 22:11:25 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429ce0a6

app-shells/fish: add 4.3.2

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45242
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.3.2.ebuild | 107 ++
 2 files changed, 109 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b0b2414b9d26..2b01be802854 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -7,6 +7,7 @@ DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e
 DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38
 SHA512 
9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
+DIST fish-4.3.2.tar.xz 2535720 BLAKE2B 
770650e353b1f6a38bbaa7f6df1e24cf4d625e8c15fb8549810949349fd4964dd86621606297cdbd89c010d9b2d3e90045aca5c639701171bb82c1697d5a6f55
 SHA512 
a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
@@ -15,4 +16,5 @@ DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f96
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.3.0-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
+DIST fish-shell-4.3.2-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.3.2.ebuild 
b/app-shells/fish/fish-4.3.2.ebuild
new file mode 100644
index ..e8a14acd502c
--- /dev/null
+++ b/app-shells/fish/fish-4.3.2.ebuil

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/

2025-12-30 Thread Sam James

commit: 42a95fc0df1d6de01c807d945dd22f87332e451b
Author: idealseal  protonmail  com>
AuthorDate: Sun Dec 28 10:54:59 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 30 22:19:36 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a95fc0

app-shells/fish: add 4.3.0

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45186
Closes: https://github.com/gentoo/gentoo/pull/45186
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest   |   2 +
 .../fish-4.3.0-use-cargo-eclass-for-build.patch|  46 +
 app-shells/fish/fish-4.3.0.ebuild  | 107 +
 3 files changed, 155 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 7d0de4b5fd8c..b0b2414b9d26 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -6,6 +6,7 @@ DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff4
 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
 DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38
 SHA512 
9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a
 DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
+DIST fish-4.3.0.tar.xz 2533776 BLAKE2B 
cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a
 SHA512 
ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
@@ -13,4 +14,5 @@ DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f96
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
+DIST fish-shell-4.3.0-crates.tar.xz 6667516 BLAKE2B 
8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a
 SHA512 
69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/files/fish-4.3.0-use-car

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

2025-11-16 Thread Arthur Zamarin

commit: 48b51a2913a938ff5d6a44e0d3cc032fe08b1d2d
Author: idealseal  protonmail  com>
AuthorDate: Thu Nov 13 21:09:48 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 16 18:21:29 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b51a29

app-shells/fish: add 4.2.1

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/44622
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.2.1.ebuild | 110 ++
 2 files changed, 112 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index cae5cfee8140..7d0de4b5fd8c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -5,10 +5,12 @@ DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
 DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38
 SHA512 
9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a
+DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 
37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01
 SHA512 
7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
+DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.2.1.ebuild 
b/app-shells/fish/fish-4.2.1.ebuild
new file mode 100644
index ..bbf8e333e3a4
--- /dev/null
+++ b/app-shells/fish/fish-4.2.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/

2025-11-12 Thread Sam James

commit: a89d64e65d6c3ad6913816a6c21209e5b617cb3f
Author: idealseal  protonmail  com>
AuthorDate: Mon Nov 10 10:52:20 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 12 09:40:31 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a89d64e6

app-shells/fish: add 4.2.0

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44571
Closes: https://github.com/gentoo/gentoo/pull/44571
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest   |   2 +
 .../fish-4.2.0-use-cargo-eclass-for-build.patch|  59 +++
 app-shells/fish/fish-4.2.0.ebuild  | 110 +
 3 files changed, 171 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c15688dad535..cae5cfee8140 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,9 +4,11 @@ DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b829
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
+DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 
4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38
 SHA512 
9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
+DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B 
aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9
 SHA512 
affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/files/fish-4.2.0-use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish-4.2.0-use-cargo-eclass-for-build.patch
new file mode 100644
index ..813c0e43533d
--- /dev/null
+++ b/app-shells/fish/files/fish-4.2.0-use-cargo-eclass-for-build.patch
@@ -0,0 +1,59 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d161def836..19a0dbc499 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -54,27 +54,16 @@
+ 
+ set(build_typ

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

2025-11-07 Thread Arthur Zamarin

commit: c95ec50b5756bbec7971b4f879cdc3aa7c709178
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov  7 15:13:07 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov  7 15:13:07 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95ec50b

app-shells/fish: Stabilize 4.1.2 amd64, #965740

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/fish-4.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.1.2.ebuild 
b/app-shells/fish/fish-4.1.2.ebuild
index cf4c225d8a01..cd74919da544 100644
--- a/app-shells/fish/fish-4.1.2.ebuild
+++ b/app-shells/fish/fish-4.1.2.ebuild
@@ -27,7 +27,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
+   KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2025-11-07 Thread Sam James

commit: ba164fafdfbc6fc77133dac4229ba4d7621b1482
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  7 10:52:08 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  7 10:52:08 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba164faf

app-shells/fish: Stabilize 4.1.2 arm64, #965740

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-4.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-4.1.2.ebuild 
b/app-shells/fish/fish-4.1.2.ebuild
index 0568f35044e8..cf4c225d8a01 100644
--- a/app-shells/fish/fish-4.1.2.ebuild
+++ b/app-shells/fish/fish-4.1.2.ebuild
@@ -27,7 +27,7 @@ else

https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
+   KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2025-10-18 Thread Sam James

commit: 8e7ce3154899b293b1a06e7bed44b6f8621206c9
Author: idealseal  protonmail  com>
AuthorDate: Mon Oct  6 16:47:22 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  8 05:50:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7ce315

app-shells/fish: add 4.1.1

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44069
Closes: https://github.com/gentoo/gentoo/pull/44069
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.1.1.ebuild | 109 ++
 2 files changed, 111 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index aed32e533bb1..b5c1bf9cd24c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -2,7 +2,9 @@ DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
+DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
+DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.1.1.ebuild 
b/app-shells/fish/fish-4.1.1.ebuild
new file mode 100644
index ..0568f35044e8
--- /dev/null
+++ b/app-shells/fish/fish-4.1.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
+else
+   SRC_URI="
+   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
+   ${CARGO_CRATE

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

2025-10-18 Thread Sam James

commit: c41b4152dd4b97796d2693507e974edd19aeb1dc
Author: idealseal  protonmail  com>
AuthorDate: Sun Sep 28 15:30:25 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:44:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41b4152

app-shells/fish: drop 4.0.0-r1

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43973
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest |   2 -
 app-shells/fish/fish-4.0.0-r1.ebuild | 165 ---
 2 files changed, 167 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index ce0e86b00bec..b0405a467e81 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,11 +1,9 @@
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
-DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 
70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d
 SHA512 
559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c
 DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639
 SHA512 
ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
 DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
-DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455

diff --git a/app-shells/fish/fish-4.0.0-r1.ebuild 
b/app-shells/fish/fish-4.0.0-r1.ebuild
deleted file mode 100644
index cc3146978ee5..
--- a/app-shells/fish/fish-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
-
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Friend

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

2025-10-18 Thread Sam James

commit: ae219226e4b51c943bdd34848aaecfd3ab039de4
Author: idealseal  protonmail  com>
AuthorDate: Wed Oct  8 10:21:26 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  9 07:00:46 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae219226

app-shells/fish: add 4.1.2

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44095
Closes: https://github.com/gentoo/gentoo/pull/44095
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.1.2.ebuild | 109 ++
 2 files changed, 111 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b5c1bf9cd24c..c15688dad535 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,8 +3,10 @@ DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab734632
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B 
c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b
 SHA512 
00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
+DIST fish-4.1.2.tar.xz 2968176 BLAKE2B 
dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69
 SHA512 
a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
+DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.1.2.ebuild 
b/app-shells/fish/fish-4.1.2.ebuild
new file mode 100644
index ..0568f35044e8
--- /dev/null
+++ b/app-shells/fish/fish-4.1.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="http

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

2025-10-02 Thread Sam James

commit: 109744196fe4f5ae8a22a498fa47550a61f40610
Author: idealseal  protonmail  com>
AuthorDate: Sun Sep 28 15:29:30 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:44:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10974419

app-shells/fish: sync live

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43973
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-.ebuild | 55 +---
 1 file changed, 12 insertions(+), 43 deletions(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 43f063210450..d3ec9840a518 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..13} )
+CRATES=""
 
-# Tests fail when build directory is not inside source directory.
-BUILD_DIR="${S}/build"
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
 
-inherit cargo cmake multiprocessing python-any-r1 readme.gentoo-r1 xdg
+inherit cargo cmake readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/";
@@ -38,34 +40,16 @@ IUSE="+doc nls test"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
-"
+BDEPEND="nls? ( sys-devel/gettext )"
 # Release tarballs contain prebuilt documentation.
 [[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
 
 PATCHES=(
-   "${FILESDIR}/${PN}--use-cargo-eclass-for-build.patch"
+   "${FILESDIR}/${P}-use-cargo-eclass-for-build.patch"
 )
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   use test && python-any-r1_pkg_setup
-   rust_pkg_setup
-}
-
 src_unpack() {
if [[ ${PV} ==  ]]; then
git-r3_src_unpack
@@ -78,8 +62,8 @@ src_unpack() {
 src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCTEST_PARALLEL_LEVEL=$(makeopts_jobs)
-DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls 1 0)"
)
cargo_src_configure --no-default-features \
--bin fish \
@@ -91,7 +75,6 @@ src_configure() {
 src_compile() {
local -x PREFIX="${EPREFIX}/usr"
local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-   local -x CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
 
# Bug: https://bugs.gentoo.org/950699
local -x SYSCONFDIR="${EPREFIX}/etc"
@@ -108,24 +91,10 @@ src_compile() {
 }
 
 src_test() {
-   # Tests will create temporary directories.
-   local -x TMPDIR="${T}"
-
-   # Otherwise the dimension will be 0x0
-   local -x COLUMNS=80
-   local -x LINES=24
-
-   # Both depend in locale variables which might not be available.
-   # No die to allow repeated test runs.
-   rm -v tests/checks/{basic,locale}.fish || :
-
-   # Gets skipped when tmux is missing, but we want consistency across 
different systems.
-   # No die to allow repeated test runs.
-   rm -v tests/checks/tmux-*.fish || :
-
-   # Enable colored output for building tests.
local -x CARGO_TERM_COLOR=always
-   cargo_env cmake_build fish_run_tests
+   local -x TEST_VERBOSE=1
+   # cargo_env cmake_src_compile fish_run_tests
+   cargo_env cmake_src_test fish_run_tests
 }
 
 src_install() {

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

2025-10-02 Thread Sam James

commit: 08829e438208948574cf7eb075975d80e5ce9e59
Author: idealseal  protonmail  com>
AuthorDate: Sun Sep 28 15:30:47 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:44:06 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08829e43

app-shells/fish: drop 4.0.2

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43973
Closes: https://github.com/gentoo/gentoo/pull/43973
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 -
 app-shells/fish/fish-4.0.2.ebuild | 110 --
 2 files changed, 112 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 7cc8a21c8ccd..aed32e533bb1 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,9 +1,7 @@
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
-DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
-DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438

diff --git a/app-shells/fish/fish-4.0.2.ebuild 
b/app-shells/fish/fish-4.0.2.ebuild
deleted file mode 100644
index 8e85d81223a9..
--- a/app-shells/fish/fish-4.0.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
-
-inherit cargo cmake readme.gentoo-r1 xdg
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
-else
-   SRC_URI="
-   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
-   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
-   ${CARGO_CRATE_URIS}
-   "
-   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
-fi

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/

2025-10-02 Thread Sam James

commit: 075b8b489b61897f80e737f2c27a757e64f21ce8
Author: idealseal  protonmail  com>
AuthorDate: Sun Sep 28 15:08:08 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:44:04 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075b8b48

app-shells/fish: add 4.1.0

[sam: Add Bug tag, but the PR came before the bug and 4.1.1.]

Bug: https://bugs.gentoo.org/963661
Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43973
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest   |   2 +
 .../fish-4.1.0-use-cargo-eclass-for-build.patch|  48 +
 app-shells/fish/fish-4.1.0.ebuild  | 109 +
 3 files changed, 159 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 37540b9c4ffc..ce0e86b00bec 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,9 +4,11 @@ DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b
 DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
+DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
+DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B 
f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18
 SHA512 
1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/files/fish-4.1.0-use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish-4.1.0-use-cargo-eclass-for-build.patch
new file mode 100644
index ..8261a3588981
--- /dev/null
+++ b/app-shells/fish/files/fish-4.1.0-use-cargo-eclass-for-build.patch
@@ -0,0 +1,48 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15f32f8466..11c11e292c 100644
+--- a/CMakeLists.txt
 b/CMakeList

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

2025-10-02 Thread Sam James

commit: c892123e9b0555ef2caa243f589af506ff881e3a
Author: idealseal  protonmail  com>
AuthorDate: Sun Sep 28 15:30:35 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:44:06 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c892123e

app-shells/fish: drop 4.0.1

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43973
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 -
 app-shells/fish/fish-4.0.1.ebuild | 110 --
 2 files changed, 112 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b0405a467e81..7cc8a21c8ccd 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,10 +1,8 @@
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
-DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639
 SHA512 
ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
 DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 
3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd
 SHA512 
01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
-DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455

diff --git a/app-shells/fish/fish-4.0.1.ebuild 
b/app-shells/fish/fish-4.0.1.ebuild
deleted file mode 100644
index 8e85d81223a9..
--- a/app-shells/fish/fish-4.0.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=""
-
-declare -A GIT_CRATES=(
-   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
-   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
-)
-
-inherit cargo cmake readme.gentoo-r1 xdg
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
-else
-   SRC_URI="
-   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
-   
htt

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

2025-09-22 Thread Arthur Zamarin

commit: b008342ab73176b72a06894ffe106161fe262163
Author: idealseal  protonmail  com>
AuthorDate: Thu Sep 18 11:52:41 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Sep 22 07:55:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b008342a

app-shells/fish: add 4.0.8

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43834
Closes: https://github.com/gentoo/gentoo/pull/43834
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.0.8.ebuild | 110 ++
 2 files changed, 112 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4fd8fc1d7d30..37540b9c4ffc 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,8 +3,10 @@ DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 
70081b5c3a143021456cc37d28051ef86f589c004
 DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639
 SHA512 
ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
 DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
+DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 
9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722
 SHA512 
64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
+DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.0.8.ebuild 
b/app-shells/fish/fish-4.0.8.ebuild
new file mode 100644
index ..8e85d81223a9
--- /dev/null
+++ b/app-shells/fish/fish-4.0.8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO

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

2025-09-14 Thread Sam James

commit: c1e9fb6a8512b2a1a66229d79c170e778373c91b
Author: idealseal  protonmail  com>
AuthorDate: Fri Sep 12 20:40:09 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 14 10:43:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e9fb6a

app-shells/fish: add 4.0.6

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43764
Closes: https://github.com/gentoo/gentoo/pull/43764
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.0.6.ebuild | 110 ++
 2 files changed, 112 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 6cf0cb76cb54..4fd8fc1d7d30 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -2,7 +2,9 @@ DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc
 DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 
70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d
 SHA512 
559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c
 DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639
 SHA512 
ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
 DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
+DIST fish-4.0.6.tar.xz 3057300 BLAKE2B 
f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9
 SHA512 
b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713
 DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
+DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 
8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5
 SHA512 
c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.0.6.ebuild 
b/app-shells/fish/fish-4.0.6.ebuild
new file mode 100644
index ..8e85d81223a9
--- /dev/null
+++ b/app-shells/fish/fish-4.0.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
+else
+   SRC_URI="
+   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
+   ${CARGO_CRATE

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

2025-05-21 Thread Sam James

commit: abb6e306fe7eb5747baf42ce5cc9ed72a9d8a652
Author: idealseal  protonmail  com>
AuthorDate: Thu Apr 24 13:10:44 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 21:02:12 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb6e306

app-shells/fish: add 4.0.2

Signed-off-by: idealseal  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41729
Closes: https://github.com/gentoo/gentoo/pull/41729
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.0.2.ebuild | 110 ++
 2 files changed, 112 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4a4ed518a34e..6cf0cb76cb54 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,6 +1,8 @@
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
 DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 
70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d
 SHA512 
559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c
 DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639
 SHA512 
ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
+DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 
5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac401f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae
 SHA512 
9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96
 DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
+DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.0.2.ebuild 
b/app-shells/fish/fish-4.0.2.ebuild
new file mode 100644
index ..8e85d81223a9
--- /dev/null
+++ b/app-shells/fish/fish-4.0.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
+else
+   SRC_URI="
+   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
+   ${CARGO_CRATE_URIS}
+   "
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   nls? ( sys-devel/gettext )

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

2025-04-05 Thread Sam James

commit: b43d6b775ecc15a036d51c987efbf546c4f84b30
Author: idealseal  protonmail  com>
AuthorDate: Sat Apr  5 10:46:49 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  5 11:50:17 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b43d6b77

app-shells/fish: adjust patches to find right target dir

Closes: https://bugs.gentoo.org/953010
Closes: https://bugs.gentoo.org/953027

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41465
Signed-off-by: Sam James  gentoo.org>

 .../fish-4.0.1-use-cargo-eclass-for-build.patch| 14 --
 .../fish--use-cargo-eclass-for-build.patch | 22 --
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
index 3f2bf9c6ec40..0091d08fed86 100644
--- a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
+++ b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
@@ -1,12 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 496226e89..cb032d6d5 100644
+index 496226e89..69bdf037d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -51,17 +51,6 @@ function(CREATE_TARGET target)
-   add_custom_target(
+@@ -52,18 +52,7 @@ function(CREATE_TARGET target)
  ${target} ALL
  COMMAND
--  "${CMAKE_COMMAND}" -E
+   "${CMAKE_COMMAND}" -E
 -env ${VARS_FOR_CARGO}
 -  ${Rust_CARGO}
 -build --bin ${target}
@@ -17,9 +16,12 @@ index 496226e89..cb032d6d5 100644
 -${CARGO_FLAGS}
 -${FEATURES_ARG}
 -  &&
-   "${CMAKE_COMMAND}" -E
- copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
+-  "${CMAKE_COMMAND}" -E
+-copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
++copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ USES_TERMINAL
+   )
 diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
 index 40887be45..fa0f7ab6f 100644
 --- a/cmake/Rust.cmake

diff --git a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
index f20510a54bd8..964c7435d4ca 100644
--- a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
+++ b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
@@ -1,12 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0510cd2d7..c49f80d69 100644
+index 0510cd2d7..84fa35e2e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -41,17 +41,6 @@ function(CREATE_TARGET target)
-   add_custom_target(
+@@ -42,18 +42,7 @@ function(CREATE_TARGET target)
  ${target} ALL
  COMMAND
--  "${CMAKE_COMMAND}" -E
+   "${CMAKE_COMMAND}" -E
 -env ${VARS_FOR_CARGO}
 -  ${Rust_CARGO}
 -build --bin ${target}
@@ -17,23 +16,26 @@ index 0510cd2d7..c49f80d69 100644
 -${CARGO_FLAGS}
 -${FEATURES_ARG}
 -  &&
-   "${CMAKE_COMMAND}" -E
- copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
+-  "${CMAKE_COMMAND}" -E
+-copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
++copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ USES_TERMINAL
+   )
 diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index c5bb1b1b3..618b47183 100644
+index 9cdd01c30..5c554dd2d 100644
 --- a/cmake/Rust.cmake
 +++ b/cmake/Rust.cmake
-@@ -5,7 +5,7 @@ set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off)
+@@ -1,7 +1,7 @@
  include(FindRust)
- find_package(Rust 1.70 REQUIRED)
+ find_package(Rust REQUIRED)
  
 -set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
 +set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
  
  if(DEFINED ASAN)
  list(APPEND CARGO_FLAGS "-Z" "build-std")
-@@ -22,8 +22,8 @@ else()
+@@ -18,8 +18,8 @@ else()
  set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
  endif()

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

2025-03-28 Thread Sam James

commit: 5ba01ac1e184486ad4afa942103a0678bd2aec90
Author: idealseal  protonmail  com>
AuthorDate: Wed Mar 26 17:37:39 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 28 15:07:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba01ac1

app-shells/fish: remove unused environment variables

These were left over from syncing with the live ebuild.

Closes: https://bugs.gentoo.org/951311

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-4.0.1.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-shells/fish/fish-4.0.1.ebuild 
b/app-shells/fish/fish-4.0.1.ebuild
index 5d155c4ce982..38ea9817d238 100644
--- a/app-shells/fish/fish-4.0.1.ebuild
+++ b/app-shells/fish/fish-4.0.1.ebuild
@@ -10,7 +10,7 @@ declare -A GIT_CRATES=(

[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
 )
 
-inherit cargo cmake multiprocessing readme.gentoo-r1 xdg
+inherit cargo cmake readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/";
@@ -60,7 +60,6 @@ src_unpack() {
 src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCTEST_PARALLEL_LEVEL="$(makeopts_jobs)"
-DINSTALL_DOCS="$(usex doc)"
)
cargo_src_configure --no-default-features \
@@ -99,8 +98,6 @@ src_compile() {
 
 src_test() {
local -x CARGO_TERM_COLOR=always
-   local -x FISH_SOURCE_DIR="${S}"
-   local -x FISH_FORCE_COLOR=1
local -x TEST_VERBOSE=1
cargo_env cmake_src_test -R cargo-test
 }

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/

2025-03-28 Thread Sam James

commit: ba26d86a4688e913386828b90d43c76822dbeddf
Author: idealseal  protonmail  com>
AuthorDate: Wed Mar 26 17:56:57 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 28 15:07:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba26d86a

app-shells/fish: fix link failure with gcc

This happens when we rebuild the code with Fish's CMake wrapper (we need
that to install auxilary files and run test), since cargo.eclass and
Fish's build system put the target executables in different output
directories.

First we patch CMake so that it doesn't even try to execute cargo for
it's targets and just retain the target to copy the executables over into
the CMake build directory.

Also we need to set the cargo output directory in the CMake scripts to
point to the target directory of cargo.eclass so it reuses the already
build binaries.

And since Fish sometimes uses a custom cargo build profile which alters
the target directory in a way not handled by cargo.eclass we remove that
as well.

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../fish-4.0.1-use-cargo-eclass-for-build.patch| 46 ++
 app-shells/fish/fish-4.0.1.ebuild  | 12 ++
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
new file mode 100644
index ..3f2bf9c6ec40
--- /dev/null
+++ b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 496226e89..cb032d6d5 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -51,17 +51,6 @@ function(CREATE_TARGET target)
+   add_custom_target(
+ ${target} ALL
+ COMMAND
+-  "${CMAKE_COMMAND}" -E
+-env ${VARS_FOR_CARGO}
+-  ${Rust_CARGO}
+-build --bin ${target}
+-$<$:--release>
+-$<$:--profile=release-with-debug>
+---target ${Rust_CARGO_TARGET}
+---no-default-features
+-${CARGO_FLAGS}
+-${FEATURES_ARG}
+-  &&
+   "${CMAKE_COMMAND}" -E
+ copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
+index 40887be45..fa0f7ab6f 100644
+--- a/cmake/Rust.cmake
 b/cmake/Rust.cmake
+@@ -5,7 +5,7 @@ set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off)
+ include(FindRust)
+ find_package(Rust REQUIRED)
+ 
+-set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
++set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
+ 
+ if(DEFINED ASAN)
+ list(APPEND CARGO_FLAGS "-Z" "build-std")
+@@ -22,8 +22,8 @@ else()
+ set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
+ endif()
+ 
+-set(rust_profile 
$,debug,$,release-with-debug,release>>)
+-set(rust_debugflags "$<$:-g>$<$:-g>")
++set(rust_profile $,debug,release>)
++set(rust_debugflags "$<$:-g>")
+ 
+ 
+ # Temporary hack to propogate CMake flags/options to build.rs. We need to get 
CMake to evaluate the

diff --git a/app-shells/fish/fish-4.0.1.ebuild 
b/app-shells/fish/fish-4.0.1.ebuild
index 38ea9817d238..8e85d81223a9 100644
--- a/app-shells/fish/fish-4.0.1.ebuild
+++ b/app-shells/fish/fish-4.0.1.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 # Release tarballs contain prebuilt documentation.
 [[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-4.0.1-use-cargo-eclass-for-build.patch"
+)
+
 QA_FLAGS_IGNORED="usr/bin/.*"
 
 src_unpack() {
@@ -86,14 +90,6 @@ src_compile() {
fi
 
cargo_src_compile
-
-   # Copy built binaries into the cmake build directory to mark the targets
-   # up-to-date in cmake.
-   for target in fish fish_indent fish_key_reader; do
-   cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die
-   done
-
-   cmake_src_compile
 }
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/

2025-03-28 Thread Sam James

commit: 3732e5b0cbdb990e57172a660c5c297f9ae2dad9
Author: idealseal  protonmail  com>
AuthorDate: Wed Mar 26 18:23:13 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 28 15:07:55 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3732e5b0

app-shells/fish: sync live ebuild, fix link failure with gcc

This happens when we rebuild the code with Fish's CMake wrapper (we need
that to install auxilary files and run test), since cargo.eclass and
Fish's build system put the target executables in different output
directories.

First we patch CMake so that it doesn't even try to execute cargo for
it's targets and just retain the target to copy the executables over into
the CMake build directory.

Also we need to set the cargo output directory in the CMake scripts to
point to the target directory of cargo.eclass so it reuses the already
build binaries.

And since Fish sometimes uses a custom cargo build profile which alters
the target directory in a way not handled by cargo.eclass we remove that
as well.

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41068
Signed-off-by: Sam James  gentoo.org>

 .../fish--use-cargo-eclass-for-build.patch | 46 ++
 app-shells/fish/fish-.ebuild   | 13 ++
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch 
b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
new file mode 100644
index ..f20510a54bd8
--- /dev/null
+++ b/app-shells/fish/files/fish--use-cargo-eclass-for-build.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0510cd2d7..c49f80d69 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -41,17 +41,6 @@ function(CREATE_TARGET target)
+   add_custom_target(
+ ${target} ALL
+ COMMAND
+-  "${CMAKE_COMMAND}" -E
+-env ${VARS_FOR_CARGO}
+-  ${Rust_CARGO}
+-build --bin ${target}
+-$<$:--release>
+-$<$:--profile=release-with-debug>
+---target ${Rust_CARGO_TARGET}
+---no-default-features
+-${CARGO_FLAGS}
+-${FEATURES_ARG}
+-  &&
+   "${CMAKE_COMMAND}" -E
+ copy "${rust_target_dir}/${rust_profile}/${target}" 
"${CMAKE_CURRENT_BINARY_DIR}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
+index c5bb1b1b3..618b47183 100644
+--- a/cmake/Rust.cmake
 b/cmake/Rust.cmake
+@@ -5,7 +5,7 @@ set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off)
+ include(FindRust)
+ find_package(Rust 1.70 REQUIRED)
+ 
+-set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
++set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
+ 
+ if(DEFINED ASAN)
+ list(APPEND CARGO_FLAGS "-Z" "build-std")
+@@ -22,8 +22,8 @@ else()
+ set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
+ endif()
+ 
+-set(rust_profile 
$,debug,$,release-with-debug,release>>)
+-set(rust_debugflags "$<$:-g>$<$:-g>")
++set(rust_profile $,debug,release>)
++set(rust_debugflags "$<$:-g>")
+ 
+ 
+ # Temporary hack to propagate CMake flags/options to build.rs. We need to get 
CMake to evaluate the

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 6912899db052..43f063210450 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -50,6 +50,10 @@ BDEPEND="
 # Release tarballs contain prebuilt documentation.
 [[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
 
+PATCHES=(
+   "${FILESDIR}/${PN}--use-cargo-eclass-for-build.patch"
+)
+
 QA_FLAGS_IGNORED="usr/bin/.*"
 
 python_check_deps() {
@@ -101,14 +105,6 @@ src_compile() {
fi
 
cargo_src_compile
-
-   # Copy built binaries into the cmake build directory to mark the targets
-   # up-to-date in cmake.
-   for target in fish fish_indent fish_key_reader; do
-   cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die
-   done
-
-   cmake_src_compile
 }
 
 src_test() {
@@ -129,7 +125,6 @@ src_test() {
 
# Enable colored output for building tests.
local -x CARGO_TERM_COLOR=always
-   # TODO: Figure out why we link again.
cargo_env cmake_build fish_run_tests
 }

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

2025-03-13 Thread Sam James

commit: c449aec6f5bc6a3461c3479c44f6ba7ef95a655f
Author: idealseal  protonmail  com>
AuthorDate: Thu Mar 13 14:23:28 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 13 17:06:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c449aec6

app-shells/fish: cleanup ebuild, make tests work

Remove all but cargo tests. Upstream has fixes for our test issues but
they weren't backported to 4.0.1.

Closes: https://bugs.gentoo.org/715976
Closes: https://bugs.gentoo.org/727684
Closes: https://bugs.gentoo.org/802873
Closes: https://bugs.gentoo.org/807742
Closes: https://bugs.gentoo.org/838187
Closes: https://bugs.gentoo.org/886161
Closes: https://bugs.gentoo.org/950051
Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-4.0.1.ebuild | 104 ++
 1 file changed, 28 insertions(+), 76 deletions(-)

diff --git a/app-shells/fish/fish-4.0.1.ebuild 
b/app-shells/fish/fish-4.0.1.ebuild
index 61eb5b15a6b5..5d155c4ce982 100644
--- a/app-shells/fish/fish-4.0.1.ebuild
+++ b/app-shells/fish/fish-4.0.1.ebuild
@@ -10,9 +10,7 @@ declare -A GIT_CRATES=(

[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
 )
 
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
+inherit cargo cmake multiprocessing readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/";
@@ -38,34 +36,17 @@ LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT 
PSF-2 ZLIB"
 # Dependent crate licenses
 LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
 SLOT="0"
-IUSE="+doc nls split-usr test"
+IUSE="+doc nls test"
 
 RESTRICT="!test? ( test )"
 
 BDEPEND="
nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   dev-tcltk/expect
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
 "
-# we don't need sphinx dep for release tarballs
+# Release tarballs contain prebuilt documentation.
 [[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
 
-QA_FLAGS_IGNORED="**bin/fish*"
-
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   use test && python-any-r1_pkg_setup
-   rust_pkg_setup
-}
+QA_FLAGS_IGNORED="usr/bin/.*"
 
 src_unpack() {
if [[ ${PV} ==  ]]; then
@@ -76,81 +57,52 @@ src_unpack() {
fi
 }
 
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   if use split-usr; then
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   fi
-
-   # remove the build targets from the default build set so they are not 
wanted
-   # if cmake_src_install is called
-   sed -i \
-   -e '
-   /function(CREATE_TARGET target)/,/endfunction(CREATE_TARGET)/ {
-   s/${target} ALL/${target}/
-   }' CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
 src_configure() {
local mycmakeargs=(
-   # installing into /bin breaks tests on merged usr systems.
-   # sbin -> bin symlink confuses tests.
-   # so on split-usr we install to /bin.
-   # on merge-usr we set sbindir to bin.
-   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
-   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCTEST_PARALLEL_LEVEL="$(makeopts_jobs)"
-DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
)
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cargo_src_configure --no-default-features --bin fish --bin fish_indent 
--bin fish_key_reader
+   cargo_src_configure --no-default-features \
+   --bin fish \
+   --bin fish_indent \
+   --bin fish_key_reader
cmake_src_configure
 }
 
 src_compile() {
local -x PREFIX="${EPREFIX}/usr"
local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   local -x CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
+
# Bug: https://bugs.gentoo.org/950699
local -x SYSCONFDIR="${EPREFIX}/etc"
-   local -x CMAKE_WITH_GETTEXT
-   CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
+
+   # Release tarballs contain prebuilt documentation.
+   local -x FISH_BUILD_DOCS
+   if [[ ${PV} ==  ]]; then
+   FISH_BUILD_DOCS="$(usex doc 1 0)"
+   else
+   FISH_BUILD

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

2025-03-13 Thread Sam James

commit: d7389b63c47c153c1024f0cae47b342095ba80ed
Author: idealseal  protonmail  com>
AuthorDate: Thu Mar 13 14:24:22 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 13 17:06:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7389b63

app-shells/fish: sync live ebuild

Enable nearly all of tests again.

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41060
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-.ebuild | 106 +--
 1 file changed, 46 insertions(+), 60 deletions(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 443624f2a4d8..6912899db052 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -5,7 +5,10 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11..13} )
 
-inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
+# Tests fail when build directory is not inside source directory.
+BUILD_DIR="${S}/build"
+
+inherit cargo cmake multiprocessing python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/";
@@ -19,9 +22,10 @@ if [[ ${PV} ==  ]]; then
 else
SRC_URI="

https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
${CARGO_CRATE_URIS}
"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -30,7 +34,7 @@ LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 
ZLIB"
 # Dependent crate licenses
 LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
 SLOT="0"
-IUSE="+doc nls split-usr test"
+IUSE="+doc nls test"
 
 RESTRICT="!test? ( test )"
 
@@ -38,16 +42,15 @@ BDEPEND="
nls? ( sys-devel/gettext )
test? (
${PYTHON_DEPS}
-   dev-tcltk/expect
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
')
)
 "
-# we don't need shpinx dep for release tarballs
+# Release tarballs contain prebuilt documentation.
 [[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
 
-QA_FLAGS_IGNORED="**bin/fish*"
+QA_FLAGS_IGNORED="usr/bin/.*"
 
 python_check_deps() {
use test || return 0
@@ -68,89 +71,72 @@ src_unpack() {
fi
 }
 
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   if use split-usr; then
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   fi
-
-   # remove the build targets from the default build set so they are not 
wanted
-   # if cmake_src_install is called
-   sed -i \
-   -e '
-   /function(CREATE_TARGET target)/,/endfunction(CREATE_TARGET)/ {
-   s/${target} ALL/${target}/
-   }' CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
 src_configure() {
local mycmakeargs=(
-   # installing into /bin breaks tests on merged usr systems.
-   # sbin -> bin symlink confuses tests.
-   # so on split-usr we install to /bin.
-   # on merge-usr we set sbindir to bin.
-   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
-   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCTEST_PARALLEL_LEVEL=$(makeopts_jobs)
-DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
)
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cargo_src_configure --no-default-features --bin fish --bin fish_indent 
--bin fish_key_reader
+   cargo_src_configure --no-default-features \
+   --bin fish \
+   --bin fish_indent \
+   --bin fish_key_reader
cmake_src_configure
 }
 
 src_compile() {
local -x PREFIX="${EPREFIX}/usr"
local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   local -x CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
+
# Bug: https://bugs.gentoo.org/950699
local -x SYSCONFDIR="${EPREFIX}/etc"
-   local -x CMAKE_WITH_GETTEXT
-   CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
+
+   # Release tarballs contain prebuilt documentation.
+   local -x FISH_BUILD_DOCS
+   if [[ ${PV} ==  ]]; then
+

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

2025-03-13 Thread Sam James

commit: 29e148b6c524df0e59e581c87ce78aceddf9503e
Author: idealseal  protonmail  com>
AuthorDate: Thu Mar 13 08:40:51 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 13 09:44:46 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e148b6

app-shells/fish: add 4.0.1

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41053
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.0.1.ebuild | 165 ++
 2 files changed, 167 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 84e64ceaec70..4a4ed518a34e 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,6 @@
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
 DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 
70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d
 SHA512 
559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c
+DIST fish-4.0.1.tar.xz 3049856 BLAKE2B 
d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639
 SHA512 
ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
 DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
+DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 
BLAKE2B 
533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68
 SHA512 
9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da815217bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.0.1.ebuild 
b/app-shells/fish/fish-4.0.1.ebuild
new file mode 100644
index ..61eb5b15a6b5
--- /dev/null
+++ b/app-shells/fish/fish-4.0.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
+else
+   SRC_URI="
+   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
+   ${CARGO_CRATE_URIS}
+   "
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
+SLOT="0"
+IUSE="+doc nls split-usr test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need sphinx dep for release tarballs
+[[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
+
+QA_FLAGS_IGNORED="**bin/fish*"
+
+python_check_deps() {
+   use test || return 0
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+   rust_pkg_setup
+}
+
+src_unpack() {
+   if [[ ${PV} ==  ]]; t

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

2025-03-11 Thread Sam James

commit: dc93d3d1b2ed96ae2ebfea8c60d3f32b04ce6a7f
Author: idealseal  protonmail  com>
AuthorDate: Mon Mar 10 11:17:52 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 11 09:10:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc93d3d1

app-shells/fish: sync live ebuild

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40997
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-4.0.0-r1.ebuild | 1 -
 app-shells/fish/fish-.ebuild | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-shells/fish/fish-4.0.0-r1.ebuild 
b/app-shells/fish/fish-4.0.0-r1.ebuild
index c0f7125bd50f..cc3146978ee5 100644
--- a/app-shells/fish/fish-4.0.0-r1.ebuild
+++ b/app-shells/fish/fish-4.0.0-r1.ebuild
@@ -112,7 +112,6 @@ src_configure() {
else
mycmakeargs+=( -DBUILD_DOCS=OFF )
fi
-
cargo_src_configure --no-default-features --bin fish --bin fish_indent 
--bin fish_key_reader
cmake_src_configure
 }

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index cb59069fbc8e..443624f2a4d8 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
 
@@ -111,6 +111,8 @@ src_configure() {
 src_compile() {
local -x PREFIX="${EPREFIX}/usr"
local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   # Bug: https://bugs.gentoo.org/950699
+   local -x SYSCONFDIR="${EPREFIX}/etc"
local -x CMAKE_WITH_GETTEXT
CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
cargo_src_compile

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

2025-03-11 Thread Sam James

commit: 1a1c462aff3c8d781088e6e82debd0ca5d756d70
Author: idealseal  protonmail  com>
AuthorDate: Mon Mar 10 11:07:29 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 11 09:10:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1c462a

app-shells/fish: inject proper sysconfdir

Older fish versions used /etc/fish as the sysconfdir and if not set
explicitly fish 4 will default to /usr/share/etc/fish.

Closes: https://bugs.gentoo.org/950699

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/{fish-4.0.0.ebuild => fish-4.0.0-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-shells/fish/fish-4.0.0.ebuild 
b/app-shells/fish/fish-4.0.0-r1.ebuild
similarity index 98%
rename from app-shells/fish/fish-4.0.0.ebuild
rename to app-shells/fish/fish-4.0.0-r1.ebuild
index fd51ab804370..c0f7125bd50f 100644
--- a/app-shells/fish/fish-4.0.0.ebuild
+++ b/app-shells/fish/fish-4.0.0-r1.ebuild
@@ -112,6 +112,7 @@ src_configure() {
else
mycmakeargs+=( -DBUILD_DOCS=OFF )
fi
+
cargo_src_configure --no-default-features --bin fish --bin fish_indent 
--bin fish_key_reader
cmake_src_configure
 }
@@ -119,6 +120,8 @@ src_configure() {
 src_compile() {
local -x PREFIX="${EPREFIX}/usr"
local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   # Bug: https://bugs.gentoo.org/950699
+   local -x SYSCONFDIR="${EPREFIX}/etc"
local -x CMAKE_WITH_GETTEXT
CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
cargo_src_compile

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

2025-03-02 Thread Arthur Zamarin

commit: 5974458e8a626ad45e4b288e580f201a73797c3a
Author: idealseal  protonmail  com>
AuthorDate: Sun Mar  2 12:04:33 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar  2 17:59:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5974458e

app-shells/fish: drop 4.0_beta1

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/Manifest  |  76 ---
 app-shells/fish/fish-4.0_beta1.ebuild | 238 --
 2 files changed, 314 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 733f536af9fa..84e64ceaec70 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,80 +1,4 @@
-DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 
8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6
 SHA512 
5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
-DIST autocfg-1.4.0.crate 17712 BLAKE2B 
7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6
 SHA512 
3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
-DIST bitflags-2.6.0.crate 45357 BLAKE2B 
3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6
 SHA512 
f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
-DIST block-buffer-0.10.4.crate 10538 BLAKE2B 
d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11
 SHA512 
b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
-DIST cc-1.1.30.crate 84509 BLAKE2B 
59d2fcc0d6bb9d7c97e4f27b49e88b3260f6b166804ac25f3b49eb368e6442193a36869d305554494357f206e3d1f70454a3b740e6b6a5b043c5cc0c82c0c57c
 SHA512 
0a74e4753afd84883bec7a402fa6c3e80bee18f496fa0168fec96e1e468d2e873c54f2f536a013c83eceaf75b9fb6896810ffd0a738d9f94358fc5165d6f4394
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B 
e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b
 SHA512 
0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B 
a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e
 SHA512 
74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
-DIST cpufeatures-0.2.14.crate 13165 BLAKE2B 
45521d1a4bf2ddc03c6cdb9ceacb900806a03748fd122dd4431f6927d06cbf8608f9830e312b5728dd55b5084476280669129ea80477432fd04fdd68a0e50fb0
 SHA512 
402c0d6497c65882415841b9eb5953b1dcc1cb35b9fb4512801f3d0e2a056ca95bd32fdf70b6e65a18b048d7df8892c95fef1de975b56b63cfe45460783d5867
-DIST crypto-common-0.1.6.crate 8760 BLAKE2B 
f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7
 SHA512 
471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST dashmap-5.5.3.crate 24061 BLAKE2B 
2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71
 SHA512 
15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a
-DIST digest-0.10.7.crate 19557 BLAKE2B 
61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a
 SHA512 
0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
-DIST equivalent-1.0.1.crate 6615 BLAKE2B 
302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a
 SHA512 
b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
-DIST errno-0.3.9.crate 10690 BLAKE2B 
8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651
 SHA512 
777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92d

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

2025-03-02 Thread Arthur Zamarin

commit: b514d3dfa90a70851790547c9bca477a672f9b06
Author: idealseal  protonmail  com>
AuthorDate: Fri Feb 28 13:21:58 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar  2 17:59:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b514d3df

app-shells/fish: add 4.0.0

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/Manifest  |   2 +
 app-shells/fish/fish-4.0.0.ebuild | 163 ++
 2 files changed, 165 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 838ade8b3f4f..733f536af9fa 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -12,7 +12,9 @@ DIST digest-0.10.7.crate 19557 BLAKE2B 
61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 
302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a
 SHA512 
b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.9.crate 10690 BLAKE2B 
8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651
 SHA512 
777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
+DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 
70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d
 SHA512 
559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c
 DIST fish-4.0b1.tar.xz 3037344 BLAKE2B 
c2641f7d0aa74d9d17432c653f684278742bf86999f4bdcb82322bc5c813dac1b7fcd5f694f5955dcf082d9772def08e7a0857c2b24759408075da4b9ba8aa18
 SHA512 
9f9740076e09e5b3487586be3e8572b42b8d2084b6616fb1792e94d24da8d46bc38f7d55b8728cfc0a3dc9820136de7608528c37dc6aaec474a208a663f07f3b
+DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 
943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245
 SHA512 
d79489c1a997ddd2736c17848a8663bd199a08e78c1764b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c
 DIST fnv-1.0.7.crate 11266 BLAKE2B 
81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d
 SHA512 
2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foldhash-0.1.3.crate 13712 BLAKE2B 
e5913d3aa493d0176af9650354d98870b7e97523ca743a7d9605da3f559463654f391e42438d96fc797397ced449f13ce499c20ed5db7aec772aae97c5f29175
 SHA512 
844d5b699db632254dfc378d46e34909637118647250e2382cbb88855f6739fb9b5f1b840bb8e250dc8fbd2a97c9155e5d8fd0c5c760b8e02dd0aecd96818a5b
 DIST generic-array-0.14.7.crate 15950 BLAKE2B 
e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b
 SHA512 
363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d

diff --git a/app-shells/fish/fish-4.0.0.ebuild 
b/app-shells/fish/fish-4.0.0.ebuild
new file mode 100644
index ..fd51ab804370
--- /dev/null
+++ b/app-shells/fish/fish-4.0.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+   
[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+   
[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
+else
+   SRC_URI="
+   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   
https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
+   ${CARGO_CRATE_URIS}
+   "
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"

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

2025-01-21 Thread Joonas Niilola

commit: 22915355a3974047265a2c1c991017b220cd8702
Author: idealseal  protonmail  com>
AuthorDate: Fri Dec 27 23:51:55 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 21 14:34:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22915355

app-shells/fish: sync live ebuild

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/fish/fish-.ebuild | 82 +---
 1 file changed, 59 insertions(+), 23 deletions(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 08bade169bef..cb59069fbc8e 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake python-any-r1 readme.gentoo-r1 xdg
+inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/";
@@ -13,27 +13,27 @@ HOMEPAGE="https://fishshell.com/";
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"
 
-if [[ ${PV} == "" ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+   EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git";
 else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   SRC_URI="
+   
https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+   ${CARGO_CRATE_URIS}
+   "
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls split-usr test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-apps/coreutils
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
 BDEPEND="
nls? ( sys-devel/gettext )
test? (
@@ -45,21 +45,44 @@ BDEPEND="
)
 "
 # we don't need shpinx dep for release tarballs
-[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+[[ ${PV} ==  ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
 
-S="${WORKDIR}/${MY_P}"
+QA_FLAGS_IGNORED="**bin/fish*"
 
 python_check_deps() {
use test || return 0
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+   rust_pkg_setup
+}
+
+src_unpack() {
+   if [[ ${PV} ==  ]]; then
+   git-r3_src_unpack
+   cargo_live_src_unpack
+   else
+   cargo_src_unpack
+   fi
+}
+
 src_prepare() {
# workaround for https://github.com/fish-shell/fish-shell/issues/4883
if use split-usr; then
sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
cmake/Tests.cmake || die
fi
+
+   # remove the build targets from the default build set so they are not 
wanted
+   # if cmake_src_install is called
+   sed -i \
+   -e '
+   /function(CREATE_TARGET target)/,/endfunction(CREATE_TARGET)/ {
+   s/${target} ALL/${target}/
+   }' CMakeLists.txt || die
+
cmake_src_prepare
 }
 
@@ -72,7 +95,6 @@ src_configure() {
$(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
"-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-DINSTALL_DOCS="$(usex doc)"
-DWITH_GETTEXT="$(usex nls)"
)
@@ -82,9 +104,25 @@ src_configure() {
else
mycmakeargs+=( -DBUILD_DOCS=OFF )
fi
+   cargo_src_configure --no-default-features --bin fish --bin fish_indent 
--bin fish_key_reader
cmake_src_configure
 }
 
+src_compile() {
+   local -x PREFIX="${EPREFIX}/usr"
+   local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   local -x CMAKE_WITH_GETTEXT
+   CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
+   cargo_src_compile
+
+   # copy files built with cargo_src_compile into the cmake build 
directory,
+   # so when we run cmake_src_install they are not rebuild
+   for target in fish fish_indent fish_key_reader; do
+   cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die
+   done
+   cmake_src_compile
+}
+
 src_install() {
cmake_src_install
keepdir /usr/share/fish/vendor_{completions,conf,func

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

2025-01-21 Thread Joonas Niilola

commit: 91608d831c297b40947ebb687ff9a6d9b22492cc
Author: idealseal  protonmail  com>
AuthorDate: Fri Dec 27 23:52:17 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 21 14:34:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91608d83

app-shells/fish: add 4.0_beta1

Signed-off-by: idealseal  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/fish/Manifest  |  77 +++
 app-shells/fish/fish-4.0_beta1.ebuild | 238 ++
 2 files changed, 315 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2a5578db6249..838ade8b3f4f 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1 +1,78 @@
+DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 
8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6
 SHA512 
5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
+DIST autocfg-1.4.0.crate 17712 BLAKE2B 
7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6
 SHA512 
3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
+DIST bitflags-2.6.0.crate 45357 BLAKE2B 
3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6
 SHA512 
f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST block-buffer-0.10.4.crate 10538 BLAKE2B 
d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11
 SHA512 
b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
+DIST cc-1.1.30.crate 84509 BLAKE2B 
59d2fcc0d6bb9d7c97e4f27b49e88b3260f6b166804ac25f3b49eb368e6442193a36869d305554494357f206e3d1f70454a3b740e6b6a5b043c5cc0c82c0c57c
 SHA512 
0a74e4753afd84883bec7a402fa6c3e80bee18f496fa0168fec96e1e468d2e873c54f2f536a013c83eceaf75b9fb6896810ffd0a738d9f94358fc5165d6f4394
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B 
e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b
 SHA512 
0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B 
a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e
 SHA512 
74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
+DIST cpufeatures-0.2.14.crate 13165 BLAKE2B 
45521d1a4bf2ddc03c6cdb9ceacb900806a03748fd122dd4431f6927d06cbf8608f9830e312b5728dd55b5084476280669129ea80477432fd04fdd68a0e50fb0
 SHA512 
402c0d6497c65882415841b9eb5953b1dcc1cb35b9fb4512801f3d0e2a056ca95bd32fdf70b6e65a18b048d7df8892c95fef1de975b56b63cfe45460783d5867
+DIST crypto-common-0.1.6.crate 8760 BLAKE2B 
f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7
 SHA512 
471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
+DIST dashmap-5.5.3.crate 24061 BLAKE2B 
2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71
 SHA512 
15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a
+DIST digest-0.10.7.crate 19557 BLAKE2B 
61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a
 SHA512 
0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 
302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a
 SHA512 
b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.9.crate 10690 BLAKE2B 
8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651
 SHA512 
777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd3

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

2025-01-21 Thread Joonas Niilola

commit: d942a7bd6a6b330a3a598c0b98d1b27c2e57
Author: idealseal  protonmail  com>
AuthorDate: Fri Dec 27 23:58:52 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan 21 14:34:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d942a7bd

app-shells/fish: add myself as a maintainer

Signed-off-by: idealseal  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39870
Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/fish/metadata.xml | 25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/app-shells/fish/metadata.xml b/app-shells/fish/metadata.xml
index df95e62078b0..f6bc0027d78e 100644
--- a/app-shells/fish/metadata.xml
+++ b/app-shells/fish/metadata.xml
@@ -1,13 +1,20 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   
-   Smart and user-friendly command line shell for macOS, Linux, 
and the rest of the family.
-   It includes features like syntax highlighting, 
autosuggest-as-you-type,
-   and fancy tab completions that just work, with no configuration 
required.
-   
-   
-   fish-shell/fish-shell
-   
+
[email protected]
+idealseal
+
+
[email protected]
+Proxy Maintainers
+
+
+Smart and user-friendly command line shell for macOS, Linux, and the 
rest of the family.
+It includes features like syntax highlighting, autosuggest-as-you-type,
+and fancy tab completions that just work, with no configuration 
required.
+
+
+fish-shell/fish-shell
+

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

2024-12-01 Thread John Helmert III

commit: 1c4d928cd780364e80286ce197cb31032b322b64
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Dec  2 01:06:02 2024 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Dec  2 01:06:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4d928c

app-shells/fish: drop 3.4.0, 3.6.1

Bug: https://bugs.gentoo.org/919488
Signed-off-by: John Helmert III  gentoo.org>

 app-shells/fish/Manifest  |   2 -
 app-shells/fish/fish-3.4.0.ebuild | 102 
 app-shells/fish/fish-3.6.1.ebuild | 121 --
 3 files changed, 225 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 33b2a524d4ea..2a5578db6249 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1 @@
-DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
-DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 
13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a
 SHA512 
ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
deleted file mode 100644
index 2aee696c0b59..
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-apps/coreutils
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   dev-tcltk/expect
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-   -DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
-   )
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-   readme.gentoo_create_doc
-}
-
-src_test() {
-   # some tests are fragile, sanitize environment
-   local -x COLUMNS=80
-   local -x LINES=24
-
-   # very fragile, depends on terminal, size, tmux, screen and timing
-   if [[ ${PV} !=  ]]; then
-   rm -v tests/pexpects/terminal.py || die
-   fi
-
-   cmake_build test
-}
-
-pkg_postinst() {
-   readme.gentoo_print_elog
-}

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
deleted file mode 100644
index e0dbb92a3b4b..
--- a/app-

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

2024-08-11 Thread Petr Vaněk

commit: 26c02c98e3aee46afb2419785dbf6fb48de4c941
Author: Petr Vaněk  gentoo  org>
AuthorDate: Sun Aug 11 16:46:16 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Sun Aug 11 16:56:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c02c98

app-shells/fish: enable py3.13

Signed-off-by: Petr Vaněk  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index daa4d1e5952b..442a49ed9a1f 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake python-any-r1 readme.gentoo-r1 xdg

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

2024-06-20 Thread Sam James

commit: 2f556b25fac38498d0e9f8bf5891ee448ef747a7
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 20 13:03:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 20 13:03:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f556b25

app-shells/fish: Stabilize 3.7.1 x86, #934533

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index dcd3410006df..daa4d1e5952b 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2024-06-19 Thread Sam James

commit: fcf65ec9170def8dac045471bb951522d27497e2
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 19 08:46:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 19 08:46:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf65ec9

app-shells/fish: Stabilize 3.7.1 arm, #934533

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index c1fb0aa0256d..6d48409dbbf1 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2024-06-19 Thread Sam James

commit: 126950b5e0aa5961d15e62d3746cf8adc55a5e80
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 19 08:46:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 19 08:46:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126950b5

app-shells/fish: Stabilize 3.7.1 ppc64, #934533

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index 3d7c6dff3fa3..76bc5fd948e8 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2024-06-19 Thread Sam James

commit: 8356f26f2922bb08e15b2ae6580070f5b891027b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 19 08:46:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 19 08:46:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8356f26f

app-shells/fish: Stabilize 3.7.1 amd64, #934533

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index 6d48409dbbf1..dcd3410006df 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2024-06-19 Thread Sam James

commit: 88a98251faead6b14149a9b1afb477ab0bc13410
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 19 08:46:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 19 08:46:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a98251

app-shells/fish: Stabilize 3.7.1 arm64, #934533

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index 6f71b2f4ea74..c1fb0aa0256d 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2024-06-19 Thread Sam James

commit: 9be3d738c2494322e56b305a58b767b856bc9a7a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 19 08:46:04 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 19 08:46:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be3d738

app-shells/fish: Stabilize 3.7.1 ppc, #934533

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.7.1.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
index 76bc5fd948e8..6f71b2f4ea74 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

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

2024-05-05 Thread Arthur Zamarin

commit: 6ab6b0d1288851c70b1c4370683415cd41bd4814
Author: Steffen Winter  proton  me>
AuthorDate: Sun Mar 24 15:49:25 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun May  5 12:16:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab6b0d1

app-shells/fish: add 3.7.1, drop 3.7.0

Signed-off-by: Steffen Winter  proton.me>
Closes: https://github.com/gentoo/gentoo/pull/35900
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/Manifest | 2 +-
 app-shells/fish/{fish-3.7.0.ebuild => fish-3.7.1.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 863399401199..33b2a524d4ea 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 
13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a
 SHA512 
ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
-DIST fish-3.7.0.tar.xz 2961912 BLAKE2B 
fd2c663a21be7a3aad362c69eff94f1cd9947075953deae74de64ef96b1d6f3874efa6389806f0eebc5789068acefb1218c6baaa1059a14ed13b5c33e6bc03e3
 SHA512 
bc5121ddd2a9918befac197b215721f20b69984897ec57558bef8e3a36a849935f6d1ec1c74c2d92e565f23e417039d7130122549c8b1d8c55dd8dbfb51a2d34
+DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 
3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a
 SHA512 
f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe

diff --git a/app-shells/fish/fish-3.7.0.ebuild 
b/app-shells/fish/fish-3.7.1.ebuild
similarity index 100%
rename from app-shells/fish/fish-3.7.0.ebuild
rename to app-shells/fish/fish-3.7.1.ebuild
index 00c62c4a20d5..3d7c6dff3fa3 100644
--- a/app-shells/fish/fish-3.7.0.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -21,6 +21,8 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls split-usr test"
@@ -47,8 +49,6 @@ BDEPEND="
 # we don't need shpinx dep for release tarballs
 [[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
 
-S="${WORKDIR}/${MY_P}"
-
 python_check_deps() {
use test || return 0
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"

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

2024-03-14 Thread Ulrich Müller

commit: 8dcb64163dc99c3b88e23e3eaddd0b3936033c3c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Mar 15 04:16:51 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Mar 15 04:16:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcb6416

app-shells/fish: update LICENSE

Closes: https://bugs.gentoo.org/927039
Signed-off-by: Ulrich Müller  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 4 ++--
 app-shells/fish/fish-3.6.1.ebuild | 2 +-
 app-shells/fish/fish-3.7.0.ebuild | 2 +-
 app-shells/fish/fish-.ebuild  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 73468f481720..31ac7609bb51 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls test"
 

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index 52c6129baa31..2d90b5183b42 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -21,7 +21,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls split-usr test"
 

diff --git a/app-shells/fish/fish-3.7.0.ebuild 
b/app-shells/fish/fish-3.7.0.ebuild
index d11c8f1ca20c..00c62c4a20d5 100644
--- a/app-shells/fish/fish-3.7.0.ebuild
+++ b/app-shells/fish/fish-3.7.0.ebuild
@@ -21,7 +21,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls split-usr test"
 

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index b38fa3e95954..0cd6aa8d4470 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
 SLOT="0"
 IUSE="+doc nls split-usr test"

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

2024-03-09 Thread Yixun Lan

commit: b7f8c5a1527a7acc9034ec86674db3eb441618d6
Author: Steffen Winter  proton  me>
AuthorDate: Wed Feb 28 10:58:26 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Mar  9 10:46:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f8c5a1

app-shells/fish: add 3.7.0

Closes: https://github.com/gentoo/gentoo/pull/35565
Signed-off-by: Steffen Winter  proton.me>
Signed-off-by: Yixun Lan  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.7.0.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2acfb6f754bd..863399401199 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 
13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a
 SHA512 
ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
+DIST fish-3.7.0.tar.xz 2961912 BLAKE2B 
fd2c663a21be7a3aad362c69eff94f1cd9947075953deae74de64ef96b1d6f3874efa6389806f0eebc5789068acefb1218c6baaa1059a14ed13b5c33e6bc03e3
 SHA512 
bc5121ddd2a9918befac197b215721f20b69984897ec57558bef8e3a36a849935f6d1ec1c74c2d92e565f23e417039d7130122549c8b1d8c55dd8dbfb51a2d34

diff --git a/app-shells/fish/fish-3.7.0.ebuild 
b/app-shells/fish/fish-3.7.0.ebuild
new file mode 100644
index ..d11c8f1ca20c
--- /dev/null
+++ b/app-shells/fish/fish-3.7.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls split-usr test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   if use split-usr; then
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   fi
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # installing into /bin breaks tests on merged usr systems.
+   # sbin -> bin symlink confuses tests.
+   # so on split-usr we install to /bin.
+   # on merge-usr we set sbindir to bin.
+   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
+   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+

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

2024-02-14 Thread Joonas Niilola

commit: 514ce30f66c9e195c3d448d5ac9e3f5495432ab0
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Feb 15 07:06:37 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 15 07:06:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514ce30f

app-shells/fish: Stabilize 3.6.1 x86, #838187

Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/fish/fish-3.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index f05f1f9782f2..2a57761866c0 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"

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

2024-02-14 Thread Joonas Niilola

commit: 3aac0c9d77d3ab4da0bf5d406c4bc4cf02615c53
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Feb 15 07:07:00 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 15 07:07:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aac0c9d

app-shells/fish: Stabilize 3.6.1 amd64, #838187

Signed-off-by: Joonas Niilola  gentoo.org>

 app-shells/fish/fish-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index 2a57761866c0..52c6129baa31 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"

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

2023-08-15 Thread Sam James

commit: 55e34012c9738ff93c20555453d2a0bbaf162ac9
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 15 07:33:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 15 07:33:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e34012

app-shells/fish: Stabilize 3.6.1 ppc, #909803

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index 8327a7494cbd..f05f1f9782f2 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"

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

2023-07-20 Thread Sam James

commit: c3dad44eb815e5f86531ae5e5fe2d80ab1f527bf
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 20 12:18:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 20 12:18:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3dad44e

app-shells/fish: Stabilize 3.6.1 ppc64, #909803

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index dd68b2e316fe..8327a7494cbd 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"

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

2023-07-07 Thread Sam James

commit: 57e9519925eeebb718d576521ef0d7baa5b7e820
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  8 03:38:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  8 03:38:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e95199

app-shells/fish: Stabilize 3.6.1 arm64, #909803

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index 3345bbc13ee1..dd68b2e316fe 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"

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

2023-07-06 Thread Sam James

commit: 78c0c108d73a8defa5c99a7dc4d7000cf83f346a
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 03:36:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 03:36:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c0c108

app-shells/fish: Stabilize 3.6.1 arm, #909803

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
index b38fa3e95954..3345bbc13ee1 100644
--- a/app-shells/fish/fish-3.6.1.ebuild
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"

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

2023-04-05 Thread Georgy Yakovlev

commit: 80918c065b2a69f9dac00ffb4d4ec17e6c95bbcd
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Apr  5 23:40:37 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Apr  5 23:40:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80918c06

app-shells/fish: drop 3.6.0

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 -
 app-shells/fish/fish-3.6.0.ebuild | 121 --
 2 files changed, 122 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 7ddc579f07cb..2acfb6f754bd 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,2 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
-DIST fish-3.6.0.tar.xz 2892296 BLAKE2B 
8c27e091b8241d88bd5e8390a0c221aa6cfccd236ece78feb434760318cf7d4e333a470b53bef02c228916b65ff4e19595cbb21e2021409b50d63df5d133b786
 SHA512 
a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
 DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 
13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a
 SHA512 
ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597

diff --git a/app-shells/fish/fish-3.6.0.ebuild 
b/app-shells/fish/fish-3.6.0.ebuild
deleted file mode 100644
index 03c282164a03..
--- a/app-shells/fish/fish-3.6.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls split-usr test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-apps/coreutils
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   dev-tcltk/expect
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   if use split-usr; then
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   fi
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # installing into /bin breaks tests on merged usr systems.
-   # sbin -> bin symlink confuses tests.
-   # so on split-usr we install to /bin.
-   # on merge-usr we set sbindir to bin.
-   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
-   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-   -DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
-   )
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-   readme.gentoo_create_doc
-}
-
-src_test() {
-   # some tests are fragile, sanitize environment
-   local -x COLUMNS=80
-   local -x LINES=24
-
-   # very fragile, depends on terminal, size, tmux, screen and timing
-   # no die is intentional, for repeated test runs
-   if [

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

2023-04-05 Thread Georgy Yakovlev

commit: e50c6ebda22880b4cf91aadd1cdfccb5541210a0
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Apr  5 23:40:24 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Apr  5 23:40:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50c6ebd

app-shells/fish: drop 3.5.1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 -
 app-shells/fish/fish-3.5.1.ebuild | 108 --
 2 files changed, 109 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 1ddfd0e64158..7ddc579f07cb 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
-DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 
960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3
 SHA512 
328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
 DIST fish-3.6.0.tar.xz 2892296 BLAKE2B 
8c27e091b8241d88bd5e8390a0c221aa6cfccd236ece78feb434760318cf7d4e333a470b53bef02c228916b65ff4e19595cbb21e2021409b50d63df5d133b786
 SHA512 
a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
 DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 
13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a
 SHA512 
ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597

diff --git a/app-shells/fish/fish-3.5.1.ebuild 
b/app-shells/fish/fish-3.5.1.ebuild
deleted file mode 100644
index cf71ce82dca9..
--- a/app-shells/fish/fish-3.5.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="https://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-apps/coreutils
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   dev-tcltk/expect
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-   -DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
-   )
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-   readme.gentoo_create_doc
-}
-
-src_test() {
-   # some tests are fragile, sanitize environment
-   local -x COLUMNS=80
-   local -x LINES=24
-
-   # very fragile, depends on terminal, size, tmux, screen and timing
-   if [[ ${PV} !=  ]]; then
-   rm -v tests/pexpects/terminal.py || die
-   fi
-
-   # zfs completion test will fail with "Permis

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

2023-04-05 Thread Georgy Yakovlev

commit: 34f76568cea0e90d1cef4361ff0bb3ba147af2a8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Apr  5 23:38:10 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Apr  5 23:39:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f76568

app-shells/fish: enable py3.11

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 3efa32026379..a654ad4ba29b 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-any-r1 readme.gentoo-r1

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

2023-04-05 Thread Georgy Yakovlev

commit: 467f35f2f752719d6578cef4b7dc45376d934af4
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Apr  5 23:40:07 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Apr  5 23:40:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467f35f2

app-shells/fish: add 3.6.1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.6.1.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index cae4377706b9..1ddfd0e64158 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,4 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 
960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3
 SHA512 
328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
 DIST fish-3.6.0.tar.xz 2892296 BLAKE2B 
8c27e091b8241d88bd5e8390a0c221aa6cfccd236ece78feb434760318cf7d4e333a470b53bef02c228916b65ff4e19595cbb21e2021409b50d63df5d133b786
 SHA512 
a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
+DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 
13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a
 SHA512 
ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597

diff --git a/app-shells/fish/fish-3.6.1.ebuild 
b/app-shells/fish/fish-3.6.1.ebuild
new file mode 100644
index ..03c282164a03
--- /dev/null
+++ b/app-shells/fish/fish-3.6.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls split-usr test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   if use split-usr; then
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   fi
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # installing into /bin breaks tests on merged usr systems.
+   # sbin -> bin symlink confuses tests.
+   # so on split-usr we install to /bin.
+   # on merge-usr we set sbindir to bin.
+   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
+   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+

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

2023-01-09 Thread Georgy Yakovlev

commit: c7464b451fe54c8d125852133156c8990e1231e6
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jan  9 09:10:19 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jan  9 09:10:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7464b45

app-shells/fish: sync live ebuild

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-.ebuild | 27 ---
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index fe718cdc3436..7c8b6a2c6584 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit cmake python-any-r1 readme.gentoo-r1
+inherit cmake python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/";
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+doc nls test"
+IUSE="+doc nls split-usr test"
 
 RESTRICT="!test? ( test )"
 
@@ -56,14 +56,21 @@ python_check_deps() {
 
 src_prepare() {
# workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
+   if use split-usr; then
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   fi
cmake_src_prepare
 }
 
 src_configure() {
local mycmakeargs=(
-   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+   # installing into /bin breaks tests on merged usr systems.
+   # sbin -> bin symlink confuses tests.
+   # so on split-usr we install to /bin.
+   # on merge-usr we set sbindir to bin.
+   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
+   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DCURSES_NEED_NCURSES=ON
-DINSTALL_DOCS="$(usex doc)"
@@ -90,13 +97,18 @@ src_test() {
local -x LINES=24
 
# very fragile, depends on terminal, size, tmux, screen and timing
+   # no die is intentional, for repeated test runs
if [[ ${PV} !=  ]]; then
-   rm -v tests/pexpects/terminal.py || die
+   rm -v tests/pexpects/terminal.py || :
fi
 
# zfs completion test will fail with "Permission denied the ZFS 
utilities must be run as root."
mv "${S}"/share/completions/zfs.{fish,disabled} || die
 
+   # TODO: fix tests & submit upstream
+   # tests are confused by usr/sbin -> bin symlink, no die is intentional 
for repeated test runs
+   use split-usr || rm -v tests/checks/{redirect,type}.fish || :
+
cmake_build test
 
# now restore zfs completions
@@ -105,4 +117,5 @@ src_test() {
 
 pkg_postinst() {
readme.gentoo_print_elog
+   xdg_pkg_postinst
 }

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

2023-01-09 Thread Georgy Yakovlev

commit: 841a60a6636e75c3dd9ec11effbfd71e00731a07
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jan  9 09:06:37 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jan  9 09:10:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841a60a6

app-shells/fish: add 3.6.0

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.6.0.ebuild | 121 ++
 2 files changed, 122 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 271ba61ef4f8..cae4377706b9 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 
960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3
 SHA512 
328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
+DIST fish-3.6.0.tar.xz 2892296 BLAKE2B 
8c27e091b8241d88bd5e8390a0c221aa6cfccd236ece78feb434760318cf7d4e333a470b53bef02c228916b65ff4e19595cbb21e2021409b50d63df5d133b786
 SHA512 
a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996

diff --git a/app-shells/fish/fish-3.6.0.ebuild 
b/app-shells/fish/fish-3.6.0.ebuild
new file mode 100644
index ..7c8b6a2c6584
--- /dev/null
+++ b/app-shells/fish/fish-3.6.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls split-usr test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   if use split-usr; then
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   fi
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # installing into /bin breaks tests on merged usr systems.
+   # sbin -> bin symlink confuses tests.
+   # so on split-usr we install to /bin.
+   # on merge-usr we set sbindir to bin.
+   $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
+   "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   # no die is intentional, for repeated test runs
+   if [[ ${

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

2022-09-19 Thread Sam James

commit: b72ba860f54f57e3a0d93f2de1fc763dc1d9e525
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 20 04:18:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 20 04:18:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72ba860

app-shells/fish: HTTPSify HOMEPAGE

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 app-shells/fish/fish-3.5.1.ebuild | 2 +-
 app-shells/fish/fish-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index b5f7b1b12b38..4a7e4e120edb 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
+HOMEPAGE="https://fishshell.com/";
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"

diff --git a/app-shells/fish/fish-3.5.1.ebuild 
b/app-shells/fish/fish-3.5.1.ebuild
index 936ed237ea77..fe718cdc3436 100644
--- a/app-shells/fish/fish-3.5.1.ebuild
+++ b/app-shells/fish/fish-3.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
+HOMEPAGE="https://fishshell.com/";
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 936ed237ea77..fe718cdc3436 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
+HOMEPAGE="https://fishshell.com/";
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"

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

2022-09-19 Thread Georgy Yakovlev

commit: 4c2d7546ddd720287c61fa062d61232de675e62f
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Sep 20 01:38:14 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Sep 20 01:38:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2d7546

app-shells/fish: drop 3.5.0

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 -
 app-shells/fish/fish-3.5.0.ebuild | 108 --
 2 files changed, 109 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 68f49710bd8d..271ba61ef4f8 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,2 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
-DIST fish-3.5.0.tar.xz 3326276 BLAKE2B 
ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa
 SHA512 
ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859
 DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 
960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3
 SHA512 
328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235

diff --git a/app-shells/fish/fish-3.5.0.ebuild 
b/app-shells/fish/fish-3.5.0.ebuild
deleted file mode 100644
index 936ed237ea77..
--- a/app-shells/fish/fish-3.5.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+doc nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-apps/coreutils
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   test? (
-   ${PYTHON_DEPS}
-   dev-tcltk/expect
-   $(python_gen_any_dep '
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   ')
-   )
-"
-# we don't need shpinx dep for release tarballs
-[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-   use test || return 0
-   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-   -DINSTALL_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
-   )
-   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   if [[ ${PV} ==  ]]; then
-   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
-   else
-   mycmakeargs+=( -DBUILD_DOCS=OFF )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-   readme.gentoo_create_doc
-}
-
-src_test() {
-   # some tests are fragile, sanitize environment
-   local -x COLUMNS=80
-   local -x LINES=24
-
-   # very fragile, depends on terminal, size, tmux, screen and timing
-   if [[ ${PV} !=  ]]; then
-   rm -v tests/pexpects/terminal.py || die
-   fi
-
-   # zfs completion test will fail with "Permission denied the ZFS 
utilities must be run as root."
-   mv "${S}"/share/completions/zfs.{fish,disabled} || die
-
-   cmake_build test
-
-   # now restore zfs completions
-   mv "${S}"/share/completions/zfs.{disabled,fish} || die
-}
-
-pkg_postinst() {
-   readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/

2022-09-19 Thread Georgy Yakovlev

commit: 9f2752b4daf8dfb8c1ba9a0dfc5591ded17a0dba
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Sep 20 01:37:53 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Sep 20 01:37:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2752b4

app-shells/fish: drop 3.4.1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 -
 app-shells/fish/files/fish-3.4.1-atomic.patch |  65 
 app-shells/fish/fish-3.4.1.ebuild | 107 --
 3 files changed, 173 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index d956f27aa0b7..68f49710bd8d 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
-DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 
5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423
 SHA512 
20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
 DIST fish-3.5.0.tar.xz 3326276 BLAKE2B 
ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa
 SHA512 
ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859
 DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 
960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3
 SHA512 
328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235

diff --git a/app-shells/fish/files/fish-3.4.1-atomic.patch 
b/app-shells/fish/files/fish-3.4.1-atomic.patch
deleted file mode 100644
index a12e069a7433..
--- a/app-shells/fish/files/fish-3.4.1-atomic.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/836951
-Taken from https://github.com/fish-shell/fish-shell/pull/8851
-
-From a3eb41ca882cc390b656515dd668a6816f745121 Mon Sep 17 00:00:00 2001
-From: Raymond Wong 
-Date: Mon, 4 Apr 2022 01:14:26 +0800
-Subject: [PATCH 1/2] cmake: alter check for 64-bit atomic operation
-
-Signed-off-by: Raymond Wong 

- cmake/ConfigureChecks.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
-index bc190de054f..924aea1015a 100644
 a/cmake/ConfigureChecks.cmake
-+++ b/cmake/ConfigureChecks.cmake
-@@ -255,10 +255,10 @@ int main () {
- check_cxx_source_compiles("
- #include 
- #include 
--std::atomic x (0);
-+std::atomic n64 (0);
- int main() {
--uint64_t i = x.load(std::memory_order_relaxed);
--return std::atomic_is_lock_free(&x);
-+uint64_t i = n64.load(std::memory_order_relaxed);
-+return std::atomic_is_lock_free(&n64);
- }"
- LIBATOMIC_NOT_NEEDED)
- IF (NOT LIBATOMIC_NOT_NEEDED)
-
-From 2fe9bfe0a6c1a821dabbf52af35c8eb2cd6e029b Mon Sep 17 00:00:00 2001
-From: Raymond Wong 
-Date: Sun, 3 Apr 2022 14:01:15 +0800
-Subject: [PATCH 2/2] cmake: check for 8-bit atomic operation
-
-Fix building on RISC-V.
-Closes #8850.
-
-Signed-off-by: Raymond Wong 

- cmake/ConfigureChecks.cmake | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
-index 924aea1015a..6562d324f45 100644
 a/cmake/ConfigureChecks.cmake
-+++ b/cmake/ConfigureChecks.cmake
-@@ -255,10 +255,13 @@ int main () {
- check_cxx_source_compiles("
- #include 
- #include 
-+std::atomic n8 (0);
- std::atomic n64 (0);
- int main() {
--uint64_t i = n64.load(std::memory_order_relaxed);
--return std::atomic_is_lock_free(&n64);
-+uint8_t i = n8.load(std::memory_order_relaxed);
-+uint64_t j = n64.load(std::memory_order_relaxed);
-+return std::atomic_is_lock_free(&n8)
-+ & std::atomic_is_lock_free(&n64);
- }"
- LIBATOMIC_NOT_NEEDED)
- IF (NOT LIBATOMIC_NOT_NEEDED)

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
deleted file mode 100644
index 08acc9d3b69e..
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-

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

2022-09-19 Thread Georgy Yakovlev

commit: c7df688193b8ef219acba6c4be9d28b057746c7c
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Sep 20 00:22:36 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Sep 20 00:22:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7df6881

app-shells/fish: add 3.5.1

Closes: https://bugs.gentoo.org/863341
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.5.1.ebuild | 108 ++
 2 files changed, 109 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index bb92772d4c31..d956f27aa0b7 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,4 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 
5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423
 SHA512 
20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
 DIST fish-3.5.0.tar.xz 3326276 BLAKE2B 
ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa
 SHA512 
ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859
+DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 
960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3
 SHA512 
328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235

diff --git a/app-shells/fish/fish-3.5.1.ebuild 
b/app-shells/fish/fish-3.5.1.ebuild
new file mode 100644
index ..936ed237ea77
--- /dev/null
+++ b/app-shells/fish/fish-3.5.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   if [[ ${PV} !=  ]]; then
+   rm -v tests/pexpects/terminal.py || die
+   fi
+
+   # zfs comp

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

2022-08-11 Thread Sam James

commit: 3e5a4be068f2f71be6dd25e8ec646175d110529f
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 11 10:11:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 11 10:20:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5a4be0

app-shells/fish: fix PythonAnyMismatchedDepHasVersionCheck

has_version was checking DEPEND, not BDEPEND, so change to python_has_version 
for
better defaults (defaults to BDEPEND) but also nicer output.

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 app-shells/fish/fish-3.4.1.ebuild | 2 +-
 app-shells/fish/fish-3.5.0.ebuild | 2 +-
 app-shells/fish/fish-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 761a34b45d20..b5f7b1b12b38 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
use test || return 0
-   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
index 96644c7a999a..08acc9d3b69e 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
 
 python_check_deps() {
use test || return 0
-   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {

diff --git a/app-shells/fish/fish-3.5.0.ebuild 
b/app-shells/fish/fish-3.5.0.ebuild
index d0328d498838..936ed237ea77 100644
--- a/app-shells/fish/fish-3.5.0.ebuild
+++ b/app-shells/fish/fish-3.5.0.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
use test || return 0
-   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index d0328d498838..936ed237ea77 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
use test || return 0
-   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {

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

2022-07-04 Thread Georgy Yakovlev

commit: b360952c80adbd55b84bb3aca972bec20a794293
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jul  4 21:06:02 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jul  4 21:07:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b360952c

app-shells/fish: add 3.5.0

Closes: https://bugs.gentoo.org/854987
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.5.0.ebuild | 108 ++
 2 files changed, 109 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 86348f3b4176..bb92772d4c31 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1,3 @@
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 
5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423
 SHA512 
20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
+DIST fish-3.5.0.tar.xz 3326276 BLAKE2B 
ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa
 SHA512 
ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859

diff --git a/app-shells/fish/fish-3.5.0.ebuild 
b/app-shells/fish/fish-3.5.0.ebuild
new file mode 100644
index ..d0328d498838
--- /dev/null
+++ b/app-shells/fish/fish-3.5.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   if [[ ${PV} !=  ]]; then
+   rm -v tests/pexpects/terminal.py || die
+   fi
+
+   # zfs completion test will fail with "Permission denied the ZFS 
utilities must be run as root."
+   mv "${S}"/share/completions/zfs.{fish,disabled} || die
+
+   cmake_build test
+
+   # now restore zfs completions
+   mv "${S}"/share/completions/zfs.{disabled,fish} || die
+}
+
+pkg_postinst() {
+   r

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

2022-07-04 Thread Georgy Yakovlev

commit: c9bb6b7a34d3a72208e9cbfa9e6e3b8120e365fa
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jul  4 21:06:48 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jul  4 21:07:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bb6b7a

app-shells/fish: sync live ebuild

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index de44bf1d4092..d0328d498838 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
@@ -94,7 +94,13 @@ src_test() {
rm -v tests/pexpects/terminal.py || die
fi
 
+   # zfs completion test will fail with "Permission denied the ZFS 
utilities must be run as root."
+   mv "${S}"/share/completions/zfs.{fish,disabled} || die
+
cmake_build test
+
+   # now restore zfs completions
+   mv "${S}"/share/completions/zfs.{disabled,fish} || die
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/

2022-05-19 Thread Lars Wendler

commit: 064a1f6462587573309045cbc97f549cf8b0429f
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 20 06:27:41 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 20 06:27:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064a1f64

app-shells/fish: Security cleanup

Bug: https://bugs.gentoo.org/835337
Signed-off-by: Lars Wendler  gentoo.org>

 app-shells/fish/Manifest   |   1 -
 .../fish/files/3.3.1-don-t-override-linker.patch   |  48 --
 app-shells/fish/files/3.3.1-drop-some-tests.patch  |  26 -
 .../fish/files/3.3.1-sbin-path-sh-test.patch   |  25 -
 app-shells/fish/fish-3.3.1-r1.ebuild   | 106 -
 5 files changed, 206 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b25d455e313f..86348f3b4176 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,2 @@
-DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 
61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559
 SHA512 
fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 
5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423
 SHA512 
20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981

diff --git a/app-shells/fish/files/3.3.1-don-t-override-linker.patch 
b/app-shells/fish/files/3.3.1-don-t-override-linker.patch
deleted file mode 100644
index cb67498fd2ba..
--- a/app-shells/fish/files/3.3.1-don-t-override-linker.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c9ab706be64439d1a03f978d3a47450135c87002 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev 
-Date: Tue, 29 Jun 2021 09:40:44 -0700
-Subject: [PATCH] don't override linker
-

- CMakeLists.txt | 18 +-
- 1 file changed, 1 insertion(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fda837cd3..507dc8817 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,22 +56,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
- # Disable exception handling.
- add_compile_options(-fno-exceptions)
- 
--# Prefer lld or the gold linker because they don't emit useless warnings 
about sys_nerr and
--# _sys_errlist. They're also faster (significantly so in the case of lld).
--if (UNIX)
--execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
--ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
--if ("${LD_VERSION}" MATCHES "LLD ")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
--elseif (NOT APPLE)
--execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold 
-Wl,--version
--ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
--if ("${LD_VERSION}" MATCHES "GNU gold")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} 
-fuse-ld=gold")
--endif()
--endif()
--endif()
--
- # Hide the CMake Rules directories in Xcode projects.
- source_group("CMake Rules" REGULAR_EXPRESSION "^$")
- 
-@@ -128,7 +112,7 @@ set(FISH_SRCS
- src/proc.cpp src/reader.cpp src/redirection.cpp src/sanity.cpp 
src/screen.cpp
- src/signal.cpp src/termsize.cpp src/timer.cpp src/tinyexpr.cpp
- src/tokenizer.cpp src/topic_monitor.cpp src/trace.cpp src/utf8.cpp 
src/util.cpp
--src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp 
-+src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp
- src/wutil.cpp src/fds.cpp
- )
- 
--- 
-2.32.0
-

diff --git a/app-shells/fish/files/3.3.1-drop-some-tests.patch 
b/app-shells/fish/files/3.3.1-drop-some-tests.patch
deleted file mode 100644
index 4c4081d77cfa..
--- a/app-shells/fish/files/3.3.1-drop-some-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ec8844d834cc9fe626e9fc326c6f5410341d532a Mon Sep 17 00:00:00 2001
-From: Fabian Homborg 
-Date: Thu, 14 Oct 2021 18:18:51 +0200
-Subject: [PATCH] Drop tests with resetting match start inside lookaround
-
-This seems to be of little use
-
-Fixes #8353

- src/fish_tests.cpp | 5 -
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
-index 3d71877de81..04058b47ba7 100644
 a/src/fish_tests.cpp
-+++ b/src/fish_tests.cpp
-@@ -5723,9 +5723,6 @@ static void test_string() {
- {{L"string", L"match", L"-r", L"-a", L"a*", L"b", 0}, STATUS_CMD_OK, 
L"\n\n"},
- {{L"string", L"match

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

2022-05-19 Thread Agostino Sarubbo

commit: 4458bc7691519cac5514da98c835cae6f15eb3ed
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 19 09:28:33 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 19 09:28:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4458bc76

app-shells/fish: arm64 stable wrt bug #835339

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 4520db7a0454..761a34b45d20 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-05-17 Thread Agostino Sarubbo

commit: 5c1f776375d74b6deabb491d3810e8934c863b59
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 17 09:24:04 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 17 09:24:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1f7763

app-shells/fish: x86 stable wrt bug #835339

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 0521028bf2b1..4520db7a0454 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-05-10 Thread Jakov Smolić

commit: cfb40653c5b6e5e085ed898c80e295f94fed8581
Author: Raymond Wong  pm  me>
AuthorDate: Tue May 10 10:31:23 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May 10 16:39:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb40653

app-shells/fish: forward ~riscv

Signed-off-by: Raymond Wong  pm.me>
Closes: https://github.com/gentoo/gentoo/pull/25417
Signed-off-by: Jakov Smolić  gentoo.org>

 app-shells/fish/fish-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 5faf264b7478..de44bf1d4092 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-05-10 Thread Jakov Smolić

commit: 158d5cfdb8a5ebc7a02ec8b8391d01749a702c2a
Author: Raymond Wong  pm  me>
AuthorDate: Tue May 10 10:30:03 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May 10 16:39:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158d5cfd

app-shells/fish: forward ~mips

Signed-off-by: Raymond Wong  pm.me>
Signed-off-by: Jakov Smolić  gentoo.org>

 app-shells/fish/fish-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index dc549c756ea5..5faf264b7478 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-05-01 Thread Sam James

commit: f49d42d6d3b5071739942a44f7fba50def118434
Author: Sam James  gentoo  org>
AuthorDate: Sun May  1 23:34:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  1 23:34:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49d42d6

app-shells/fish: Stabilize 3.4.0 amd64, #835339

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 2a91b5916d07..0521028bf2b1 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-04-30 Thread WANG Xuerui

commit: 3e560b304b0c659d49af44f984b2bca97ec0d705
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat Apr 30 11:27:25 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun May  1 01:30:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e560b30

app-shells/fish: keyword 3.4.1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-shells/fish/fish-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
index 87792332f963..96644c7a999a 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-04-30 Thread WANG Xuerui

commit: 6bc4d645deaf4f58f01bf114dc999be94aa7c1d1
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat Apr 30 11:29:01 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun May  1 01:30:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc4d645

app-shells/fish: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-shells/fish/fish-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index 45bc18a52822..dc549c756ea5 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-04-24 Thread Jakov Smolić

commit: 75f5c1c0bd8345da6ab7341d31c1dcd1884cd438
Author: Raymond Wong  pm  me>
AuthorDate: Sun Apr 24 08:00:32 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Apr 24 11:05:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f5c1c0

app-shells/fish: Keyword 3.4.1 riscv, #840236

Signed-off-by: Raymond Wong  pm.me>
Signed-off-by: Jakov Smolić  gentoo.org>

 app-shells/fish/fish-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
index 9e86384466cc..2a76439ee7f9 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-04-24 Thread Jakov Smolić

commit: 5d6e2f94f6421a6123295fcb0dd7e454e787f4f5
Author: Raymond Wong  pm  me>
AuthorDate: Sun Apr 24 08:06:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Apr 24 11:05:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6e2f94

app-shells/fish: Keyword 3.4.1 mips, #840236

Signed-off-by: Raymond Wong  pm.me>
Closes: https://github.com/gentoo/gentoo/pull/25176
Signed-off-by: Jakov Smolić  gentoo.org>

 app-shells/fish/fish-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
index 2a76439ee7f9..87792332f963 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/

2022-04-06 Thread Jakov Smolić

commit: 9d44e2b5c7af59aad6c12653466d0e0b2c36c031
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Apr  6 21:33:52 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Apr  6 21:35:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d44e2b5

app-shells/fish: Fix linking with libatomic

Patch is already upstreamed, drop on next version bump.

Closes: https://bugs.gentoo.org/836951
Signed-off-by: Jakov Smolić  gentoo.org>

 app-shells/fish/files/fish-3.4.1-atomic.patch | 65 +++
 app-shells/fish/fish-3.4.1.ebuild |  5 +++
 2 files changed, 70 insertions(+)

diff --git a/app-shells/fish/files/fish-3.4.1-atomic.patch 
b/app-shells/fish/files/fish-3.4.1-atomic.patch
new file mode 100644
index ..a12e069a7433
--- /dev/null
+++ b/app-shells/fish/files/fish-3.4.1-atomic.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/836951
+Taken from https://github.com/fish-shell/fish-shell/pull/8851
+
+From a3eb41ca882cc390b656515dd668a6816f745121 Mon Sep 17 00:00:00 2001
+From: Raymond Wong 
+Date: Mon, 4 Apr 2022 01:14:26 +0800
+Subject: [PATCH 1/2] cmake: alter check for 64-bit atomic operation
+
+Signed-off-by: Raymond Wong 
+---
+ cmake/ConfigureChecks.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
+index bc190de054f..924aea1015a 100644
+--- a/cmake/ConfigureChecks.cmake
 b/cmake/ConfigureChecks.cmake
+@@ -255,10 +255,10 @@ int main () {
+ check_cxx_source_compiles("
+ #include 
+ #include 
+-std::atomic x (0);
++std::atomic n64 (0);
+ int main() {
+-uint64_t i = x.load(std::memory_order_relaxed);
+-return std::atomic_is_lock_free(&x);
++uint64_t i = n64.load(std::memory_order_relaxed);
++return std::atomic_is_lock_free(&n64);
+ }"
+ LIBATOMIC_NOT_NEEDED)
+ IF (NOT LIBATOMIC_NOT_NEEDED)
+
+From 2fe9bfe0a6c1a821dabbf52af35c8eb2cd6e029b Mon Sep 17 00:00:00 2001
+From: Raymond Wong 
+Date: Sun, 3 Apr 2022 14:01:15 +0800
+Subject: [PATCH 2/2] cmake: check for 8-bit atomic operation
+
+Fix building on RISC-V.
+Closes #8850.
+
+Signed-off-by: Raymond Wong 
+---
+ cmake/ConfigureChecks.cmake | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
+index 924aea1015a..6562d324f45 100644
+--- a/cmake/ConfigureChecks.cmake
 b/cmake/ConfigureChecks.cmake
+@@ -255,10 +255,13 @@ int main () {
+ check_cxx_source_compiles("
+ #include 
+ #include 
++std::atomic n8 (0);
+ std::atomic n64 (0);
+ int main() {
+-uint64_t i = n64.load(std::memory_order_relaxed);
+-return std::atomic_is_lock_free(&n64);
++uint8_t i = n8.load(std::memory_order_relaxed);
++uint64_t j = n64.load(std::memory_order_relaxed);
++return std::atomic_is_lock_free(&n8)
++ & std::atomic_is_lock_free(&n64);
+ }"
+ LIBATOMIC_NOT_NEEDED)
+ IF (NOT LIBATOMIC_NOT_NEEDED)

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
index 45bc18a52822..9e86384466cc 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -49,6 +49,11 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   # bug 836951, drop on next version bump
+   "${FILESDIR}"/${PN}-3.4.1-atomic.patch
+)
+
 python_check_deps() {
use test || return 0
has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"

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

2022-03-26 Thread Sam James

commit: 6181d662344dcfe94e17939c7398f9b01d4361de
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 02:32:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 02:32:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6181d662

app-shells/fish: Stabilize 3.4.0 ppc, #835339

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index ec8a590bac0f..aab8154c0b5e 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-03-26 Thread Sam James

commit: 6fad870e488c5c1552a6fc4c09a14ca456688cb4
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 02:32:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 02:32:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fad870e

app-shells/fish: Stabilize 3.4.0 ppc64, #835339

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index aab8154c0b5e..2a91b5916d07 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-03-26 Thread Lars Wendler

commit: af394fa95143745bd43bb0469cbaccfae375a438
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Mar 26 18:17:34 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Mar 26 18:21:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af394fa9

app-shells/fish: Bump to version 3.4.1

Signed-off-by: Lars Wendler  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.4.1.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 831e89ae2a2a..b25d455e313f 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1,3 @@
 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 
61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559
 SHA512 
fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
+DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 
5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423
 SHA512 
20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981

diff --git a/app-shells/fish/fish-3.4.1.ebuild 
b/app-shells/fish/fish-3.4.1.ebuild
new file mode 100644
index ..45bc18a52822
--- /dev/null
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   if [[ ${PV} !=  ]]; then
+   rm -v tests/pexpects/terminal.py || die
+   fi
+
+   cmake_build test
+}
+
+pkg_postinst() {
+   readme.gentoo_print_elog
+}

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

2022-03-18 Thread Arthur Zamarin

commit: 7d7f7d8021556d0e739e84748b597c8850352c14
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 18 09:26:37 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 18 09:26:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7f7d80

app-shells/fish: Stabilize 3.4.0 hppa, #835339

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index bdeb71dbfcef..ec8a590bac0f 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-03-16 Thread Sam James

commit: 5fecefaeda6cc9701aa69459e729454ad60796c0
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 17 02:26:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 17 02:26:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fecefae

app-shells/fish: Stabilize 3.4.0 arm, #835339

Signed-off-by: Sam James  gentoo.org>

 app-shells/fish/fish-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
index 45bc18a52822..bdeb71dbfcef 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2022-03-13 Thread Lars Wendler

commit: 04d63407a3280ba280a38143bdbe76a03bc76eaa
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 14 06:47:44 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 14 06:48:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d63407

app-shells/fish: Bump to version 3.4.0

Signed-off-by: Lars Wendler  gentoo.org>

 app-shells/fish/Manifest  |   1 +
 app-shells/fish/fish-3.4.0.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c41057369d88..831e89ae2a2a 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1 +1,2 @@
 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 
61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559
 SHA512 
fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
+DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 
3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3
 SHA512 
463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4

diff --git a/app-shells/fish/fish-3.4.0.ebuild 
b/app-shells/fish/fish-3.4.0.ebuild
new file mode 100644
index ..45bc18a52822
--- /dev/null
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/";
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
+else
+   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/libpcre2-10.32:=[pcre32]
+   sys-apps/coreutils
+   sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   test? (
+   ${PYTHON_DEPS}
+   dev-tcltk/expect
+   $(python_gen_any_dep '
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} ==  ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+   use test || return 0
+   has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
+   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+   cmake/Tests.cmake || die
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCURSES_NEED_NCURSES=ON
+   -DINSTALL_DOCS="$(usex doc)"
+   -DWITH_GETTEXT="$(usex nls)"
+   )
+   # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+   readme.gentoo_create_doc
+}
+
+src_test() {
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   if [[ ${PV} !=  ]]; then
+   rm -v tests/pexpects/terminal.py || die
+   fi
+
+   cmake_build test
+}
+
+pkg_postinst() {
+   readme.gentoo_print_elog
+}

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

2022-03-13 Thread Lars Wendler

commit: 042a657b691466600de67c8d79e52162bc630bfe
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 14 06:48:08 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 14 06:48:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042a657b

app-shells/fish: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-shells/fish/fish-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index c35b05dc2100..45bc18a52822 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2021-12-23 Thread Georgy Yakovlev

commit: a0629ab80a91dae3af16d6bf1652e95140d43d0d
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 23 22:33:34 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 23 22:33:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0629ab8

app-shells/fish: never build docs for release version

Closes: https://bugs.gentoo.org/770862
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-3.3.1-r1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild 
b/app-shells/fish/fish-3.3.1-r1.ebuild
index d0d5a67aeecf..bd040a633309 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -76,7 +76,11 @@ src_configure() {
-DWITH_GETTEXT="$(usex nls)"
)
# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   [[ ${PV} ==  ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
cmake_src_configure
 }

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

2021-12-23 Thread Georgy Yakovlev

commit: f986c5a4d7d7af8c7a7e549e44d5662066b42de1
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 23 22:37:04 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 23 22:37:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f986c5a4

app-shells/fish: fix local -x case typo

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-3.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild 
b/app-shells/fish/fish-3.3.1-r1.ebuild
index bd040a633309..184f01e1dcab 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -93,7 +93,7 @@ src_install() {
 src_test() {
# some tests are fragile, sanitize environment
local -x COLUMNS=80
-   local -X LINES=24
+   local -x LINES=24
 
# very fragile, depends on terminal, size, tmux, screen and timing
rm -v tests/pexpects/terminal.py || die

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

2021-12-23 Thread Georgy Yakovlev

commit: 38fe8c5f2b50e35e919b26dbf5789238a04b12d0
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 23 22:36:40 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 23 22:36:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38fe8c5f

app-shells/fish: sync live ebuild

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-.ebuild | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index b0013271b00f..c35b05dc2100 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -70,7 +70,11 @@ src_configure() {
-DWITH_GETTEXT="$(usex nls)"
)
# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
-   [[ ${PV} ==  ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   if [[ ${PV} ==  ]]; then
+   mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+   else
+   mycmakeargs+=( -DBUILD_DOCS=OFF )
+   fi
cmake_src_configure
 }
 
@@ -81,7 +85,16 @@ src_install() {
 }
 
 src_test() {
-   cmake_build -j1 test
+   # some tests are fragile, sanitize environment
+   local -x COLUMNS=80
+   local -x LINES=24
+
+   # very fragile, depends on terminal, size, tmux, screen and timing
+   if [[ ${PV} !=  ]]; then
+   rm -v tests/pexpects/terminal.py || die
+   fi
+
+   cmake_build test
 }
 
 pkg_postinst() {

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

2021-12-23 Thread Georgy Yakovlev

commit: 309acb24585971a3459ea3dd3e0836dcebcdf077
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 23 22:26:41 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 23 22:27:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309acb24

app-shells/fish: enable py3.10 and disable py3.7 in -

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-.ebuild b/app-shells/fish/fish-.ebuild
index abb51e209302..b0013271b00f 100644
--- a/app-shells/fish/fish-.ebuild
+++ b/app-shells/fish/fish-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1 readme.gentoo-r1

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

2021-12-23 Thread Georgy Yakovlev

commit: 7b1e952b3a1209d208048269d008841fe4163132
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 23 21:55:51 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 23 22:27:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1e952b

app-shells/fish: drop 3.1.2-r1, 3.2.1-r1, 3.2.2-r1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/Manifest |  3 --
 app-shells/fish/fish-3.1.2-r1.ebuild | 71 
 app-shells/fish/fish-3.2.1-r1.ebuild | 89 
 app-shells/fish/fish-3.2.2-r1.ebuild | 89 
 4 files changed, 252 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index fc67224f5d13..c41057369d88 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1 @@
-DIST fish-3.1.2.tar.gz 6816214 BLAKE2B 
d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b
 SHA512 
b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
-DIST fish-3.2.1.tar.xz 3409808 BLAKE2B 
ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517
 SHA512 
bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
-DIST fish-3.2.2.tar.xz 3411748 BLAKE2B 
f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc
 SHA512 
e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 
61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559
 SHA512 
fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660

diff --git a/app-shells/fish/fish-3.1.2-r1.ebuild 
b/app-shells/fish/fish-3.1.2-r1.ebuild
deleted file mode 100644
index 177c7aa2ce46..
--- a/app-shells/fish/fish-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz";
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="doc nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/libpcre2-10.32:=[pcre32]
-   sys-libs/ncurses:=[unicode(+)]
-"
-
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )
-   nls? ( sys-devel/gettext )
-   test? ( dev-tcltk/expect )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   # workaround for https://github.com/fish-shell/fish-shell/issues/4883
-   sed -i 
's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
-   cmake/Tests.cmake || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCURSES_NEED_NCURSES=ON
-   -DBUILD_DOCS="$(usex doc)"
-   -DWITH_GETTEXT="$(usex nls)"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-   readme.gentoo_create_doc
-}
-
-src_test() {
-   cmake_build -j1 test
-}
-
-pkg_postinst() {
-   readme.gentoo_print_elog
-}

diff --git a/app-shells/fish/fish-3.2.1-r1.ebuild 
b/app-shells/fish/fish-3.2.1-r1.ebuild
deleted file mode 100644
index abb51e209302..
--- a/app-shells/fish/fish-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/";
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
-else
-   
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~

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

2021-12-23 Thread Georgy Yakovlev

commit: 8a6e24ea556db61d5dd5da952e199c86d04d0e47
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 23 22:26:07 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 23 22:27:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6e24ea

app-shells/fish: fix whitespace

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-shells/fish/fish-3.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild 
b/app-shells/fish/fish-3.3.1-r1.ebuild
index ea484c82c7b0..d0d5a67aeecf 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -92,7 +92,7 @@ src_test() {
local -X LINES=24
 
# very fragile, depends on terminal, size, tmux, screen and timing
-   rm -v tests/pexpects/terminal.py || die 
+   rm -v tests/pexpects/terminal.py || die
 
cmake_build test
 }

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

2021-12-23 Thread Arthur Zamarin

commit: a2b116e019a592abd8e5ffa8973538f53c8133c4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 23 08:39:56 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 23 08:40:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b116e0

app-shells/fish: Stabilize 3.3.1-r1 x86, #818256

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/fish-3.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild 
b/app-shells/fish/fish-3.3.1-r1.ebuild
index f59329e2387d..aaf955c22207 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

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

2021-12-23 Thread Arthur Zamarin

commit: d4592b3e94805202861b037a6e01530be7ce180a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 23 08:40:00 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 23 08:40:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4592b3e

app-shells/fish: Stabilize 3.3.1-r1 amd64, #818256

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-shells/fish/fish-3.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild 
b/app-shells/fish/fish-3.3.1-r1.ebuild
index aaf955c22207..ea484c82c7b0 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git";
 else

SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

1 2 >

1 - 100 of 195 matches

Mail list logo