* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2016-11-08 18:49 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-11-08 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 4b6e0b51507aee4483870d10f2f948a9ff6cf7f4
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 18:48:52 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 18:49:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b6e0b51
app-shells/fish: Removed old.
Package-Manager: portage-2.3.2
app-shells/fish/Manifest | 2 -
app-shells/fish/files/fish-2.1.0-tinfo.patch | 11 ----
app-shells/fish/fish-2.1.1.ebuild | 75 ----------------------------
app-shells/fish/fish-2.1.2.ebuild | 75 ----------------------------
app-shells/fish/fish-2.3.0.ebuild | 65 ------------------------
5 files changed, 228 deletions(-)
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 96b7783..22b413c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,3 @@
-DIST fish-2.1.1.tar.gz 1681744 SHA256 b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924 SHA512 c6b41a7514d684bc165bdf03edd0f07b0cdfbcc827a3bcc6e9105bbf6b94a60962bd7fffaf5f9c44c450da3d4b6af4bdcf72fbbaaa043851c631d8c2a1344dd6 WHIRLPOOL c6bcbfea35d68f99903633f06a436cf982f6fc01123cebbb4342be1b3f3be106c0ac144d24b2069bf34bc7e3540d26526a8ef8b74e4f27255525ad0d7cb70774
-DIST fish-2.1.2.tar.gz 1730198 SHA256 c6c20d5ca3a2a0168461de8abfe85f9e6b255132698ea0109998d4ab68f9f6dd SHA512 4f8f0133094d4d2295546a5b96e044646de2266364610368210b0db529b2d865c1b389f01f311b9b6d6d6dcd2a29040b7a9499d491605ae52a765a76d83db2a5 WHIRLPOOL 2a02dd0f91731cfc79de64245c34fc4361f42406d0c0a60afbafa08c2b9265d11c4adadc96ca5eb49b9053db1eb949c297eee23a7cbc63a30f56ce577b650779
DIST fish-2.2.0.tar.gz 2213037 SHA256 a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a SHA512 210047f56b105a3d372f03d3a2de41661ed18001e3c8fa053ae4aa43089118d4467837ea022bc44f9877ecc3d0563b365f97920c002faccebaa663c4f079e9e0 WHIRLPOOL 8b25e437e0c942255b5f39686008fb37ec45cea52e04b2d61facf1fdcd59510138dace506eadb17eb0074d175d3c1226d6e52d437e325ed5a90e22e696918d9d
DIST fish-2.3.0.tar.gz 4537458 SHA256 912bac47552b1aa0d483a39ade330356632586a8f726c0e805b46d45cfad54e5 SHA512 acfeb8daad34250c626172428573d5baf86c43d37379fb29da296973931cb5e0b8d7cb5d2ed64eb6e3b984a3a65fc800dd8f78dce7d5e4719bc5dc143be27e8a WHIRLPOOL 1a9023540307fba2bf594ff785ae2f825e62addba920f312aeae6afaaf394cbb4a90f7fc205496ed49d7efb0cb460acd737e61af262bcbee3013d148e70ca9ed
DIST fish-2.3.1.tar.gz 4502836 SHA256 328acad35d131c94118c1e187ff3689300ba757c4469c8cc1eaa994789b98664 SHA512 dd0fa77f218cc84943c577ff8abafcde92fa953797757a62db317d87c2af82de6493810ce91012e20d46be9a52bffda9a40526328714ba1e4e389e5f2aa3fea5 WHIRLPOOL 823ad3b05aada036a96aff71693655d1683d1862a1f994163c0833af29230211e7b28bc77eb33d56baa2be87ec93532464ed818d7f167ef562df54301b23bb44
diff --git a/app-shells/fish/files/fish-2.1.0-tinfo.patch b/app-shells/fish/files/fish-2.1.0-tinfo.patch
deleted file mode 100644
index ba4cc40..00000000
--- a/app-shells/fish/files/fish-2.1.0-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -480,7 +480,7 @@
- AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
- AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
- AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
--AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] )
-+AC_SEARCH_LIBS( setupterm, [ncurses tinfo curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] )
- AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
- LIBS_SHARED=$LIBS
- LIBS=$LIBS_COMMON
diff --git a/app-shells/fish/fish-2.1.1.ebuild b/app-shells/fish/fish-2.1.1.ebuild
deleted file mode 100644
index c1a2983..00000000
--- a/app-shells/fish/fish-2.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit base autotools
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses
- sys-devel/bc
- sys-devel/gettext
- X? ( x11-misc/xsel )"
-
-# fish can add man-page completions from lzma and xz compressed man pages
-# through a python script. That's why we depend on python here (bug #490478)
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.0-tinfo.patch #459768
-
- eautoreconf
-}
-
-src_configure() {
- # Set things up for fish to be a default shell.
- # It has to be in /bin in case /usr is unavailable.
- # Also, all of its utilities have to be in /bin.
- econf \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --bindir="${EPREFIX}"/bin
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- emake test
- else
- ewarn "The test suite only works when the package is already installed"
- fi
-}
-
-pkg_postinst() {
- elog "fish is now installed on your system."
- elog "To run fish, type 'fish' in your terminal."
- elog
- elog "To use fish as your login shell:"
- elog "* add the line '${EPREFIX}/bin/${PN}'"
- elog "* to the file '${EPREFIX}/etc/shells'."
- elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
- elog
- elog "To set your colors, run 'fish_config'"
- elog "To scan your man pages for completions, run 'fish_update_completions'"
- elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
- elog
- elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
- elog "browser of your choice to get acces to ${PN}'s help system:"
- elog " BROWSER=\"/usr/bin/firefox\""
- elog
- elog "In order to get lzma and xz support for man-page completion please"
- elog "emerge one of the following packages:"
- elog " dev-python/backports-lzma"
- elog " >=dev-lang/python-3.3"
- elog
- elog "Have fun!"
-}
diff --git a/app-shells/fish/fish-2.1.2.ebuild b/app-shells/fish/fish-2.1.2.ebuild
deleted file mode 100644
index ad4b8a2..00000000
--- a/app-shells/fish/fish-2.1.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit base autotools
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses
- sys-devel/bc
- sys-devel/gettext
- X? ( x11-misc/xsel )"
-
-# fish can add man-page completions from lzma and xz compressed man pages
-# through a python script. That's why we depend on python here (bug #490478)
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.0-tinfo.patch #459768
-
- eautoreconf
-}
-
-src_configure() {
- # Set things up for fish to be a default shell.
- # It has to be in /bin in case /usr is unavailable.
- # Also, all of its utilities have to be in /bin.
- econf \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --bindir="${EPREFIX}"/bin
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- emake test
- else
- ewarn "The test suite only works when the package is already installed"
- fi
-}
-
-pkg_postinst() {
- elog "fish is now installed on your system."
- elog "To run fish, type 'fish' in your terminal."
- elog
- elog "To use fish as your login shell:"
- elog "* add the line '${EPREFIX}/bin/${PN}'"
- elog "* to the file '${EPREFIX}/etc/shells'."
- elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
- elog
- elog "To set your colors, run 'fish_config'"
- elog "To scan your man pages for completions, run 'fish_update_completions'"
- elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
- elog
- elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
- elog "browser of your choice to get acces to ${PN}'s help system:"
- elog " BROWSER=\"/usr/bin/firefox\""
- elog
- elog "In order to get lzma and xz support for man-page completion please"
- elog "emerge one of the following packages:"
- elog " dev-python/backports-lzma"
- elog " >=dev-lang/python-3.3"
- elog
- elog "Have fun!"
-}
diff --git a/app-shells/fish/fish-2.3.0.ebuild b/app-shells/fish/fish-2.3.0.ebuild
deleted file mode 100644
index 154c965..00000000
--- a/app-shells/fish/fish-2.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses:0=
- sys-devel/bc
- sys-devel/gettext
- X? ( x11-misc/xsel )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # Set things up for fish to be a default shell.
- # It has to be in /bin in case /usr is unavailable.
- # Also, all of its utilities have to be in /bin.
- econf \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --bindir="${EPREFIX}"/bin
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- emake test
- else
- ewarn "The test suite only works when the package is already installed"
- fi
-}
-
-pkg_postinst() {
- elog "fish is now installed on your system."
- elog "To run fish, type 'fish' in your terminal."
- elog
- elog "To use fish as your login shell:"
- elog "* add the line '${EPREFIX}/bin/${PN}'"
- elog "* to the file '${EPREFIX}/etc/shells'."
- elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
- elog
- elog "To set your colors, run 'fish_config'"
- elog "To scan your man pages for completions, run 'fish_update_completions'"
- elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
- elog
- elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
- elog "browser of your choice to get acces to ${PN}'s help system:"
- elog " BROWSER=\"/usr/bin/firefox\""
- elog
- elog "In order to get lzma and xz support for man-page completion please"
- elog "emerge one of the following packages:"
- elog " dev-python/backports-lzma"
- elog " >=dev-lang/python-3.3"
- elog
- elog "Have fun!"
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2017-02-06 0:48 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-02-06 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 6529c95301c9f8d936869dd0496c88cffbab2aa1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 00:48:53 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 00:48:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6529c953
app-shells/fish: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-shells/fish/Manifest | 1 +
app-shells/fish/files/profile-env.fish | 34 +++++++++++++---------
.../{fish-2.4.0-r1.ebuild => fish-2.5.0.ebuild} | 0
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index bc12de2..858f28c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1 +1,2 @@
DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861
+DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849
diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish
index 21a918a..af3b133 100644
--- a/app-shells/fish/files/profile-env.fish
+++ b/app-shells/fish/files/profile-env.fish
@@ -1,15 +1,23 @@
-# since fish supports export via upstream provided function
-# we can source directly, only ommiting $PATH and comments.
-grep -Ev "^(#|export (PATH|ROOTPATH)=)" /etc/profile.env | source
+# only apply env for login shells, as we'd like fish to
+# inherit existing shell environment without overriding it
+# using csh env, as it's cleaner and less too parse/strip
-# strip unneded stuff from bash export lines
-# apply paths and cleanup
-if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
- set _rootpath (grep -o " ROOTPATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
- set -xg PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $_rootpath
- set -e _rootpath
-else
- set _userpath (grep -o " PATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
- set -xg PATH /usr/local/bin /usr/bin /bin $_userpath
- set -e _userpath
+if status --is-login
+ # since fish supports export via upstream provided function
+ # we can source directly, only ommiting $PATH and comments.
+ string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source
+
+ # strip unneded stuff from setenv lines
+ # apply paths and cleanup
+ if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
+ string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
+ set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH
+ set -e ROOTPATH
+ else
+ string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
+ set -gx PATH /usr/local/bin /usr/bin /bin $PATH
+ end
+
+ # re-prepend $fish_user_paths
+ __fish_reconstruct_path
end
diff --git a/app-shells/fish/fish-2.4.0-r1.ebuild b/app-shells/fish/fish-2.5.0.ebuild
similarity index 100%
rename from app-shells/fish/fish-2.4.0-r1.ebuild
rename to app-shells/fish/fish-2.5.0.ebuild
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2017-02-06 0:52 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-02-06 0:52 UTC (permalink / raw
To: gentoo-commits
commit: e99a31824bb89ed9ea45649d6b4a602fc922d8a3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 00:48:53 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 00:52:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99a3182
app-shells/fish: Bump to version 2.5.0. Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-shells/fish/Manifest | 1 +
app-shells/fish/files/profile-env.fish | 34 +++++++++++++---------
.../{fish-2.4.0-r1.ebuild => fish-2.5.0.ebuild} | 0
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index bc12de2..858f28c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1 +1,2 @@
DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861
+DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849
diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish
index 21a918a..d4852f0 100644
--- a/app-shells/fish/files/profile-env.fish
+++ b/app-shells/fish/files/profile-env.fish
@@ -1,15 +1,23 @@
-# since fish supports export via upstream provided function
-# we can source directly, only ommiting $PATH and comments.
-grep -Ev "^(#|export (PATH|ROOTPATH)=)" /etc/profile.env | source
+# only apply env for login shells, as we'd like fish to
+# inherit existing shell environment without overriding it
+# using csh env, as it's cleaner and less too parse/strip
-# strip unneded stuff from bash export lines
-# apply paths and cleanup
-if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
- set _rootpath (grep -o " ROOTPATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
- set -xg PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $_rootpath
- set -e _rootpath
-else
- set _userpath (grep -o " PATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
- set -xg PATH /usr/local/bin /usr/bin /bin $_userpath
- set -e _userpath
+if status --is-login
+ # since fish supports export via upstream provided function
+ # we can source directly, only ommiting $PATH and comments.
+ string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source
+
+ # strip unneded stuff from setenv lines
+ # apply paths and cleanup
+ if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
+ string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
+ set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH
+ set -e ROOTPATH
+ else
+ string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
+ set -gx PATH /usr/local/bin /usr/bin /bin $PATH
+ end
+
+ # re-prepend $fish_user_paths
+ __fish_reconstruct_path
end
diff --git a/app-shells/fish/fish-2.4.0-r1.ebuild b/app-shells/fish/fish-2.5.0.ebuild
similarity index 100%
rename from app-shells/fish/fish-2.4.0-r1.ebuild
rename to app-shells/fish/fish-2.5.0.ebuild
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2017-03-03 13:12 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-03-03 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 0ab0eccf1cba817194be494894987b02337eef3f
Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Fri Feb 24 06:34:59 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 13:12:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab0eccf
app-shells/fish: add nls support
This adds nls useflag and includes
backported upstream patch to honor LINGUAS.
Fixes bug 409969.
Closes: https://github.com/gentoo/gentoo/pull/4072
.../fish/files/fish-2.5.0-honor-linguas.patch | 32 ++++++++++++++++++++++
app-shells/fish/fish-2.5.0.ebuild | 9 ++++--
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch
new file mode 100644
index 00000000000..843036d6e5d
--- /dev/null
+++ b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile.in b/Makefile.in
+index 35e63ae..b73c612 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -195,11 +195,16 @@ ifeq ($(shell uname), Darwin)
+ endif
+
+ #
+-# All translation message catalogs
++# All translation message catalogs, filter files based on LINGUAS.
+ #
+ TRANSLATIONS_SRC := $(wildcard po/*.po)
+-ifdef HAVE_GETTEXT
++ifeq ($(HAVE_GETTEXT), 1)
+ TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
++ifdef LINGUAS
++ TRANSLATIONS_ALL := $(TRANSLATIONS)
++ TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS))
++ TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL))
++endif
+ else
+ TRANSLATIONS :=
+ endif
+@@ -764,7 +769,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show
+ .PHONY: uninstall
+
+ install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT
+-ifdef HAVE_GETTEXT
++ifeq ($(HAVE_GETTEXT), 1)
+ @echo "Installing translations..."
+ $v for i in $(TRANSLATIONS); do \
+ $(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \
diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild
index 5132a555abc..6d94ff16ddf 100644
--- a/app-shells/fish/fish-2.5.0.ebuild
+++ b/app-shells/fish/fish-2.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
+IUSE="nls"
RDEPEND="
>=dev-libs/libpcre2-10.21[pcre32]
@@ -19,9 +19,11 @@ RDEPEND="
DEPEND="
${RDEPEND}
sys-devel/bc
- sys-devel/gettext
+ nls? ( sys-devel/gettext )
"
+PATCHES=( "${FILESDIR}/${P}-honor-linguas.patch" )
+
src_configure() {
# Set things up for fish to be a default shell.
# It has to be in /bin in case /usr is unavailable.
@@ -29,7 +31,8 @@ src_configure() {
econf \
docdir="${EPREFIX}"/usr/share/doc/${PF} \
--bindir="${EPREFIX}"/bin \
- --without-included-pcre2
+ --without-included-pcre2 \
+ $(use_with nls gettext)
}
src_test() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2017-11-07 12:50 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-11-07 12:50 UTC (permalink / raw
To: gentoo-commits
commit: c75e9d17844d466093d64db626d319d063deb417
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 12:50:03 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 12:50:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75e9d17
app-shells/fish: Removed old.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-shells/fish/Manifest | 2 -
.../fish/files/fish-2.5.0-honor-linguas.patch | 32 ----------
app-shells/fish/fish-2.4.0.ebuild | 64 -------------------
app-shells/fish/fish-2.5.0.ebuild | 72 ----------------------
4 files changed, 170 deletions(-)
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4ecff87b779..84fd66c268e 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,2 @@
-DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861
-DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849
DIST fish-2.6.0.tar.gz 3575346 SHA256 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 WHIRLPOOL 3316c1bd8778a1eba5b7b65edf28495ec89ec01ba3d0bc26cbc64ce69bfcd73a538c9a5463c9385f55689e3e680241d37e36bfec309f87c6ee98934f74fd7aa4
DIST fish-2.7b1.tar.gz 5760393 SHA256 326dbea5d0f20eba54fa0b0c5525e58b4a39ebd8c52c14cfffc5f4d6cdf55385 SHA512 75e9351eb8179d9a21915d6cbc8d042f595e9fd3120f2ab7ad503fde5d59c9d965cc01ec599c89d7e6c9b3ef3e175b91e6c750427e146a0649434ee121a7c17c WHIRLPOOL 3ec2707d4bd2d8726c969e7aadd665d29adc89d1e6e78918a509c275ec289c1cfbdab4e6271b15ad2bd47a292dff00c312ed0735e1ef34ae66dcbf5c8c6bcae1
diff --git a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch
deleted file mode 100644
index 843036d6e5d..00000000000
--- a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 35e63ae..b73c612 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -195,11 +195,16 @@ ifeq ($(shell uname), Darwin)
- endif
-
- #
--# All translation message catalogs
-+# All translation message catalogs, filter files based on LINGUAS.
- #
- TRANSLATIONS_SRC := $(wildcard po/*.po)
--ifdef HAVE_GETTEXT
-+ifeq ($(HAVE_GETTEXT), 1)
- TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
-+ifdef LINGUAS
-+ TRANSLATIONS_ALL := $(TRANSLATIONS)
-+ TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS))
-+ TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL))
-+endif
- else
- TRANSLATIONS :=
- endif
-@@ -764,7 +769,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show
- .PHONY: uninstall
-
- install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT
--ifdef HAVE_GETTEXT
-+ifeq ($(HAVE_GETTEXT), 1)
- @echo "Installing translations..."
- $v for i in $(TRANSLATIONS); do \
- $(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \
diff --git a/app-shells/fish/fish-2.4.0.ebuild b/app-shells/fish/fish-2.4.0.ebuild
deleted file mode 100644
index e4b272b5639..00000000000
--- a/app-shells/fish/fish-2.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses:0=
- sys-devel/bc
- sys-devel/gettext
- X? ( x11-misc/xsel )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # Set things up for fish to be a default shell.
- # It has to be in /bin in case /usr is unavailable.
- # Also, all of its utilities have to be in /bin.
- econf \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --bindir="${EPREFIX}"/bin
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- emake test
- else
- ewarn "The test suite only works when the package is already installed"
- fi
-}
-
-pkg_postinst() {
- elog "fish is now installed on your system."
- elog "To run fish, type 'fish' in your terminal."
- elog
- elog "To use fish as your login shell:"
- elog "* add the line '${EPREFIX}/bin/${PN}'"
- elog "* to the file '${EPREFIX}/etc/shells'."
- elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
- elog
- elog "To set your colors, run 'fish_config'"
- elog "To scan your man pages for completions, run 'fish_update_completions'"
- elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
- elog
- elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
- elog "browser of your choice to get acces to ${PN}'s help system:"
- elog " BROWSER=\"/usr/bin/firefox\""
- elog
- elog "In order to get lzma and xz support for man-page completion please"
- elog "emerge one of the following packages:"
- elog " dev-python/backports-lzma"
- elog " >=dev-lang/python-3.3"
- elog
- elog "Have fun!"
-}
diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild
deleted file mode 100644
index 6d94ff16ddf..00000000000
--- a/app-shells/fish/fish-2.5.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
- >=dev-libs/libpcre2-10.21[pcre32]
- sys-libs/ncurses:0=
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/bc
- nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}/${P}-honor-linguas.patch" )
-
-src_configure() {
- # Set things up for fish to be a default shell.
- # It has to be in /bin in case /usr is unavailable.
- # Also, all of its utilities have to be in /bin.
- econf \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --bindir="${EPREFIX}"/bin \
- --without-included-pcre2 \
- $(use_with nls gettext)
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- emake test
- else
- ewarn "The test suite only works when the package is already installed"
- fi
-}
-
-pkg_postinst() {
- elog "fish is now installed on your system."
- elog "To run fish, type 'fish' in your terminal."
- elog
- elog "It is advised not to set fish as a default login shell."
- elog "see bug #545830 for more details."
- elog "Executing fish using ~/.bashrc is an alternative"
- elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details"
- elog
- elog "To set your colors, run 'fish_config'"
- elog "To scan your man pages for completions, run 'fish_update_completions'"
- elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
- elog
- elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
- elog "browser of your choice to get acces to ${PN}'s help system:"
- elog " BROWSER=\"/usr/bin/firefox\""
- elog
- elog "In order to get lzma and xz support for man-page completion please"
- elog "emerge one of the following packages:"
- elog " dev-python/backports-lzma"
- elog " >=dev-lang/python-3.3"
- elog
- elog "If you have issues with cut'n'paste in X-terminals, install the"
- elog "x11-misc/xsel package."
- elog
- elog "Have fun!"
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2018-07-19 2:19 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2018-07-19 2:19 UTC (permalink / raw
To: gentoo-commits
commit: 4ba06b5ba1fef6cbd2d1c120f84b09c06932a13f
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 02:18:38 2018 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 02:18:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba06b5b
app-shells/fish: fix 'printf "%o"' handling on ppc
Backport as a patch, that is already upstream
https://github.com/fish-shell/fish-shell/pull/4444
Run tests with -j1 and be verbose
Run tests only if fish is already installed
Reported-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Bug: https://bugs.gentoo.org/656246
Package-Manager: Portage-2.3.43, Repoman-2.3.10
.../fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch | 12 ++++++++++++
app-shells/fish/fish-2.7.1.ebuild | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
new file mode 100644
index 00000000000..4d3d79ae6a5
--- /dev/null
+++ b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
@@ -0,0 +1,12 @@
+diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
+index 8595120d5..24cf9a9e1 100644
+--- a/src/builtin_printf.cpp
++++ b/src/builtin_printf.cpp
+@@ -444,6 +444,7 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc
+ case L'X':
+ case L'd':
+ case L'i':
++ case L'o':
+ case L'u': {
+ fmt.append(L"ll");
+ break;
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index 657ee7b3e84..06afa49de51 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -27,6 +27,8 @@ DEPEND="
test? ( dev-tcltk/expect )
"
+PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" )
+
S="${WORKDIR}/${MY_P}"
src_configure() {
@@ -48,7 +50,11 @@ src_install() {
}
src_test() {
- emake V=1 test
+ if has_version ~${CATEGORY}/${P} ; then
+ emake -j1 V=1 SHOW_INTERACTIVE_LOG=1 test
+ else
+ ewarn "Some tests only work when the package is already installed"
+ fi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2022-04-06 21:35 Jakov Smolić
0 siblings, 0 replies; 9+ messages in thread
From: Jakov Smolić @ 2022-04-06 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 9d44e2b5c7af59aad6c12653466d0e0b2c36c031
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 21:33:52 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 21:35:33 2022 +0000
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ć <jsmolic <AT> 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 000000000000..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 <infiwang@pm.me>
+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 <infiwang@pm.me>
+---
+ 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 <atomic>
+ #include <cstdint>
+-std::atomic<uint64_t> x (0);
++std::atomic<uint64_t> 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 <infiwang@pm.me>
+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 <infiwang@pm.me>
+---
+ 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 <atomic>
+ #include <cstdint>
++std::atomic<uint8_t> n8 (0);
+ std::atomic<uint64_t> 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}]"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2022-05-20 6:31 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2022-05-20 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 064a1f6462587573309045cbc97f549cf8b0429f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 06:27:41 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 20 06:27:41 2022 +0000
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 <polynomial-c <AT> 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..000000000000
--- 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 <ya@sysdump.net>
-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..000000000000
--- 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 <FHomborg@gmail.com>
-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", L"-r", L"foo\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\n"},
- {{L"string", L"match", L"-r", L"(foo)\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\nfoo\n"},
-- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
-- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
--
- {{L"string", L"replace", 0}, STATUS_INVALID_ARGS, L""},
- {{L"string", L"replace", L"", 0}, STATUS_INVALID_ARGS, L""},
- {{L"string", L"replace", L"", L"", 0}, STATUS_CMD_ERROR, L""},
diff --git a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch b/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
deleted file mode 100644
index ce66e98eb124..000000000000
--- a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f73c8d923e41442cefd5a58498798971282c701 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <ya@sysdump.net>
-Date: Tue, 29 Jun 2021 09:55:14 -0700
-Subject: [PATCH] sbin path sh test
-
----
- tests/checks/type.fish | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/checks/type.fish b/tests/checks/type.fish
-index 85a2d142a..6ce3a4f68 100644
---- a/tests/checks/type.fish
-+++ b/tests/checks/type.fish
-@@ -31,7 +31,7 @@ echo $status
- # Test that we print a command path
- type sh
- # (we resolve the path, so if /bin is a symlink to /usr/bin this shows /usr/bin/sh)
--# CHECK: sh is {{.*}}/bin/sh
-+# CHECK: sh is {{.*}}/{{s*}}bin/sh
-
- # Test that we print a function definition.
- # The exact definition and description here depends on the system, so we'll ignore the actual code.
---
-2.32.0
-
diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild
deleted file mode 100644
index 184f01e1dcab..000000000000
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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} == "9999" ]]; 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 )"
-
-PATCHES=(
- "${FILESDIR}/3.3.1-don-t-override-linker.patch"
- "${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
- "${FILESDIR}/3.3.1-drop-some-tests.patch"
-)
-
-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} == 9999 ]] && 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} == 9999 ]]; 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
- rm -v tests/pexpects/terminal.py || die
-
- cmake_build test
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
@ 2022-09-20 1:38 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2022-09-20 1:38 UTC (permalink / raw
To: gentoo-commits
commit: 9f2752b4daf8dfb8c1ba9a0dfc5591ded17a0dba
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 01:37:53 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 01:37:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2752b4
app-shells/fish: drop 3.4.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> 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..000000000000
--- 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 <infiwang@pm.me>
-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 <infiwang@pm.me>
----
- 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 <atomic>
- #include <cstdint>
--std::atomic<uint64_t> x (0);
-+std::atomic<uint64_t> 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 <infiwang@pm.me>
-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 <infiwang@pm.me>
----
- 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 <atomic>
- #include <cstdint>
-+std::atomic<uint8_t> n8 (0);
- std::atomic<uint64_t> 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..000000000000
--- 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} == "9999" ]]; 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} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
-
-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
- 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} == 9999 ]]; 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} != 9999 ]]; then
- rm -v tests/pexpects/terminal.py || die
- fi
-
- cmake_build test
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-09-20 1:38 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-19 2:19 [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2022-09-20 1:38 Georgy Yakovlev
2022-05-20 6:31 Lars Wendler
2022-04-06 21:35 Jakov Smolić
2017-11-07 12:50 Lars Wendler
2017-03-03 13:12 Lars Wendler
2017-02-06 0:52 Lars Wendler
2017-02-06 0:48 Lars Wendler
2016-11-08 18:49 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox