gentoo resync : 06.08.2019

5 files changed, 43 insertions, 21 deletions

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 2f2d35a170ef..29502990ed3c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,11 +1,12 @@
 AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
-AUX kitty-0.13.2-flags.patch 1622 BLAKE2B 003a236d3817d744012883d9fb4be5029d5b83351c56e6b257ac5acd9bdd791fc7dcc5ad428be5aa227ba3f36aae40b90e04bdd6efbafc7f424b0163aa8f3abb SHA512 d24adbce0c5deee7418998d43d384fa5fb3ecc24fcf9728337c99b01bedb529fec8fd327c5dd2e71fec4957ad802e738a02cdc061f8b0dd78cbcbeffdd9c126c
 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.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b
 DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4
-EBUILD kitty-0.13.3.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70
+DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
 EBUILD kitty-0.14.2.ebuild 2084 BLAKE2B 7228195ed8acf32d1ae3f85038ca0c8b9f9e12512fd8b9108dd743eb1a33e37f8615d47ef67343022f6c1d7c7a9607ccb59dac6985daf1016c6f1ddf9d59266a SHA512 c49483d89c05403cd461f1be9990a5bd76861b14e846b62bb33039fdf4c7b7b539a298d7133cf32a6be666c751bc0ccbe5c7b7e1382202823bf238ae3576d1a0
-EBUILD kitty-9999.ebuild 2068 BLAKE2B f16b804500a99a6ac7159bf34fb999fecdaafb2111e19da35b10081e0d23021a95999550ad75f4e001e4d04403fa7679c2a95454e8cfe4066fb8d53435aa3ab4 SHA512 4cca2911729b2dac4410e43c5ff57dd54ee6b321db8c9c872801afe3bb5b13403e8f6b33e53861787202a587738067711d708675aa301c67e98ea2708dd72e20
+EBUILD kitty-0.14.4.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.13.2-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
index b79edaf884fa..5bf301efd5a8 100644
--- a/x11-terms/kitty/files/kitty-0.13.2-flags.patch
+++ b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
@@ -1,6 +1,8 @@
---- kitty-0.13.2/setup.py
-+++ kitty-0.13.2/setup.py
-@@ -178,7 +178,7 @@
+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'
@@ -8,17 +10,17 @@
 +    optimize = ''
      sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
      cppflags = os.environ.get(
-         'OVERRIDE_CPPFLAGS', (
-@@ -191,7 +191,7 @@
+         '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 -std=c11'
+             '-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),
-@@ -205,7 +205,7 @@
+@@ -227,7 +227,7 @@
      )
      ldflags = os.environ.get(
          'OVERRIDE_LDFLAGS',
@@ -27,21 +29,21 @@
      )
      ldflags = shlex.split(ldflags)
      ldflags.append('-shared')
-@@ -517,14 +517,14 @@
+@@ -608,7 +608,7 @@
  
  
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
+ def build_launcher(args, launcher_dir='.', bundle_type='source'):
 -    cflags = '-Wall -Werror -fpie'.split()
 +    cflags = '-Wall -fpie'.split()
      cppflags = []
      libs = []
-     if args.profile:
-         cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
-         libs.append('-lprofiler')
+     if args.profile or args.sanitize:
+@@ -620,8 +620,6 @@
+             cflags.append('-g')
+         if args.profile:
+             libs.append('-lprofiler')
 -    else:
 -        cflags.append('-O3')
-+    #else:
-+    #    cflags.append('-O3')
-     if for_bundle or for_freeze:
+     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.14.4-svg-icon.patch b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
new file mode 100644
index 000000000000..13f874dd3c14
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.14.4/setup.py
++++ kitty-0.14.4/setup.py
+@@ -710,9 +710,9 @@
+         run_tool(['make', 'docs'])
+     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/kitty-0.13.3.ebuild b/x11-terms/kitty/kitty-0.14.4.ebuild
index 74d2102fb6d1..85c9ba13dfc8 100644
--- a/x11-terms/kitty/kitty-0.13.3.ebuild
+++ b/x11-terms/kitty/kitty-0.14.4.ebuild
@@ -27,6 +27,7 @@ COMMON_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
@@ -46,14 +47,15 @@ RDEPEND="
 	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.13.2-flags.patch
-	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.14.4-flags.patch
+	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
 src_prepare() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 623cddae6fb0..c51e3ffd52d4 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -27,6 +27,7 @@ COMMON_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