gentoo resync : 18.11.2019

7 files changed, 46 insertions, 177 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 51159feb3a7f..717a0e2a22aa 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f0b56b97424c..395289b2a95a 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,12 +1,8 @@
-AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
-AUX kitty-0.14.2-flags.patch 1658 BLAKE2B debb36362a1130c2ec55d51814d6ca1fb93190e9a7f29a2450440a8c808a5604ed2000c43f317d56098f6af74e1076ae71f34523b8a762c93434d7ddb611599a SHA512 f8e46c2b699ed4a9495f1afcce6a932d89710b01f8ac35aef9cbf035ead3b7e2186ad67af5b09f156b08052bbe9e42fc5ffb87b5af5e9b36ca403bfa6b0d8e78
 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-9999-flags.patch 1907 BLAKE2B 1c859ed7ee8f789b9c00b80b45972d889085640a1c13c45026310fa1ac33727760c47e229f80ce849bfdc9e33dd96bac13cd77d1f6e4097091381ac436c75a40 SHA512 863e0fa216df0424b0b92f7ee0909e7d7914681312fda9bae5343769ee8c660cf71800682f6e9c5ad03ec78b943f049413bc874a0610e315d87ab953e5577c53
 AUX kitty-9999-svg-icon.patch 659 BLAKE2B ad6e085984784344cf4d92b5d66ea63e384290d7de3ac63af29ac6906b535ec8d7cf8549fb8b03f28dac775b5154f6e69185dc2c03b3b4760d348d11112810b4 SHA512 7d0a5c26cb16efe2de79a0055ba8d8be1c348e86712f6bae8280d0582e406c3e2f21e2e0ca40f21a57e8f19e1aed78e87cdc120e10338965d104190922a601f8
-DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
 DIST kitty-0.14.6.tar.xz 2970008 BLAKE2B e4f64051aebcc5d5aa1956351acb5564815e65c7c8435cac3c7960c5096fbeb5f0e98e3bdf92e750e8d70d6b0124b081bbb5d38a589c3dc5cf74642c3eaf83c9 SHA512 889bfce732f2a36d338c9c41b28e0770d98c15530b56a9f037cef610593b50453f1bde60e89560472035fc250dec0431a9776de1449f77e4c6988aca157eea12
-EBUILD kitty-0.14.4.ebuild 2108 BLAKE2B bab3fb480cee99c0a3a53ae697784d1203cbdeb85dce37aac9958eeee3b787eaf6b0bbd0475d2f6e3ae71017d00d600583f2fd063328a9125f08074d1199d819 SHA512 effa3b97cc8f7f4ce312e455d6096fdc0229f7950b96af27426e6c1700e411250c2516478ffc10a35f6375ee9733a9dbd0348ebac5ccbe1291b7e45dfd27ef8e
 EBUILD kitty-0.14.6.ebuild 2108 BLAKE2B bab3fb480cee99c0a3a53ae697784d1203cbdeb85dce37aac9958eeee3b787eaf6b0bbd0475d2f6e3ae71017d00d600583f2fd063328a9125f08074d1199d819 SHA512 effa3b97cc8f7f4ce312e455d6096fdc0229f7950b96af27426e6c1700e411250c2516478ffc10a35f6375ee9733a9dbd0348ebac5ccbe1291b7e45dfd27ef8e
 EBUILD kitty-9999.ebuild 2092 BLAKE2B aaf4bd9d7bd759ae28746a3d4a44e32f0a05b55d9174592ff663e1f45bd6bf62e361506f6e9bda5041c7f513e34a173c2153d2b3cf093164b8a494a644a01a66 SHA512 b8c9b792204a5e9ef8182a9364c965cdf90c6567158d0057eee6097801813fbdedeadc8fb1494f47d7f4a816dff2d880184e3c956028887319a25af5baf5a099
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
deleted file mode 100644
index 97e45c677f8f..000000000000
--- a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use SVG icon instead of PNG.
-
---- kitty-0.11.0/setup.py
-+++ kitty-0.11.0/setup.py
-@@ -605,9 +605,9 @@
-     if not is_macos:  # {{{ linux desktop gunk
-         copy_man_pages(ddir)
-         copy_html_docs(ddir)
--        icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
-+        icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
-         safe_makedirs(icdir)
--        shutil.copy2('logo/kitty.png', icdir)
-+        shutil.copy2('logo/kitty.svg', icdir)
-         deskdir = os.path.join(ddir, 'share', 'applications')
-         safe_makedirs(deskdir)
-         with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
diff --git a/x11-terms/kitty/files/kitty-0.14.2-flags.patch b/x11-terms/kitty/files/kitty-0.14.2-flags.patch
deleted file mode 100644
index d362c4216511..000000000000
--- a/x11-terms/kitty/files/kitty-0.14.2-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.14.2/setup.py
-+++ kitty-0.14.2/setup.py
-@@ -198,7 +198,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', (
-@@ -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')
-@@ -550,14 +550,14 @@
- 
- 
- def build_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     cppflags = []
-     libs = []
-     if args.profile:
-         cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
-         libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-+    #else:
-+    #    cflags.append('-O3')
-     if for_bundle or for_freeze:
-         cppflags.append('-DFOR_BUNDLE')
-         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.14.4.ebuild b/x11-terms/kitty/kitty-0.14.4.ebuild
deleted file mode 100644
index 85c9ba13dfc8..000000000000
--- a/x11-terms/kitty/kitty-0.14.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-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
-	virtual/pkgconfig
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-
-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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index a8e7933e6c99..0591aff2a437 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,5 @@
 DIST terminology-1.5.0.tar.xz 4884284 BLAKE2B fff45958207bd6e06b8685ebe42ca734b183da9042940b773e15308200c27307f417a930a687c187a5f24f1eab9d1b7a518314b3cd919d260bb05369a2f2236c SHA512 ade2363e0a834b25a67157d0cfa946b3b09d8a2941fd7da9dd3792cf8d201f218c7723b691eab325d9bdadeefddfea56c19e562ebc37466cb3a9b3b45c9f708b
+DIST terminology-1.6.0.tar.xz 4893348 BLAKE2B 20c9b8a916a4cd48055839266a157d5d8fca70557f7fb8b61696ceeaf4bc0fd93ea5abc0930d1c552a816e3fa3e455624f62d4adbad7feacc9cd0e874a91feec SHA512 ef95a5d128736a2e6b3b9e48a3f32a8e3a1f19ccabcb9fa429ed777ee201ba16fa431a61edafaebc018567f4a3657d81551407cf0449f58b416aa1e6077afec1
 EBUILD terminology-1.5.0.ebuild 864 BLAKE2B 36c00aa1e5bc52e26f9ab041f9d31df08fd6b76514f6085a26dd58c68ceb67f7244eff0af33dac8d430642f87980ccc675aea7c966e6eb935e4db7feb4184712 SHA512 4d3081f5580b44e9619eac1c9826c1fc9b85a6e2aae7d4de7a19945f1ec8cdb851beca96051958089c907acf4384e4872a32a7e61fe396dd0725b0a19b90ca1e
+EBUILD terminology-1.6.0.ebuild 866 BLAKE2B 45d945cf025162170ed8b024c7d894948c1a8ca1c0c3bf5e87867c23086ce4f88857a750f8304b38e3e4dadb5203af31eec9744cd0b87477dffe7a61a6b24264 SHA512 7222d8bb616e6a8438c31fd0f9f0065133a20b7e3a15b27912fc45b551dd183fbd03c2a0380b46f08497a398fb373d0baa5a0d407997feec29f203d5492dceea
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.6.0.ebuild b/x11-terms/terminology/terminology-1.6.0.ebuild
new file mode 100644
index 000000000000..65b045e742ae
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/about-terminology"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="extras nls"
+
+RDEPEND="
+	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
+	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	dev-libs/efl[eet,fontconfig]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls)
+		$(meson_use extras tests)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}