gentoo resync : 17.02.2020

3 files changed, 75 insertions, 2 deletions

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index efd1e8f2513e..2ee5122b06bb 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,7 +3,9 @@ AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969
 AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6b6f53e28be5832285e91092f4fbb7e5efc31bb1ab7ca2fbf9bec1b91e2f7d57817f5ddee38f2b3f120589fcbea1668f5 SHA512 07fb970b7eec223c3427b6058134101a5c032006d8ec16f2873352e9c701c38fe254506e9ff4e05f2ad684bd192c764452ec957af44a04f1beccf7f47bf58bb0
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
+DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
 EBUILD fish-3.0.2.ebuild 1642 BLAKE2B eea0911019da09f2690aa0767c43cb463ef5ea18fe53f0e6b31e8e138e2b8335aca207a0ec2ed527e46c841824634533cc16360226a3cd8a17ad94db536386ef SHA512 6261192db56af260ab3c86f2ae650cc23c89a00267fa11dc9d1a6efe6811ba63c894fda64031efdc7a5b7e05bb88ad3915ffa12e0268724628483ea31e8bf468
-EBUILD fish-9999.ebuild 1545 BLAKE2B fd23d23d813a9f9ca5309a2cf60e3b275b746e76a13cc27fc9ba4c5fa0df7a6fd60fe1f25d44ee79d842cc850df74d6992a4aaf10c9dde8af95dc9e454d37563 SHA512 41e8f5fddf53c6cbb43097a4cff062474d89e575b8923f706ac98b32916c7856ebee2b220adaa5684a3992b2c55cc53c10de3f09869c49218289c6d91a4346ca
+EBUILD fish-3.1.0.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
+EBUILD fish-9999.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.1.0.ebuild b/app-shells/fish/fish-3.1.0.ebuild
new file mode 100644
index 000000000000..bba5b8321d52
--- /dev/null
+++ b/app-shells/fish/fish-3.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 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} == "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.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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:0=[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-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 8d135c75a1fc..bba5b8321d52 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; 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.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"