From 495c9ff01312e93c94cb63f1536d44fcaba5a1c9 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 1 Oct 2021 22:50:49 +0200 Subject: [PATCH 1/3] gui-apps/foot-terminfo: Share tarball name with gui-apps/foot This avoids having to download the same tarball twice. Signed-off-by: Haelwenn (lanodan) Monnier --- gui-apps/foot-terminfo/Manifest | 8 ++++---- gui-apps/foot-terminfo/foot-terminfo-1.7.1.ebuild | 2 +- gui-apps/foot-terminfo/foot-terminfo-1.7.2.ebuild | 2 +- gui-apps/foot-terminfo/foot-terminfo-1.8.1.ebuild | 2 +- gui-apps/foot-terminfo/foot-terminfo-1.9.0.ebuild | 2 +- gui-apps/foot-terminfo/foot-terminfo-9999.ebuild | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest index 1a9e547ced..78835bf2d4 100644 --- a/gui-apps/foot-terminfo/Manifest +++ b/gui-apps/foot-terminfo/Manifest @@ -1,4 +1,4 @@ -DIST foot-terminfo-1.7.1.tar.gz 390533 BLAKE2B 5eac8041ac5f46b71d8037550bcdd14899071e63fc4a9c6eabe2c44d336e3339e7dbf8b487ff79aa09a6f73378d1faca140fedbf864fdf641a0706c0b9c7912a SHA512 fa6961b24ef7929378c796a77547f509bc2ff319b3b546be8fad31dd02f2686771d2d4a0c72792746e004052fc032f180eb716cb45e2ebbf549859f1b7de7420 -DIST foot-terminfo-1.7.2.tar.gz 392748 BLAKE2B effd72665c553fbf3687fdb17776b264a775311503d974d12b5de4f4b7d1b835755824781a345f29f4866a33f449c61990830452bdca101952ff8c490e37b5f2 SHA512 2acb46daca5840b3a9fb0fc7055f9234618d7d6884ce74fee382f3904136a85f5c17f7119449fd7943dba2ccce2dde9a62d13a1b363ee234765b6ab65d95e19b -DIST foot-terminfo-1.8.1.tar.gz 428685 BLAKE2B 10ad1adf67e3e7171cc60db3dd90a8bdb676f3df61c518f33150c893ee0a552e28b9647cbae03861b85bf4c8501785eaf8a984726a814da2866a06d1a71b3891 SHA512 62a4cc018e49e270b8d806ea5b5c17965428a0f943b814608c25eb674db6130bfedae2431ac0c61f9c8de6bd227859cedb032f0f573a1e0885938d11efbda4e4 -DIST foot-terminfo-1.9.0.tar.gz 446060 BLAKE2B 2930f155509d2614b1eb0027648e55a97bba3d8ff59c8ea4a181db0e556e3f94b924ccd812653853793c885c6594745de991073f6ec7eaf2438927a033ba6515 SHA512 ffdefd0d42c1a2092af9d6aaf6cd1d33f017424177a3144d317d2bbc502afa1373db9bb5d0042847ff704c76667198e16e5ab861907db2451941517109f2db62 +DIST foot-1.7.1.tar.gz 390533 BLAKE2B 5eac8041ac5f46b71d8037550bcdd14899071e63fc4a9c6eabe2c44d336e3339e7dbf8b487ff79aa09a6f73378d1faca140fedbf864fdf641a0706c0b9c7912a SHA512 fa6961b24ef7929378c796a77547f509bc2ff319b3b546be8fad31dd02f2686771d2d4a0c72792746e004052fc032f180eb716cb45e2ebbf549859f1b7de7420 +DIST foot-1.7.2.tar.gz 392748 BLAKE2B effd72665c553fbf3687fdb17776b264a775311503d974d12b5de4f4b7d1b835755824781a345f29f4866a33f449c61990830452bdca101952ff8c490e37b5f2 SHA512 2acb46daca5840b3a9fb0fc7055f9234618d7d6884ce74fee382f3904136a85f5c17f7119449fd7943dba2ccce2dde9a62d13a1b363ee234765b6ab65d95e19b +DIST foot-1.8.1.tar.gz 428685 BLAKE2B 10ad1adf67e3e7171cc60db3dd90a8bdb676f3df61c518f33150c893ee0a552e28b9647cbae03861b85bf4c8501785eaf8a984726a814da2866a06d1a71b3891 SHA512 62a4cc018e49e270b8d806ea5b5c17965428a0f943b814608c25eb674db6130bfedae2431ac0c61f9c8de6bd227859cedb032f0f573a1e0885938d11efbda4e4 +DIST foot-1.9.0.tar.gz 446060 BLAKE2B 2930f155509d2614b1eb0027648e55a97bba3d8ff59c8ea4a181db0e556e3f94b924ccd812653853793c885c6594745de991073f6ec7eaf2438927a033ba6515 SHA512 ffdefd0d42c1a2092af9d6aaf6cd1d33f017424177a3144d317d2bbc502afa1373db9bb5d0042847ff704c76667198e16e5ab861907db2451941517109f2db62 diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.7.1.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.7.1.ebuild index e2e3662684..0c0c7d21eb 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-1.7.1.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-1.7.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 if [[ ${PV} != *9999* ]]; then - SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/foot" else diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.7.2.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.7.2.ebuild index e2e3662684..0c0c7d21eb 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-1.7.2.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-1.7.2.ebuild @@ -4,7 +4,7 @@ EAPI=7 if [[ ${PV} != *9999* ]]; then - SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/foot" else diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.8.1.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.8.1.ebuild index e2e3662684..0c0c7d21eb 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-1.8.1.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-1.8.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 if [[ ${PV} != *9999* ]]; then - SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/foot" else diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.9.0.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.9.0.ebuild index e2e3662684..0c0c7d21eb 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-1.9.0.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-1.9.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 if [[ ${PV} != *9999* ]]; then - SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/foot" else diff --git a/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild b/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild index e2e3662684..0c0c7d21eb 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 if [[ ${PV} != *9999* ]]; then - SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/foot" else From b83d186352b998384320232ef2bf365ba9e76d11 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 1 Oct 2021 22:44:55 +0200 Subject: [PATCH 2/3] gui-apps/foot*: Version bump to 1.9.1 Signed-off-by: Haelwenn (lanodan) Monnier --- gui-apps/foot-terminfo/Manifest | 1 + .../foot-terminfo/foot-terminfo-1.9.1.ebuild | 37 ++++++++++++ .../foot-terminfo/foot-terminfo-9999.ebuild | 5 ++ gui-apps/foot/Manifest | 1 + gui-apps/foot/foot-1.9.1.ebuild | 56 +++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 gui-apps/foot-terminfo/foot-terminfo-1.9.1.ebuild create mode 100644 gui-apps/foot/foot-1.9.1.ebuild diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest index 78835bf2d4..eaae9028c2 100644 --- a/gui-apps/foot-terminfo/Manifest +++ b/gui-apps/foot-terminfo/Manifest @@ -2,3 +2,4 @@ DIST foot-1.7.1.tar.gz 390533 BLAKE2B 5eac8041ac5f46b71d8037550bcdd14899071e63fc DIST foot-1.7.2.tar.gz 392748 BLAKE2B effd72665c553fbf3687fdb17776b264a775311503d974d12b5de4f4b7d1b835755824781a345f29f4866a33f449c61990830452bdca101952ff8c490e37b5f2 SHA512 2acb46daca5840b3a9fb0fc7055f9234618d7d6884ce74fee382f3904136a85f5c17f7119449fd7943dba2ccce2dde9a62d13a1b363ee234765b6ab65d95e19b DIST foot-1.8.1.tar.gz 428685 BLAKE2B 10ad1adf67e3e7171cc60db3dd90a8bdb676f3df61c518f33150c893ee0a552e28b9647cbae03861b85bf4c8501785eaf8a984726a814da2866a06d1a71b3891 SHA512 62a4cc018e49e270b8d806ea5b5c17965428a0f943b814608c25eb674db6130bfedae2431ac0c61f9c8de6bd227859cedb032f0f573a1e0885938d11efbda4e4 DIST foot-1.9.0.tar.gz 446060 BLAKE2B 2930f155509d2614b1eb0027648e55a97bba3d8ff59c8ea4a181db0e556e3f94b924ccd812653853793c885c6594745de991073f6ec7eaf2438927a033ba6515 SHA512 ffdefd0d42c1a2092af9d6aaf6cd1d33f017424177a3144d317d2bbc502afa1373db9bb5d0042847ff704c76667198e16e5ab861907db2451941517109f2db62 +DIST foot-1.9.1.tar.gz 450538 BLAKE2B 19c436853889c6ab98993b5e1b340d579b6e37ceb1a68c49b3db34839e82c72f3943ea88b0e9746f8d067120b5fe16a455a61dec0a21024958767dc32d0f98cc SHA512 8f2925ce8a19fd98ac612723d7594cb741c3222d180632c1719e693b17380dc12d1188cc309377add1cecbc9fe05ea4c75df7fe5603a42f153cc05489345614e diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.9.1.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.9.1.ebuild new file mode 100644 index 0000000000..d72edcdf7c --- /dev/null +++ b/gui-apps/foot-terminfo/foot-terminfo-1.9.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/foot" +else + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/foot.git" +fi + +DESCRIPTION="Terminfo for foot, a great Wayland terminal emulator" +HOMEPAGE="https://codeberg.org/dnkl/foot" +LICENSE="MIT" +SLOT="0" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="sys-libs/ncurses" + +src_prepare() { + default + sed -i 's/@default_terminfo@/foot/g' "${S}/foot.info" || die "Failed to pre-process terminfo" +} + +src_compile() { + tic -x -o "${S}" -e foot,foot-direct "${S}/foot.info" || die "Failed to compile terminfo" +} + +src_install() { + dodir /usr/share/terminfo/f/ + cp "${S}/f/foot" "${D}/usr/share/terminfo/f/foot" || die + cp "${S}/f/foot-direct" "${D}/usr/share/terminfo/f/foot-direct" || die +} diff --git a/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild b/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild index 0c0c7d21eb..d72edcdf7c 100644 --- a/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild +++ b/gui-apps/foot-terminfo/foot-terminfo-9999.ebuild @@ -21,6 +21,11 @@ DEPEND="" RDEPEND="${DEPEND}" BDEPEND="sys-libs/ncurses" +src_prepare() { + default + sed -i 's/@default_terminfo@/foot/g' "${S}/foot.info" || die "Failed to pre-process terminfo" +} + src_compile() { tic -x -o "${S}" -e foot,foot-direct "${S}/foot.info" || die "Failed to compile terminfo" } diff --git a/gui-apps/foot/Manifest b/gui-apps/foot/Manifest index ec90e2f077..dbc790e491 100644 --- a/gui-apps/foot/Manifest +++ b/gui-apps/foot/Manifest @@ -4,3 +4,4 @@ DIST foot-1.8.0.tar.gz 415924 BLAKE2B ec97a6b76f568770fd9011e2245aee9b96c8fc51fb DIST foot-1.8.1.tar.gz 428685 BLAKE2B 10ad1adf67e3e7171cc60db3dd90a8bdb676f3df61c518f33150c893ee0a552e28b9647cbae03861b85bf4c8501785eaf8a984726a814da2866a06d1a71b3891 SHA512 62a4cc018e49e270b8d806ea5b5c17965428a0f943b814608c25eb674db6130bfedae2431ac0c61f9c8de6bd227859cedb032f0f573a1e0885938d11efbda4e4 DIST foot-1.8.2.tar.gz 432906 BLAKE2B 25dfa24df5e95a29b0cc19c0d67cd3025cee3cad03069feca748e580dc1a42e1e2c4eebee0c3549edf522d12da5bc80fd5947a0a7f28658e3f207b76562c60a2 SHA512 8442761f20d8d5e315c2cbf75c40a6fd8e449f6ce515a1a3aac2106b4c9d7c8257ed96b5e1808eb0e9fda448a2a1bbb6b55cfb8d7abd6acb184cabcdc43d5fa5 DIST foot-1.9.0.tar.gz 446060 BLAKE2B 2930f155509d2614b1eb0027648e55a97bba3d8ff59c8ea4a181db0e556e3f94b924ccd812653853793c885c6594745de991073f6ec7eaf2438927a033ba6515 SHA512 ffdefd0d42c1a2092af9d6aaf6cd1d33f017424177a3144d317d2bbc502afa1373db9bb5d0042847ff704c76667198e16e5ab861907db2451941517109f2db62 +DIST foot-1.9.1.tar.gz 450538 BLAKE2B 19c436853889c6ab98993b5e1b340d579b6e37ceb1a68c49b3db34839e82c72f3943ea88b0e9746f8d067120b5fe16a455a61dec0a21024958767dc32d0f98cc SHA512 8f2925ce8a19fd98ac612723d7594cb741c3222d180632c1719e693b17380dc12d1188cc309377add1cecbc9fe05ea4c75df7fe5603a42f153cc05489345614e diff --git a/gui-apps/foot/foot-1.9.1.ebuild b/gui-apps/foot/foot-1.9.1.ebuild new file mode 100644 index 0000000000..dba0d9b5ce --- /dev/null +++ b/gui-apps/foot/foot-1.9.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}" +else + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/foot.git" +fi + +DESCRIPTION="A fast, lightweight and minimalistic Wayland terminal emulator" +HOMEPAGE="https://codeberg.org/dnkl/foot" +LICENSE="MIT" +SLOT="0" +IUSE="ime +grapheme-clustering" + +DEPEND=" + dev-libs/libutf8proc + dev-libs/wayland + media-libs/fcft + media-libs/fontconfig + media-libs/freetype + x11-libs/libxkbcommon + x11-libs/pixman +" +RDEPEND=" + ${DEPEND} + gui-apps/foot-terminfo +" +BDEPEND=" + app-text/scdoc + dev-libs/tllist + dev-libs/wayland-protocols + sys-libs/ncurses +" + +src_configure() { + local emesonargs=( + $(meson_use ime) + $(meson_feature grapheme-clustering) + "-Dterminfo=disabled" + "-Dwerror=false" + ) + meson_src_configure +} + +src_install() { + meson_src_install + mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die +} From e95fbbaa4465fb68e5679313e22b77a0b0eb5d1f Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 1 Oct 2021 23:09:17 +0200 Subject: [PATCH 3/3] www-client/badwolf: Add mandoc as test dependency Signed-off-by: Haelwenn (lanodan) Monnier --- www-client/badwolf/badwolf-9999.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www-client/badwolf/badwolf-9999.ebuild b/www-client/badwolf/badwolf-9999.ebuild index 9e084fb269..64ec616593 100644 --- a/www-client/badwolf/badwolf-9999.ebuild +++ b/www-client/badwolf/badwolf-9999.ebuild @@ -25,11 +25,15 @@ SLOT="0" DOCS=("README.md" "KnowledgeBase.md") +IUSE="test" +RESTRICT="!test? ( test )" + DEPEND=" x11-libs/gtk+:3 net-libs/webkit-gtk:4= " RDEPEND="${DEPEND}" +BDEPEND="test? ( app-text/mandoc )" src_configure() { [[ "${PV}" == "9999" ]] || restore_config config.h