gentoo resync : 05.02.2020

6 files changed, 8 insertions, 221 deletions

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index d7bde7dc2759..cf1a38a3b244 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,12 +1,8 @@
-AUX kitty-0.14.4-flags.patch 1662 BLAKE2B a936f445ad9d0ab7eb23ef9d50b94d52e49233e4890bbcde1de873c2d094687870b97261f3c0b01e059ce5debf67ae3dd1829835f2c4c06713996547f345dead SHA512 f8c2c2b9888d644e3f43b2893d9719b50fbd8627976ac81dcfd26e4409b2644c544fb610e39a84e8b4b7bf0851224f247716c5358c02e053ec571361b694d00e
 AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
-AUX kitty-0.15.0-flags.patch 1697 BLAKE2B 0a92e8e8c6f9fe8e49f315d0cfb40f383d12bfb94c5d1aae7ccc10d5a74611a18d3fe0ff7be8cfbf07a440973dbc5ec63c50a7c74f744198c1ff5b8ade49421f SHA512 5207adcca12836fe2ec803a5809a02e5ce531e1ba1559d70e11156df367ad038c76180b8cfa6171a0448f98705bdb3ec62fb98138f9b41e802116066474eb6e5
 AUX kitty-0.15.1-flags.patch 1674 BLAKE2B 918844df4b6b0bdc7d5dec1c40c47ce5fc3a2b18485ef0d64002ed720835ea98371f938fe97f0fe339b44b977290c716f9d1008c31257da09966e3fd59d52b30 SHA512 c3de4073b654a0c432f7d601378536d531056c961e9036223c93b9653fa924b4343ad797d451bdf9370dce2f97e6d596a04908caea6156095440d6ef52eb17b8
-DIST kitty-0.14.6.tar.xz 2970008 BLAKE2B e4f64051aebcc5d5aa1956351acb5564815e65c7c8435cac3c7960c5096fbeb5f0e98e3bdf92e750e8d70d6b0124b081bbb5d38a589c3dc5cf74642c3eaf83c9 SHA512 889bfce732f2a36d338c9c41b28e0770d98c15530b56a9f037cef610593b50453f1bde60e89560472035fc250dec0431a9776de1449f77e4c6988aca157eea12
-DIST kitty-0.15.0.tar.xz 2978152 BLAKE2B 49f6e5051392c9ad0a91151ccc9f62dbc8ce0031680c66f4b08291c5b5cf43ccb1f096aecfcc69f7980997397d326d6b164f5f189fb89608ed9c8c22f313ebda SHA512 4e546fb9ad0cf34df8aa5ef3787224e8dd820fadb474faddc5f47b987bbc46fb62350a64bcacbdccd7e7cd287df22045ed742b89f613e402f033dc8bb73d8688
 DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
-EBUILD kitty-0.14.6-r1.ebuild 2104 BLAKE2B d0d8942e23268eb5c03e8ba3cbc1e4c134221675c3f572d6cb54242c47e5332fc41cdab4c40b82e31922b773a9ddcbc09e52b987cb503f2604ef6bd9a1fd0ab4 SHA512 1db004153abcb2c2691a2ee64ad6c200a0541a3ac03d79a9b4f47b91b7d4b6e19e114bb1fa50dc7faa588a30c2e283c9618bd6c4265687e4020392b180c2fa80
-EBUILD kitty-0.15.0.ebuild 1981 BLAKE2B 292538aadcd73130bac9c995c6a4e69ff6603de699016a5c55a2a7531264678b42d61314cf82648952dd0d18047ed084f25060342fb5818bd9400cdbdc744575 SHA512 5779182be177f68d2230e077ab9a6a91aa1a9ff19e67b81af454d4f802bfddaa0f67c57bb6919d2d177c669040005caea303fe3881d1a1824cf1e49a11aa783a
+DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
 EBUILD kitty-0.15.1.ebuild 1954 BLAKE2B d93e44f89f40e43ae162d9e33ac46294033c78f15460f2157ca745d966185d61ac220c7e884cb51c3e94d7280926575628ff41dee617f735573d3d146fb675ab SHA512 32b9d42eb970957cd8e9b7633100b0e19890f420566f4889a3aa8b45273921bcb7fd84dd769fad7caa0ddbe7c67eebe6c9d80a468222eb21e4a6b24fa3bf4cfd
+EBUILD kitty-0.16.0.ebuild 1962 BLAKE2B 2c186851ecb7e65951ed52409e44b88f1a82edf85d3a35413b7d120fdabb7f41ff3501fbe6cee0e499b062a40e4ff0021196f9d1f48ded48cdc27fe27ba69b57 SHA512 68310c47fcf7a07a33335e3311a18272588d81990ab46b47f711c45a8f456aaa9006dcdb34123480d0f113475599cedc90c38ca84130a5ddc57e12a06eebd559
 EBUILD kitty-9999.ebuild 1962 BLAKE2B 2c186851ecb7e65951ed52409e44b88f1a82edf85d3a35413b7d120fdabb7f41ff3501fbe6cee0e499b062a40e4ff0021196f9d1f48ded48cdc27fe27ba69b57 SHA512 68310c47fcf7a07a33335e3311a18272588d81990ab46b47f711c45a8f456aaa9006dcdb34123480d0f113475599cedc90c38ca84130a5ddc57e12a06eebd559
-MISC metadata.xml 565 BLAKE2B 3b1a6c00d6f1f1281b1c861cc9d6b6e0b62a0cd82ae6e81f11917855138a85e6b3687857b7bd0f9c8709baf8414fa9ef3c2a49c79751d4bc98d949c6f39b9169 SHA512 10fd20fe44a6503fc49c2f88ab6affcc2d00376cb4edb3144fe0ab81bbb6e3930fc02f87372ca171de67f7aa86e341cdaf344eb3d872dc450b5df8d087a37b7c
+MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/files/kitty-0.14.4-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
deleted file mode 100644
index 5bf301efd5a8..000000000000
--- a/x11-terms/kitty/files/kitty-0.14.4-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.14.4/setup.py
-+++ kitty-0.14.4/setup.py
-@@ -202,7 +202,7 @@
-     df = '-g3'
-     if ccver >= (5, 0):
-         df += ' -Og'
--    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'),
-@@ -213,7 +213,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(
-             optimize,
-             ' '.join(sanitize_args),
-@@ -227,7 +227,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')
-@@ -608,7 +608,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:
-@@ -620,8 +620,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.15.0-flags.patch b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
deleted file mode 100644
index 921104e95f3f..000000000000
--- a/x11-terms/kitty/files/kitty-0.15.0-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.15.0/setup.py
-+++ kitty-0.15.0/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={}11'
--            ' -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')
-@@ -611,7 +611,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:
-@@ -623,8 +623,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.14.6-r1.ebuild b/x11-terms/kitty/kitty-0.14.6-r1.ebuild
deleted file mode 100644
index 8fa3a58dc70c..000000000000
--- a/x11-terms/kitty/kitty-0.14.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 doc imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-apps/dbus
-	sys-libs/zlib
-	media-libs/libcanberra
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libxcb[xkb]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	media-libs/mesa[X(+)]
-	sys-libs/ncurses
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.4-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
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"/usr || die
-	cp -r linux-package/* "${ED}/usr" || die
-	python_fix_shebang "${ED}"
-
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.15.0.ebuild b/x11-terms/kitty/kitty-0.16.0.ebuild
index 6cf7eb8c9ee3..c62b5d655696 100644
--- a/x11-terms/kitty/kitty-0.15.0.ebuild
+++ b/x11-terms/kitty/kitty-0.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-single-r1 toolchain-funcs xdg
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug imagemagick wayland"
+IUSE="debug wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -38,7 +38,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	sys-apps/dbus
 	sys-libs/zlib
-	imagemagick? ( virtual/imagemagick-tools )
+	virtual/imagemagick-tools
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.17
@@ -55,7 +55,7 @@ BDEPEND="virtual/pkgconfig"
 [[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/kitty-0.15.1-flags.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index 99074a0caa85..2c9e05543121 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
-	<use>
-		<flag name="imagemagick">Support displaying images in the terminal with icat</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
 	</upstream>