gentoo resync : 29.01.2021

7 files changed, 155 insertions, 3 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 728ac6c4a05d..40c3561a1905 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 4852e4fbebc7..2ca095e606fb 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,7 +1,9 @@
 AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
 DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
 DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
+DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 EBUILD kitty-terminfo-0.19.1.ebuild 997 BLAKE2B 440c82e3e8440034092c8c46cfaff4e8df93bc6ce6b8d8d9c50ba5cd65f64b31a56ee64731d0941267d448de28887d67f82b561b1f97cd914ec29c8e6c9912ea SHA512 e2bcda3db4cc4ad845e954f7636aad48746dae676b130f8dc98a1b14058da4a3f1553ccc4b42d8118d85d7a31cbf3baff9cb8d0d93a604cc09b7687c0d74ad51
 EBUILD kitty-terminfo-0.19.2.ebuild 997 BLAKE2B 440c82e3e8440034092c8c46cfaff4e8df93bc6ce6b8d8d9c50ba5cd65f64b31a56ee64731d0941267d448de28887d67f82b561b1f97cd914ec29c8e6c9912ea SHA512 e2bcda3db4cc4ad845e954f7636aad48746dae676b130f8dc98a1b14058da4a3f1553ccc4b42d8118d85d7a31cbf3baff9cb8d0d93a604cc09b7687c0d74ad51
+EBUILD kitty-terminfo-0.19.3.ebuild 997 BLAKE2B 440c82e3e8440034092c8c46cfaff4e8df93bc6ce6b8d8d9c50ba5cd65f64b31a56ee64731d0941267d448de28887d67f82b561b1f97cd914ec29c8e6c9912ea SHA512 e2bcda3db4cc4ad845e954f7636aad48746dae676b130f8dc98a1b14058da4a3f1553ccc4b42d8118d85d7a31cbf3baff9cb8d0d93a604cc09b7687c0d74ad51
 EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 4e231dbe5f00af10953cfd2cacf3da7fd4ec75232d53d80cea593ed20f32ecb134956cf58ff5ec732747ea0d99e3241e5ec3d8e60b4e11239e36fe26a9c985fe SHA512 ca96014e72abfb788d830b00b3f33c1ed2091ce868bec3c8deb4897886783d12f3b1facbad78e23f148ef739e2417718f7b302cffea6f41a91fc6f955bfcab44
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild
new file mode 100644
index 000000000000..cc2defc98684
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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/Manifest b/x11-terms/kitty/Manifest
index d1a421926289..3c91f7cf9394 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,7 +4,9 @@ AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead
 AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893
 DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
 DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
+DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 EBUILD kitty-0.19.1.ebuild 2248 BLAKE2B 62d1949c25338aec226ce319260a0800ed8d0751dc25fea7909175baa68c37836981bbd13605393797a719af1ff644718201506adda7a13c7636ac6082b269b1 SHA512 0085f0648574e228c046d3b47b7d5eb7bb26a8d7dc63f23b519dcb0d21f8509867a464c4b3ec47fb95b283a3dd35994f56eeb3f262b4bbb041ea7826fe004912
 EBUILD kitty-0.19.2.ebuild 2265 BLAKE2B bb32c379843130e512fa00bcb7d4860d196d03a54b1893f767afd925f23872627ab4ea17e8428de0af02c3d7cc0a7086058700d9a43efe464320c62f69ea4232 SHA512 00b2019e66556096b05188b4e396205629e2625ef04a35a79402ff765e7dde552430bde8e757197aefedb31993e206778bbba7afc0723cd7e15c66d412ae9d1f
+EBUILD kitty-0.19.3.ebuild 2265 BLAKE2B bb32c379843130e512fa00bcb7d4860d196d03a54b1893f767afd925f23872627ab4ea17e8428de0af02c3d7cc0a7086058700d9a43efe464320c62f69ea4232 SHA512 00b2019e66556096b05188b4e396205629e2625ef04a35a79402ff765e7dde552430bde8e757197aefedb31993e206778bbba7afc0723cd7e15c66d412ae9d1f
 EBUILD kitty-9999.ebuild 2174 BLAKE2B b31720b068ae1c7ec0e98bfb898ce0c16c7933f1a014b732a7bb68123d09f8d209987b70e5ef6a389294567da9cb399d691db0f897618dc20e7623e634bc8bf1 SHA512 ebe9c51891a30808a6276b746037c153f753b991e6d8333d5249ff2d5563414326bd6785e6ac850c0a45d7f9b9cc71b30ca6c17cdd337e13bf574baaed58efca
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/kitty-0.19.3.ebuild b/x11-terms/kitty/kitty-0.19.3.ebuild
new file mode 100644
index 000000000000..ceb22a4934d6
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.19.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,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/tilda/Manifest b/x11-terms/tilda/Manifest
index 11dfa39cccb3..bfb7a2552a79 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -3,5 +3,5 @@ DIST tilda-1.5.0.tar.gz 484754 BLAKE2B 8f04a5046b642e0cd67d375817d046920bbefd9b4
 DIST tilda-1.5.2.tar.gz 485261 BLAKE2B 2ce0059ad695ac3e920cf8e40841b850967ff1e05b88a1c527b7154112c88a3435b66d0f31b882b6fdaf0dee038b7a7e6ab0401184ab701bed8d23d44a2856d8 SHA512 5f950696626005d6f8711fe1403313b36f065796ac07946e9782997aaf67a4bfdb3bfa5e37889bff95d77655d3546100a48327bfa175aa24c39a28685ee0306a
 EBUILD tilda-1.4.1.ebuild 695 BLAKE2B 33d4ffd0915fcbc42591161eba09ec2a36ad63c45ca31f85b9d471afb9ad5cad1fbe7277b1714153d12c43b1dfcee0cea2764dc08c401727b2ccbf97dfa241a5 SHA512 440c50ad4f9c5e738d948951848f25bfbd9a167374bbbb1cc264594d09911759fa5c5df9d35013db1a4f6411c2ed218252fce532563df42a9a10f51cba2edda6
 EBUILD tilda-1.5.0.ebuild 698 BLAKE2B 339df837f44a5c428b6b13639f5a55c5d34734daf59accff528f769e73187955a2a098ba1069eacdc3d8b3330130be71538e5c810aa11a09b395edb5b01a8308 SHA512 e577adb64da6f0be2635d0c1761d3d63099aaae0721cd62f05e1117224f9165af851e88987682ca1345c1d21f13d8e3e14b15059c2c98dac25b747164659a181
-EBUILD tilda-1.5.2.ebuild 712 BLAKE2B 5123c28038a63c3f8914679f58c51ef84519c1e4ad52bf47ced0d52fe7a7360c07a82b8f3d3e527b627ca83f9a3949ab5a01c9f08061861b8d6b4de783aab134 SHA512 7f62565b0755a6a23c00736c07d15b1e4cca91a27e8f8bac442c7a87aef37b37457a5f98fd6e0034d79e4d20be29b45cace6cb36aeb307521065237b108d084a
+EBUILD tilda-1.5.2.ebuild 710 BLAKE2B ac41566cb55b912690cafbbb20aac065702b8a72371860162fae3fc46c8cc4bfbe529b7e1dc9c13cf32d0d93ecca2b70fab6a350199d453fa453fd522f0c6c8b SHA512 fe96c12b2d2b6cca7523b1e9e9ac73133277978ac2e3cab609a82ad72d6a286e7f714822b3245698cdd79a1937dd1d503a38e3a366b4982de197caf1c4f8104a
 MISC metadata.xml 241 BLAKE2B 485e7c59f6c5a5bfbd9661213e8c1c9d6ee0c2ecea50167c176104e04a9cdcbad10b4eae709b67a9be04fde6ebda3403a984be210bfe0263e3a3dcfa9b93f6a8 SHA512 970a53d9a564b5820f8b144b0b1ccef76db2427fbd2b728ec586b7df5f6167d03e5a215048eb8e1e29eb5884a81e31e806630063f6c8d8654e8c72c0082b0d4e
diff --git a/x11-terms/tilda/tilda-1.5.2.ebuild b/x11-terms/tilda/tilda-1.5.2.ebuild
index 247f2520dd04..dffad7e00208 100644
--- a/x11-terms/tilda/tilda-1.5.2.ebuild
+++ b/x11-terms/tilda/tilda-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2