From 4cd9b5ac0149ae834bc20d1cff1f2b1303562ae6 Mon Sep 17 00:00:00 2001 From: Ryan Fox Date: Thu, 7 Jan 2021 06:29:19 +0000 Subject: [PATCH] gui-apps/foot-terminfo: Remove meson It's easier, and I need not worry about meson crashing when it doesn't have every single dependency for foot. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Ryan Fox --- gui-apps/foot-terminfo/Manifest | 4 ++-- gui-apps/foot-terminfo/foot-terminfo-1.6.2.ebuild | 10 +++------- gui-apps/foot-terminfo/foot-terminfo-9999.ebuild | 10 +++------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest index bd9671c..59efc78 100644 --- a/gui-apps/foot-terminfo/Manifest +++ b/gui-apps/foot-terminfo/Manifest @@ -1,4 +1,4 @@ DIST foot-terminfo-1.6.2.tar.gz 340942 BLAKE2B 7704a1a20c8e474a1185c1e4433f58537a12c8984b90ab9164094efae584d2aa93fd44b3b8cb094c3aa811fb3c5d835a4463030384deab72b242d943b2aa8d3f SHA512 7a18af2bdf9fc1540dc47bdfe599714edea62f4297cc2916f132f8d9d688c11e8ce1fd368e32dabcac2c90c20aac36a17cc263d29d1ad7bb492486fdee1cfe75 -EBUILD foot-terminfo-1.6.2.ebuild 667 BLAKE2B 9a86421daea3a8001066fe54a17031b5d528527fbc8c4ae2ae4ba6802bd7e2545ff2c20d6792f176f43e5c6b0d784d8a0c578e8127c5f26a78434fc05eca5518 SHA512 a69a9aa9420b4bb1b265c28c2df27540a4263a3f0e46d932892ab49ee2a2c6c7dba993bcd8ec85b9c1c54a0071c399452ff92692a0021856cd5f66d84e6188b5 -EBUILD foot-terminfo-9999.ebuild 667 BLAKE2B 9a86421daea3a8001066fe54a17031b5d528527fbc8c4ae2ae4ba6802bd7e2545ff2c20d6792f176f43e5c6b0d784d8a0c578e8127c5f26a78434fc05eca5518 SHA512 a69a9aa9420b4bb1b265c28c2df27540a4263a3f0e46d932892ab49ee2a2c6c7dba993bcd8ec85b9c1c54a0071c399452ff92692a0021856cd5f66d84e6188b5 +EBUILD foot-terminfo-1.6.2.ebuild 729 BLAKE2B 32ebb8b98eefe588d28bfaef2a6220f8e5cd4f76cc5c2c4c9e8258a8876a3d2e6a3179082f28fac17a885105d7f01e2db6e9e962f5f23e3a7ab6fe71fef1266c SHA512 665557c5daaa56af2d9f4f7a52c0bdd311342dd4d2583e17aa87d7f47cd9552c9dc5f4449e3404f0d4cf7f97b485ef0e855e0fde95ef085d84935de310d58ace +EBUILD foot-terminfo-9999.ebuild 729 BLAKE2B 32ebb8b98eefe588d28bfaef2a6220f8e5cd4f76cc5c2c4c9e8258a8876a3d2e6a3179082f28fac17a885105d7f01e2db6e9e962f5f23e3a7ab6fe71fef1266c SHA512 665557c5daaa56af2d9f4f7a52c0bdd311342dd4d2583e17aa87d7f47cd9552c9dc5f4449e3404f0d4cf7f97b485ef0e855e0fde95ef085d84935de310d58ace MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80 diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.6.2.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.6.2.ebuild index 8402188..6992a75 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-1.6.2.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-1.6.2.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit meson - if [[ ${PV} != *9999* ]]; then SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" @@ -23,11 +21,9 @@ DEPEND="" RDEPEND="${DEPEND}" BDEPEND="" -src_compile() { - meson_src_compile "f" -} - src_install() { + tic -x -o "${S}" -e foot,foot-direct "${S}/foot.info" dodir /usr/share/terminfo/f/ - cp "${BUILD_DIR}/f/"* "${D}/usr/share/terminfo/f/" + cp "${S}/f/foot" "${D}/usr/share/terminfo/f/foot" + cp "${S}/f/foot-direct" "${D}/usr/share/terminfo/f/foot-direct" } diff --git a/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild b/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild index 8402188..6992a75 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit meson - if [[ ${PV} != *9999* ]]; then SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" @@ -23,11 +21,9 @@ DEPEND="" RDEPEND="${DEPEND}" BDEPEND="" -src_compile() { - meson_src_compile "f" -} - src_install() { + tic -x -o "${S}" -e foot,foot-direct "${S}/foot.info" dodir /usr/share/terminfo/f/ - cp "${BUILD_DIR}/f/"* "${D}/usr/share/terminfo/f/" + cp "${S}/f/foot" "${D}/usr/share/terminfo/f/foot" + cp "${S}/f/foot-direct" "${D}/usr/share/terminfo/f/foot-direct" }