gentoo resync : 14.05.2020

6 files changed, 4 insertions, 362 deletions

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 0944025b7700..0158890404b0 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,14 +1,9 @@
 AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
-AUX kitty-0.15.1-flags.patch 1674 BLAKE2B 918844df4b6b0bdc7d5dec1c40c47ce5fc3a2b18485ef0d64002ed720835ea98371f938fe97f0fe339b44b977290c716f9d1008c31257da09966e3fd59d52b30 SHA512 c3de4073b654a0c432f7d601378536d531056c961e9036223c93b9653fa924b4343ad797d451bdf9370dce2f97e6d596a04908caea6156095440d6ef52eb17b8
 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
-DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
-DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
-EBUILD kitty-0.15.1.ebuild 1954 BLAKE2B d93e44f89f40e43ae162d9e33ac46294033c78f15460f2157ca745d966185d61ac220c7e884cb51c3e94d7280926575628ff41dee617f735573d3d146fb675ab SHA512 32b9d42eb970957cd8e9b7633100b0e19890f420566f4889a3aa8b45273921bcb7fd84dd769fad7caa0ddbe7c67eebe6c9d80a468222eb21e4a6b24fa3bf4cfd
-EBUILD kitty-0.16.0-r1.ebuild 2016 BLAKE2B 23fb1fcc5173f1c6554a706e1f53a94ad14b54a8613f57e4ee14cc7deb4292242e7529c210ffbcbb05568a7d9903863accb777a4ab8e2ddbca2f3e57eb76ee1c SHA512 3710dc2dbd8738218559b0789ca93ee947bda1e8edfb7c4be64b5d8d695ea43ad73db2ded77598b0e05760b1cfe0071d4005f4d2c9cdd54fe0f6be69bfe1efa4
-EBUILD kitty-0.16.0-r2.ebuild 2151 BLAKE2B fbff92e3ecefbcd90fd36f7001c1a213e8520bdad9e839b027ceb0ba01ea6201bcc8383ceeb458040ad34818d17bcf12fd1a051f88e16eaddd47493f0f095089 SHA512 2396f452018c08f9b9d3863e28397f506e6c66273fba43369611dbfa626c3f28032267511b52244faceaa43dfc9ce10d2100b25d803ebbc54195acbb4e86ffb9
-EBUILD kitty-0.16.0-r3.ebuild 2092 BLAKE2B 1488a8b299a4e649f24cf9be580a1d2caca78ea5bcdd4a0f6299554587a91268b784ea1dac2cae9c9a2668a3156803df8702664e3b9df4fa8a02ebe31974b557 SHA512 68f62412dd54eb10ec6141771242769160cbb4e14caea52e46865d3d13e53a3cf5346e4eebc91369ac416928b5db3d99ae6d9002fa278f723ca802cc87854fd1
+DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
 EBUILD kitty-0.17.2-r1.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
+EBUILD kitty-0.17.3.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
 EBUILD kitty-9999.ebuild 2140 BLAKE2B fb60b6cbbde14212cc2d437a5dd946ce2e0d5178ec86b4e140b8092b8a31d29d7cd68669984a475fd51b2b54ea8b5fb9d9399cb07d99c6897a95f81fddc1cade SHA512 2cc98526c03091abe79a2916ed9b9937f17a06e1347be89d8e496a46fdd5b630b4c5ab84749493ea8565c38ea9738e10149e25b3f3fd5d4fd52d2d606869bcd2
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/files/kitty-0.15.1-flags.patch b/x11-terms/kitty/files/kitty-0.15.1-flags.patch
deleted file mode 100644
index cf09a4a5bab8..000000000000
--- a/x11-terms/kitty/files/kitty-0.15.1-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- a/setup.py
-+++ b/setup.py
-@@ -204,7 +204,7 @@
-     if ccver >= (5, 0):
-         df += ' -Og'
-         float_conversion = '-Wfloat-conversion'
--    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/kitty-0.15.1.ebuild b/x11-terms/kitty/kitty-0.15.1.ebuild
deleted file mode 100644
index b921dc1b6a73..000000000000
--- a/x11-terms/kitty/kitty-0.15.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-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/libcanberra
-	media-libs/libpng:0=
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/imagemagick-tools
-	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}"/${P}-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.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) \
-		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
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.16.0-r1.ebuild b/x11-terms/kitty/kitty-0.16.0-r1.ebuild
deleted file mode 100644
index 1dde4e4a9967..000000000000
--- a/x11-terms/kitty/kitty-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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 eutils 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/libcanberra
-	media-libs/libpng:0=
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
-	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}"/kitty-0.15.1-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.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) \
-		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/kitty-0.16.0-r2.ebuild b/x11-terms/kitty/kitty-0.16.0-r2.ebuild
deleted file mode 100644
index fac39de6d70e..000000000000
--- a/x11-terms/kitty/kitty-0.16.0-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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 eutils 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/libcanberra
-	media-libs/libpng:0=
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
-	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.15.1-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.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) \
-		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
-	optfeature "Terminfo file for the kitty terminal emulator" x11-terms/kitty-terminfo
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.16.0-r3.ebuild b/x11-terms/kitty/kitty-0.17.3.ebuild
index 39c54b5dc7dd..24b10118172e 100644
--- a/x11-terms/kitty/kitty-0.16.0-r3.ebuild
+++ b/x11-terms/kitty/kitty-0.17.3.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.17
 	)
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_MULTI_USEDEP}]' python3_6)
 "
 
 DEPEND="${RDEPEND}
@@ -55,7 +56,7 @@ BDEPEND="virtual/pkgconfig"
 [[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.1-flags.patch
+	"${FILESDIR}"/${PN}-0.17.2-flags.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
 )