gentoo resync : 03.09.2021

6 files changed, 158 insertions, 1 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3eeec827c745..5d7077d1de7e 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 861286aace1b..42353a4db969 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -4,9 +4,11 @@ DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09
 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
 MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
new file mode 100644
index 000000000000..be10def6c282
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
@@ -0,0 +1,41 @@
+# 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/Manifest b/x11-terms/kitty/Manifest
index 633c8ca5cfc2..f792590d56e4 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -12,9 +12,11 @@ DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09
 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
+EBUILD kitty-0.23.1.ebuild 2340 BLAKE2B d019c7cff4ec44662244feb40d88bae57828e61aac3910c450fc097e67fdaa96be2703b0ea835fd3ee04d08b9597f812277b7aeecd8e4dadb48db0ef3f5a7c04 SHA512 469a377957926542e03e55f03cdd48735754bc9a225dedad9e01749197e5c9d0110ef29ebc8cceed6e023a9a71cee7ba58378fa926025a674dedc9eec5255228
 EBUILD kitty-9999.ebuild 2185 BLAKE2B c710249d453b9a073b6def40869181f0f371d1355d6907ec2aff08d985eb43cf3df84f0f0410c72999d4e1f4ee4de93599e9ab1c63d2f7ecad0a2a1b9b70c089 SHA512 af0c18f20d11087989cbc40b2b10bfd275d1dfb2610e6c54d5a265e9bea03ac33e178bd16c57df9e9df47f9ddaced3e0f8aac79a7c86bd7282f3a2a94f5cbee5
-MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
+MISC metadata.xml 670 BLAKE2B 9fd76342e8ccc43215f2c8788712c65b2c372f3f33baf8b1d7d2435896483032fa221f9acef119bb5b31afe82f8063d7b23d614df884091a2a9fda64d417d505 SHA512 b8656e92158edfb6d02c923d1edc4eb33049882b06fd2224fe35b4631d1d352c5479edef7303228e696af041c8073fcbbbaf96a066ccdef6c852602ae41dd77c
diff --git a/x11-terms/kitty/kitty-0.23.1.ebuild b/x11-terms/kitty/kitty-0.23.1.ebuild
new file mode 100644
index 000000000000..ee7d59c7435c
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.23.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+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-misc/xkeyboard-config
+	x11-terms/kitty-terminfo
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+"
+
+DEPEND="${RDEPEND}
+	media-libs/mesa[X]
+	sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.21.2-flags.patch
+	"${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.20.1-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+		# also disable wayland tests
+		sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+		sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.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/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index c44f75410aaa..3de9db8b97a2 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -11,5 +11,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
+		<bugs-to>https://github.com/kovidgoyal/kitty/issues</bugs-to>
+		<doc>https://sw.kovidgoyal.net/kitty</doc>
+		<changelog>https://sw.kovidgoyal.net/kitty/changelog</changelog>
 	</upstream>
 </pkgmetadata>