summaryrefslogtreecommitdiff
path: root/x11-terms
diff options
context:
space:
mode:
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/Manifest.gzbin4379 -> 4384 bytes
-rw-r--r--x11-terms/guake/Manifest3
-rw-r--r--x11-terms/guake/guake-3.8.0.ebuild85
-rw-r--r--x11-terms/guake/guake-9999.ebuild69
-rw-r--r--x11-terms/kitty-terminfo/Manifest10
-rw-r--r--x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild41
-rw-r--r--x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild41
-rw-r--r--x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild41
-rw-r--r--x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild2
-rw-r--r--x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild2
-rw-r--r--x11-terms/kitty/Manifest5
-rw-r--r--x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch14
-rw-r--r--x11-terms/kitty/files/kitty-0.17.2-flags.patch50
-rw-r--r--x11-terms/kitty/files/kitty-0.19.1-tests.patch11
-rw-r--r--x11-terms/kitty/kitty-0.19.3.ebuild107
-rw-r--r--x11-terms/root-tail/Manifest2
-rw-r--r--x11-terms/root-tail/root-tail-1.2-r4.ebuild2
-rw-r--r--x11-terms/st/Manifest4
-rw-r--r--x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch16
-rw-r--r--x11-terms/st/st-0.8.4-r1.ebuild73
-rw-r--r--x11-terms/st/st-9999.ebuild7
-rw-r--r--x11-terms/xfce4-terminal/Manifest4
-rw-r--r--x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild (renamed from x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild)30
-rw-r--r--x11-terms/xterm/Manifest2
-rw-r--r--x11-terms/xterm/metadata.xml6
25 files changed, 214 insertions, 413 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 631d78bec00a..0b6872cd6149 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
Binary files differ
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index f61d48b4f05c..4edf8b58eed4 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,6 @@
AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
+DIST guake-3.8.0.tar.gz 1125090 BLAKE2B 72ee6b5e93c3433fcc2863d2b0aa198326cc4889126454040ce870fdeaa0ba110723410355ae49b5e2e4876fcad3f9d849873adaddfcf1ecfa83dc1583db57eb SHA512 6e0bb6b4a0c92c163bd6151c65936a38d93624166af5a4e2b042f9ade7f28683c8e8fad802b23a07edd478e2dd3b99a559069c9935f1154585be936d1b7a96ed
EBUILD guake-3.7.0.ebuild 1767 BLAKE2B 3358dad3874118a2af413ba00a48fb072bf3cde0ec0d4d0a371ef0d7de2973ae4ba2f1d4d744821ad33201252a386191a59872a1d84cf3baa5ad2e2e27690f9c SHA512 38b8cfa20a37f06474978f067fd125aa863d92b1128af685540041d1ae49a6b4702878f5a248cebbe35b387bd8101ec5e23e49a57485f6d42936de80d2ba093b
-EBUILD guake-9999.ebuild 1538 BLAKE2B feb2481be734ddad1ca00b3fadc8424426d52b8e48f9eb03e5563daf79029c9105c8cf43f3848d07f9bd525ba2005aff2c22d2766a586f1ff34e0051a74bb4df SHA512 a84a18ddf1a4b908c4f439e89df8d067d0e8549f454059798ef7c0b5203ef4182060a48c1d19c2f8a5e242151c2414e916027b0df52a9e37e19c7b0573efe987
+EBUILD guake-3.8.0.ebuild 2123 BLAKE2B 8f7688df5ee33f68da0f5888e5e42540c7b5e14d7fe02c459078d9d6b083f26d22ae0745ce8d1b619c8d47a34c38a495dc46f3c1ec870370fb40d61ccb210cda SHA512 0e7ea5aec7364417070f528d1f0a5144dd115162a3c19b71a3dd780a011e77d703e3f945c905a5c901862a3265cbb65d946016d342b0d01c1f72ba2bd863c2af
MISC metadata.xml 532 BLAKE2B 382002b9523b4776d8fe378774a8408b04f8bfac0979bca539e811fe41adec06a0dbce18201191373eb558d9bfabaa9b887eb4134262265e94c837139cafc773 SHA512 5ee8ef619e1d9f04d6560f3c62ed8bd1fa05912a4a6c94e0440ed8208d8efa1b49517c9266fc211cafde37e1b9ea029c64ba529331910688eacb5899fe8507fb
diff --git a/x11-terms/guake/guake-3.8.0.ebuild b/x11-terms/guake/guake-3.8.0.ebuild
new file mode 100644
index 000000000000..c4f5e779132f
--- /dev/null
+++ b/x11-terms/guake/guake-3.8.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="http://guake-project.org/"
+SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ dev-libs/keybinder:3[introspection]
+ x11-libs/libnotify[introspection]
+ x11-libs/libwnck:3[introspection]
+ x11-libs/vte:2.91[introspection]
+ utempter? ( sys-libs/libutempter )"
+BDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/pbr[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pyfakefs[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ )
+ ')
+ dev-libs/glib:2
+ gnome-base/gsettings-desktop-schemas
+ sys-devel/gettext"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ emake PREFIX="${EPREFIX}/usr" prepare-install # paths.py.in -> paths.py
+
+ rm pyproject.toml || die # pytest fails if toml isn't installed
+
+ export PBR_VERSION=${PV} # needed if using github's tarball
+}
+
+python_test() {
+ # uses /usr/bin/bash if SHELL is not exported
+ SHELL=${SHELL} virtx distutils-r1_python_test
+}
+
+python_install() {
+ # done here so tests don't use the system's
+ sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
+ -e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
+ -i "${BUILD_DIR}"/lib/guake/paths.py || die
+ rm -r "${BUILD_DIR}"/lib/guake/tests || die
+
+ distutils-r1_python_install
+}
+
+python_install_all() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-{locale,schemas}
+
+ dodoc NEWS.rst README.rst
+
+ mv "${D}"/{,"${EPREFIX}"/usr/share/}metainfo || die
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+}
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
deleted file mode 100644
index 0c37d44a1ac0..000000000000
--- a/x11-terms/guake/guake-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Guake/guake.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="
- https://github.com/Guake/guake/
- https://pypi.org/project/guake/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="utempter"
-
-RDEPEND="
- dev-libs/glib
- dev-libs/keybinder:3[introspection]
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pbr[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- x11-libs/libnotify[introspection]
- x11-libs/libwnck:3[introspection]
- x11-libs/vte:2.91[introspection]
- utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- gnome-base/gsettings-desktop-schemas
- sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.2-paths.patch
-)
-
-python_compile_all() {
- emake prepare-install PREFIX=/usr
- emake generate-paths PREFIX=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
- default
-}
-
-python_install_all() {
- emake install-schemas install-locale PREFIX=/usr DESTDIR="${D}"
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- gnome2_schemas_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
- xdg_desktop_database_update
-}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 2a9e55fe7594..0f3103430950 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,14 +1,8 @@
AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
AUX kitty-terminfo-setup-0.20.1.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5ed12d173a484d702a890b7c673015e59026429e12b7254bb3b1819e972b853fbd07b098fa1459ea0241c3380c1b25eb8e043 SHA512 f45aba42732d01d577f09143cf867b983743b94cff72d07785398e2ebdd2bdaffff4b04a817e0381cb5cfdb505ed7b7fbbf090d1241d3d718b3148a5e76efa90
-DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
-DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
-DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
-EBUILD kitty-terminfo-0.19.3.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
-EBUILD kitty-terminfo-0.20.1.ebuild 995 BLAKE2B 69179592c87c135e8ec646b5fe9d483aefb3d0131414a6e2ede8837c58e22b1f8accb19220e66ed7e1793e1f7c2d57362dd22ea20e0f3cb86608dc631e3128b7 SHA512 5241997e9566a8c8a31320804e0e0c282dc0f20d2e941415ef661ff3b8931d1dae73821a0668617eaef2d8c8950319adc2ace55522dbe5fd445b4abdadd466d4
-EBUILD kitty-terminfo-0.20.3.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
EBUILD kitty-terminfo-0.21.2.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
-EBUILD kitty-terminfo-0.23.1.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
-EBUILD kitty-terminfo-9999.ebuild 918 BLAKE2B 925db099759156ab53f750cdac53fb15bd453e1e493b419e7c807f236fd97f893718df6e7e5a4d8ef0d880544c8c4aaa16da684f5a1bb318c4d1b31432acd09a SHA512 c493c3d9fff637dc4dc8df0a3ec293f1389b5f4695a2d3b0669b6ffdcaec528db6f1b121ca10f10f69141b6bf6710c947b1b610db33dc146b7829d56d8668769
+EBUILD kitty-terminfo-0.23.1.ebuild 997 BLAKE2B 8fdd142b7c2a1afe010cd09da61097169401ba2a5af2626b7a5ed456e76a6c764fec8520678de488631ec779f307341920fad1aadccf91298b688342ecf49e56 SHA512 fe9114cacb8b3f30d44d05ef0575803a49afe410bd803580c489e7075b0ddc8bce9835f3e6e8cb661551452a5ae5fd68164c4f8c492835e55a8ac9194c03e44c
+EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 04c2ef92eba28fe3a3fda238a8c0e9fae6b142da0446789543c8a8a4872dbab2f859627c47a620c6d679ff4b8f10288b6c21ed95a1fa7b72789c22936baa2331 SHA512 9b86523ac2eabd25194fccd6918912da9d0e10a52226dc8024eea3af890cb4aff056d2255b6a3cb9149be2b5a46a9e8ff88cc9ba5407e38fd9c1d30abc10eb15
MISC metadata.xml 495 BLAKE2B f560d10edb2038d05893c8aa9ad5ee186b30f4bf48450df73a85b11db53e0949ee85964679c18f406b86273ca7b6d7ac4b7fd6de5bc8e197a68bb0d85f6368ca SHA512 5d43de9620940c971f8d11961bdac83906998625e44f0fe022e5daf7b7d8962c705c93817ef2991d233c15f4c62e344accc0ef52c0aa2bc6207f0763cb3e6b4a
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild
deleted file mode 100644
index 7f52297143e0..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
- "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild
deleted file mode 100644
index aa1dee870988..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
- "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
deleted file mode 100644
index be10def6c282..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
- "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
index be10def6c282..200f0cd96ff7 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 toolchain-funcs xdg
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
index 4a33e547ef85..c060f3f8b166 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 toolchain-funcs xdg git-r3
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 482ef77cc566..27fbb54b6de5 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,19 +1,14 @@
AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
-AUX kitty-0.16.0-remove-terminfo.patch 614 BLAKE2B 701aef294f7e52a2bf8a8cbe0fb192b226d1b430c1bed9f9d58e1f3c8e10362ac3b0cf04bc8de9c4e3a23acfce18bcbe3442191afcd77d76013539c8a7afe16e SHA512 667508e851c48bb66b85e3439cad92d98e12cef18dd0f45a6d8c4226b86b108d64e4d92fc5b650b7b80763665dba59f066930e4a654690d833e42e6aff13418f
-AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead672ce04410ede1a0a392098fc534ea989fcd5c2f7bd2d2581581c2ec64160c2364a1d5ef86eb67b07ec9440ea7 SHA512 49a1cb02beac7e56e6b75d1caf1fdf3111146eb5b40b29f0acf646052a95be84bb943c8a1b15eda8f2c10bc86437387dd465a8d9b044cbf7305cefee1c9fc97f
-AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893
AUX kitty-0.20.1-flags.patch 1995 BLAKE2B e563ab5c09d43e8701e6ec5df519c47ae952054da72fedf106809f1c3775f00e172de7146734e10186f75ab10b8b0d42faa2ac6402cac5d57fdd8d5e611d90b0 SHA512 cbc8660909c3e07e16f720528265384bef2152fc33e41fbbef057fcd436216071ebfc0b4956284bd0e8e745ba28ba41221da8fff8d7f9a704fba6b79ea021f6f
AUX kitty-0.20.1-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
AUX kitty-0.20.1-tests.patch 514 BLAKE2B 69c4277b4ffc257cc8320dbfc5be95d72bcb35b70a377f8ef24ecd9a20036313ce52f245efd5f620b47ddea6f688cb0d3b4154d8787a3908d5c255ca26143f80 SHA512 bb5dd23b0e83118fd33296e1ee8c6485e51f29518406e1e875b2f5ec8e7de4103c9ec2b4c99516a3d4fe6134ccf5bf0d54e4a37bee89e64f294da4b0350d337c
AUX kitty-0.20.3-flags.patch 2252 BLAKE2B 62743ee798196ec14ae3899e481271890507563b438ef87f8e7d19f2cfa79def5118aba39bdf402d6d505b208d1082af156c4feb4a113a5bd1fec481c1ffe20f SHA512 2480194e3f5dbee2fe2e70c5c54c69cb497d3dae9914508d3c0488de9227169cb8c023834627d0c55f863498d89890c31110fa3c3ee740b241b99bf299557007
AUX kitty-0.21.2-flags.patch 2264 BLAKE2B f97139220f48a65fcb7da0cf166b27b9827d5e01f21bc0549f0bf3ce87287f787b167283cf05d82ca15bef7c996da4c512aa6e483900ea4a6c44015de362d11c SHA512 845bd40360730d498de16764423263014bd299c7a9072f12810e859ba851d88d7f1429d2844c7defd0b389694be7ea3dbc2d4e4a4718e35f090440b7d0ef0e84
AUX kitty-0.21.2-remove-terminfo.patch 666 BLAKE2B e551e919d3a2ea31d53122e1bdd02e492e3ca0f6a0335b94d1e37585f82b2b0340743cd3536b43b9f26865917a01526e09379b02c9f2e55104bb8f4ec8b91b11 SHA512 2ca3ce3bdcbc1c0ec824d496d1682c800960f42289d75d2e92022873c8cf6a6a5095d97241fe5eb3b05949e18ae113719c7542643244d03521c01a857c59f48f
-DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
-EBUILD kitty-0.19.3.ebuild 2259 BLAKE2B 2d1cca2f65297e9d90e50b417906ca25a6544aa11417bcbb1ed6fad3f2c23a324fa74248833cf8609812730cc0d30c939aa7468403df516db691b3038bd59af4 SHA512 00e930df5964ac1dc70df020dd8f71c9f43e474813662ff16381f71efd94c25f2bd988dde8fdda0f0db30012f17b7cb26eb771e9288c67482cdb46bd126234cd
EBUILD kitty-0.20.1.ebuild 2437 BLAKE2B 8a4a8b12230e8bf949d8033f2625eaeac2c9b44cd650808610f7a5e898f8c4b7a0055f07e146fa665c668f606a3114e82f671acc8e851a1686e7f7068a6d943a SHA512 80dfe575df244ac936c2038513f263857b2175fcfed5f0c6b1baf01d080fa25941c6225a6d844ef59b2539822151a4253895bc36a797f5bd7e439cc9caee92a2
EBUILD kitty-0.20.3.ebuild 2356 BLAKE2B 4c0cf0cda36e73e4127cc40c46a4ff3c56c63929538dd2077364cbfd2ea0e432df7e31528be1cc0600777295ede31e3369f0027a836663a0eff47737c76196dc SHA512 bb4a0e3ed5612ce5f0f7a8abc41b70925584a5d536d8210cae275bd94a16878f55fc8eeb2d91ca020e2974bf044f26b9a5fac6a434595fd6268bec5a9bcb3600
EBUILD kitty-0.21.2.ebuild 2383 BLAKE2B 6f2831db949398f23a5402d91b6819c12e53c64f87ef2fdd7e855556d7b881a0f4fabc43b0f328025c3742920ca3702ed0c05825f3d9921700e6d14196e641c1 SHA512 4bf9028ca55a0e46b3aae6c35d01f1356fa8ecc3b02d53fe0865ffa69bc2629231243d187bc4a090941809bfb169fc98ec7f68ba7d6aecda72893a8c4fdda526
diff --git a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
deleted file mode 100644
index 4b7352aa73b3..000000000000
--- a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -837,11 +837,6 @@
- safe_makedirs(launcher_dir)
- build_launcher(args, launcher_dir, bundle_type)
- os.makedirs(os.path.join(libdir, 'logo'))
-- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')
-- for x in (libdir, os.path.join(ddir, 'share')):
-- odir = os.path.join(x, 'terminfo')
-- safe_makedirs(odir)
-- build_terminfo['compile_terminfo'](odir)
- shutil.copy2('__main__.py', libdir)
- shutil.copy2('logo/kitty.rgba', os.path.join(libdir, 'logo'))
- shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/files/kitty-0.17.2-flags.patch b/x11-terms/kitty/files/kitty-0.17.2-flags.patch
deleted file mode 100644
index 5a247679dc82..000000000000
--- a/x11-terms/kitty/files/kitty-0.17.2-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Respect user CFLAGS.
-
---- a/setup.py
-+++ b/setup.py
-@@ -236,7 +236,7 @@
- if ccver >= (5, 0):
- df += ' -Og'
- float_conversion = '-Wfloat-conversion'
- fortify_source = '-D_FORTIFY_SOURCE=2'
-- optimize = df if debug or sanitize else '-O3'
-+ optimize = ''
- sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
- cppflags_ = os.environ.get(
- 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -217,7 +217,7 @@
- cflags = os.environ.get(
- 'OVERRIDE_CFLAGS', (
- '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
-- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
- ).format(
- float_conversion, std,
- optimize,
-@@ -232,7 +232,7 @@
- )
- ldflags = os.environ.get(
- 'OVERRIDE_LDFLAGS',
-- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+ '-Wall ' + ' '.join(sanitize_args)
- )
- ldflags = shlex.split(ldflags)
- ldflags.append('-shared')
-@@ -614,7 +614,7 @@
-
-
- def build_launcher(args, launcher_dir='.', bundle_type='source'):
-- cflags = '-Wall -Werror -fpie'.split()
-+ cflags = '-Wall -fpie'.split()
- cppflags = []
- libs = []
- if args.profile or args.sanitize:
-@@ -626,8 +626,6 @@
- cflags.append('-g')
- if args.profile:
- libs.append('-lprofiler')
-- else:
-- cflags.append('-O3')
- if bundle_type.endswith('-freeze'):
- cppflags.append('-DFOR_BUNDLE')
- cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.19.1-tests.patch b/x11-terms/kitty/files/kitty-0.19.1-tests.patch
deleted file mode 100644
index ee489b0dce34..000000000000
--- a/x11-terms/kitty/files/kitty-0.19.1-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kitty/constants.py
-+++ b/kitty/constants.py
-@@ -64,7 +64,7 @@
- def kitty_exe() -> str:
- rpath = sys._xoptions.get('bundle_exe_dir')
- if not rpath:
-- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, 'launcher')]
-+ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, '../linux-package/bin')]
- seen: Set[str] = set()
- for candidate in filter(None, items):
- if candidate not in seen:
diff --git a/x11-terms/kitty/kitty-0.19.3.ebuild b/x11-terms/kitty/kitty-0.19.3.ebuild
deleted file mode 100644
index af521efe1f62..000000000000
--- a/x11-terms/kitty/kitty-0.19.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-1.5.0:=
- media-libs/lcms
- media-libs/libcanberra
- media-libs/libpng:0=
- sys-apps/dbus
- sys-libs/zlib
- x11-libs/libxcb[xkb]
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libxkbcommon[X]
- x11-libs/libXrandr
- x11-terms/kitty-terminfo
- wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.17
- )
- $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-
-DEPEND="${RDEPEND}
- media-libs/mesa[X]
- sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.17.2-flags.patch
- "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
- "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
- "${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
- default
-
- # disable wayland as required
- if ! use wayland; then
- sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
- fi
-
- # respect doc dir
- sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
- tc-export CC
-}
-
-src_compile() {
- "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- --update-check-interval=0 \
- linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
- export KITTY_CONFIG_DIRECTORY=${T}
- "${EPYTHON}" test.py || die
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/*
- dobin linux-package/bin/kitty
- python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index 5a39fcb7df51..d8a78d49f4f5 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,4 +1,4 @@
AUX root-tail-1.2-kde.patch 3188 BLAKE2B 122e2ade46725c9e1dacaf5e68f283b3efe2c968407e48d7ee0567e10d5d360f479588ac1b9f6da74a5d0fec52e83ac51ddc6789d8b560c43a83aba5b1ba5ac4 SHA512 f99c8cd04664d7e1afe21854d2ba9114387c55fa89268aca7cbeb88ecfeedad26529bdfd2b52dbe88d74959f4943571bda1f518fb41d8827f04f25e250bc7fb7
DIST root-tail-1.2.tar.gz 20805 BLAKE2B 29891f0bbedc18d6b4e6e726234d7abaf107fa96b3da3a38a5a3aa91edd00403ae52166491cd5ec59f903b12c0edcddc92a3576db3127a837ae9ac3480823c40 SHA512 9e0b046d3e22ad8e85baa356ae8850885759e28624840901465c88c5791595db89da8d7908446cfa52cef180d2ae5a6d3857310679dc37545b6a9cabdd1d3e10
-EBUILD root-tail-1.2-r4.ebuild 1068 BLAKE2B fd3ab90f2d0ec13e0d97641e486ff78421f5e242cf5796c14ed31db5682399e58bc4e16783edbf2b64d0c7d06739bc66e2fc9ce6b7671b19909e457c0b4b656a SHA512 936c40718b7b9ff2b559433a5600eeca7cfa34160e3e3cdefd8ff7b354a71c8f36d3c811b5092638c3f518e3744e3b869261899ae84f2f234ad6bf571751ac45
+EBUILD root-tail-1.2-r4.ebuild 1075 BLAKE2B fd551413aab84e94f4dc07c68b5188fb4973363eccef0895b224a94510f393c75f9586be2ce298cbf93aa52f33a11f991c4ad3e7bb3abefec1b57146b4de1296 SHA512 e214bab918f3da289e680b810f5e409befa33524ea0b00b1963400bcf60fd11deb5da7a331d372f9e80d8c3fc828f4e17f95801d154d2d59cafb5857bc497203
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
index ea4f261a0a94..aa82399568d3 100644
--- a/x11-terms/root-tail/root-tail-1.2-r4.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
IUSE="kde debug"
RDEPEND="x11-libs/libXext
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 4fa70d49d76d..adf27a5d8e2b 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,6 @@
+AUX st-0.8.4-locale-musl-segfault.patch 513 BLAKE2B 2c2ee2aee8c7a19f11f00d89254e1679cc0278da09b64b469b296c0a81e6afecd67216b70f6244aad086ee1fd5f3729472376968f5247e6891ba39242a8ec9ae SHA512 367b8019ecec058eff0fc499baaea2e29abbf60df6b944eb9b5389336d4e6156fbbc2773326643978eff7cbf15810232f7d30587b0d951ee41ce34114e8277a5
DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
+EBUILD st-0.8.4-r1.ebuild 1466 BLAKE2B 6a12c7a52c2e626eefe0fcea85f655e54c247596e0ed2400f1e546d7f93012384620dd5717b85d30d6817e8b4623c6bb48ad1b61238c51c38c0427f5bfd3492e SHA512 869a37fed185091df0f48d306245738eb54bc7bcd8392b1582d077f3c389cde296cec2df43f01ee449ad9f159218c45a58717e3d86ec5148e94f1426e1700cc3
EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
-EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
+EBUILD st-9999.ebuild 1368 BLAKE2B f71916b6b4d68e39140eb241d5384857645f7bd15c07e418ebeb4ec19dcb60d9baa5fb17244c574ae5dd0efa66bf8dd4a9ead92daa7180a0c7507aed489b3d58 SHA512 b9383a140252f7dd4bf5c1bfa218fd07f4d49f33ec6b904ba35afdb53d3cc126a0db7a2e8ff0de1c88cb28617444a94f911fcb7285e653c62dd3253b1efb855a
MISC metadata.xml 254 BLAKE2B aabbd5365abdb36c7ee6418a30169bc87cdd6cf8175a1f3c5d4e27f84b4309f34a42342887ea5e73eeef602a69582854266900794cc81d8e951d2e5f0480b650 SHA512 030e3a92db3cdca585debc6b26403cc6679a4b5f87bdc188a9dfaf4779adca1b4e8445a755618abe5a43157300292a596c5a6850ebe6f6f7f400d3f46ef2e0f9
diff --git a/x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch b/x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch
new file mode 100644
index 000000000000..b70574025eb2
--- /dev/null
+++ b/x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/784071
+https://git.suckless.org/st/commit/2f6e597ed871cff91c627850d03152cae5f45779.html
+--- a/x.c
++++ b/x.c
+@@ -1585,8 +1585,9 @@ xsettitle(char *p)
+ XTextProperty prop;
+ DEFAULT(p, opt_title);
+
+- Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+- &prop);
++ if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
++ &prop) != Success)
++ return;
+ XSetWMName(xw.dpy, xw.win, &prop);
+ XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
+ XFree(prop.value);
diff --git a/x11-terms/st/st-0.8.4-r1.ebuild b/x11-terms/st/st-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..9ce9140045af
--- /dev/null
+++ b/x11-terms/st/st-0.8.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop savedconfig toolchain-funcs
+
+DESCRIPTION="Simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+IUSE="savedconfig"
+
+RDEPEND="
+ >=sys-libs/ncurses-6.0:0=
+ media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXft
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-locale-musl-segfault.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+ -e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+ -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+ config.mk || die
+ sed -i \
+ -e '/tic/d' \
+ Makefile || die
+
+ restore_config config.h
+}
+
+src_configure() {
+ sed -i \
+ -e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+ config.mk || die
+
+ tc-export CC
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+ dodoc TODO
+
+ make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ if ! [[ "${REPLACING_VERSIONS}" ]]; then
+ elog "Please ensure a usable font is installed, like"
+ elog " media-fonts/corefonts"
+ elog " media-fonts/dejavu"
+ elog " media-fonts/urw-fonts"
+ fi
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index aeafbd94f115..525453f3d78e 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit desktop git-r3 multilib savedconfig toolchain-funcs
+
+inherit desktop git-r3 savedconfig toolchain-funcs
DESCRIPTION="simple terminal implementation for X"
HOMEPAGE="https://st.suckless.org/"
@@ -21,9 +22,9 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- virtual/pkgconfig
x11-base/xorg-proto
"
+BDEPEND="virtual/pkgconfig"
src_prepare() {
default
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 664db4caa3f7..1ecdc5768633 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0e039a43af1968abab86c44fee5575d1fe9c61b3521be156b48bd7084f7169fdcd9757cb6bfe0c99b539bcb865e9150e358 SHA512 92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4
-DIST xfce4-terminal-0.8.9.2.tar.bz2 945176 BLAKE2B a37a665601c5bdb2f53cd62a0909befaabd9bca0747d477fe369f4e325be15a362d249ae675e6cf707ecc89e623b4b1d73f7a31d32f6c6fcc13e4c57684f5d4b SHA512 1402d913bcc0c050b6c83405c754cdec71cf9bb56e2e68e4396d7ce48bec6e1b0cc875ea3ea2f7a0dff8280d306519fd74a8f9d9ebca383a8f295991cb9ddd94
+DIST xfce4-terminal-0.9.0.tar.bz2 1006628 BLAKE2B a96d661a38865af67119729ce0d401f2b08a43ed3ade891fc65756b007b40b43485d4fdad83529323984a6c9f6df4ea7548c9bcbadf7ec25dce97add5d0f0592 SHA512 c431cc3ba93695683301d4a742758ad26994d892d00f394d166315b62a70d00c04e32752fa478b9afbf5642916a0da9470ea22079f9698fbb8455f45f05e2453
EBUILD xfce4-terminal-0.8.10.ebuild 977 BLAKE2B c608ad9804c99786378552eaddf13e32c4d56fe40065ba973aabd7752d2f4252cd6febe80a7f21110103190a069c55da341629d7ae8abcd35184641c3145252f SHA512 35aeff69ad1f1c579f89aa69ef341705439efe85acf7d89be6038aa27cc1354dca6f1edb000fead377e4dbb91d5f9cf13627749a499932589a339de5f5fe36a5
-EBUILD xfce4-terminal-0.8.9.2.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
+EBUILD xfce4-terminal-0.9.0.ebuild 983 BLAKE2B af82ca76d01cefa58b0bd25056fc697ffe6bb24572722757249ec7585653e73cb8d89b1625148dc9e5a1d3f98277f2e6352738e399f0ffc91aa4d890ae0f17f3 SHA512 bd3594e68e0e875d18c4e7f84b7925ae462e81ff22f0f703aa7ad6b5fe41f24a855e9d21449e62b6eb79218a68643de4a3cab6a4e10c8e0f4b895651d0c43b66
MISC metadata.xml 372 BLAKE2B bb4bcd3652bb3bbaee272af26e6b07b5279167c165574cfcbaa1c23d8b9786cc79972325893fc563aac5ae1eef257ebe4807199497a02c147515af68b80e27a2 SHA512 722c99f01658541a9d1df513ffa218ac36897644e771d8b439bf6b2c38e241304c0a43c94115ed95f367ba6e3a8606bee2c63ef8c1ef9841f08b9f06977751c7
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild
index 3f7498753831..182386ffe3aa 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit eapi7-ver
+inherit xdg-utils
DESCRIPTION="A terminal emulator for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
@@ -11,23 +11,23 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="utempter"
-RDEPEND=">=dev-libs/glib-2.38:2=
- >=x11-libs/gtk+-3.20.8:3=
+RDEPEND=">=dev-libs/glib-2.42:2=
+ >=x11-libs/gtk+-3.22:3=
x11-libs/libX11:=
- >=x11-libs/vte-0.38:2.91=
- >=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
+ >=x11-libs/vte-0.46:2.91=
+ >=xfce-base/libxfce4ui-4.14:=[gtk3(+)]
+ >=xfce-base/xfconf-4.14:=
utempter? ( sys-libs/libutempter:= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-libs/libxml2
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-
src_configure() {
local myconf=(
$(use_with utempter)
@@ -35,3 +35,11 @@ src_configure() {
econf "${myconf[@]}"
}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 04595fccec1e..74f7dadf9234 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -6,4 +6,4 @@ EBUILD xterm-366.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283
EBUILD xterm-367.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283ad197dc9d140940993a952295e462a8d3565f4fd1173e2d1688ed59b1e0272fc1b1b39d498cdbf3d00111 SHA512 8c59b66c2534ea3d224b1cde39bc54bfa11e5b47f2828dee855bd5d38a2603515caa003b9d12bc80bed4c60f4d43160cb12ef5d0c7d5051426584984c4777b2e
EBUILD xterm-368.ebuild 2646 BLAKE2B a02c621fdb8353916253b308b2941dad2574b1dc40edd21aff79ae6e10c62b0d6103d40e260543a2d1d116218894ef39c2c0b8c660b66dfd3a5e9633cd961e29 SHA512 bcb84fc47ded01968d6c3c6a21483006521efcce366a39a984a7f13527affb3ccc870572d702dd263579db84fa2ed80766ad214eeab27e1670bf0fdc98da3255
EBUILD xterm-369.ebuild 2646 BLAKE2B a02c621fdb8353916253b308b2941dad2574b1dc40edd21aff79ae6e10c62b0d6103d40e260543a2d1d116218894ef39c2c0b8c660b66dfd3a5e9633cd961e29 SHA512 bcb84fc47ded01968d6c3c6a21483006521efcce366a39a984a7f13527affb3ccc870572d702dd263579db84fa2ed80766ad214eeab27e1670bf0fdc98da3255
-MISC metadata.xml 562 BLAKE2B df34f1d08eef58a8e88c179d3a602a66774b96749258c96b8a23d1319a93a7deded0bf4829c2b746eb9a6fff6260878c8a45ec9968d5718db9ca24a26db043d0 SHA512 e46d04cfaa299f6fb1b1b8890cf30d3cae42c67c543a9f3c85f37a5728fb54c2669e4a86926988d97cb258d1d697432c618b3840e227e4f97483708b335e6411
+MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index 4f54234194e4..f4e653d10222 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>johu@gentoo.org</email>
- <name>Johannes Huber</name>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
</maintainer>
<use>
<flag name="openpty">Use openpty() in preference to posix_openpt()</flag>