From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- app-shells/fish/Manifest | 4 ++-- app-shells/fish/fish-3.0.2.ebuild | 11 +++++------ app-shells/fish/fish-9999.ebuild | 11 +++++------ 3 files changed, 12 insertions(+), 14 deletions(-) (limited to 'app-shells/fish') diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index 7e964277419b..0b3bc607f5fa 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -4,6 +4,6 @@ AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b -EBUILD fish-3.0.2.ebuild 1712 BLAKE2B 42c6c3e82411cb7d17ded1bdab4794885916de6103d3769770f06684b2905e286ffd90edbc709c0e8ffc1dc871785f52ad9de2f859ad4e579fa679311360eabd SHA512 058a568ed69f26eda948193d289f1854494bdfb4c0543cc7a02618f1c9a5ffc01774da701ab44577838e8281c286031467300e477728825a91cb0271103e7a7b -EBUILD fish-9999.ebuild 1646 BLAKE2B 43b768d1486e891af7ee855f10896b5e32b761ab88b15d2b0bc205dedf02ba72303995d7e97bb4ea61ff80cc1fa2c3b21824fbee9b65e4d4014f0e9dba8bed43 SHA512 508e6659728e34efe8260a08caa1985570924af97f023c1dae658802a58e93a95392852ae34a7374cf6f866bd456d829689c1e253d54bd5c6831d033ecf5cfef +EBUILD fish-3.0.2.ebuild 1636 BLAKE2B c6596d235523292dc48628cd49233cdeaa2e1a515dbee4670daa8c3113e079a106d8e57ec368fa5b080816232322dc622d188e328836aec6b7ab0f809ee95098 SHA512 4844329691943c21fcde1024b259dfb4316db8512f9537bcf0610bf6a34ddaa76dd9fe25773849f05db82c77dd9d623ec32fb399b7339f37ddeedd0f51fc92e0 +EBUILD fish-9999.ebuild 1570 BLAKE2B b619d8fcf2ff1108547bdc462a4b6feb33a326a530f40c05b2da744e01f8ce82d53f4fd211f54f6dafee1c4a260eb9336c4250bc2ea9d9d3580e93d8b222b5c7 SHA512 ac53907f491994b01351bbf0c6c649e9a9616288ca1d0a802b9b0aad91d1d9cabd5c00bf46976b19308351142ff618ba3b614c4a3d6aebb53cbec36f44b69ad7 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97 diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild index 540ec26c1feb..3a16d56f7c07 100644 --- a/app-shells/fish/fish-3.0.2.ebuild +++ b/app-shells/fish/fish-3.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils readme.gentoo-r1 +inherit cmake readme.gentoo-r1 DESCRIPTION="Friendly Interactive SHell" HOMEPAGE="http://fishshell.com/" @@ -45,30 +45,29 @@ 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-utils_src_prepare + cmake_src_prepare } src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DCURSES_NEED_NCURSES=ON -DINTERNAL_WCWIDTH=OFF -DBUILD_DOCS="$(usex doc)" -DWITH_GETTEXT="$(usex nls)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install keepdir /usr/share/fish/vendor_{completions,conf,functions}.d readme.gentoo_create_doc } src_test() { - cmake-utils_src_make -j1 test + cmake_build -j1 test } pkg_postinst() { diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index cf5816108b09..e718e3cbc309 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils readme.gentoo-r1 +inherit cmake readme.gentoo-r1 DESCRIPTION="Friendly Interactive SHell" HOMEPAGE="http://fishshell.com/" @@ -42,30 +42,29 @@ 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-utils_src_prepare + cmake_src_prepare } src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DCURSES_NEED_NCURSES=ON -DINTERNAL_WCWIDTH=OFF -DBUILD_DOCS="$(usex doc)" -DWITH_GETTEXT="$(usex nls)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install keepdir /usr/share/fish/vendor_{completions,conf,functions}.d readme.gentoo_create_doc } src_test() { - cmake-utils_src_make -j1 test + cmake_build -j1 test } pkg_postinst() { -- cgit v1.2.3