gentoo resync : 15.12.2019

3 files changed, 61 insertions, 28 deletions

diff --git a/x11-terms/kitty/files/kitty-0.15.0-flags.patch b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
new file mode 100644
index 000000000000..921104e95f3f
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
@@ -0,0 +1,49 @@
+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/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 0593cfd706dc..0b60ae190fcb 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -1,24 +1,26 @@
---- kitty-9999/setup.py	2019-07-16 18:04:24.052780940 -0500
-+++ kitty-9999/setup.py	2019-07-16 18:05:54.564383192 -0500
-@@ -202,7 +202,7 @@
-     df = '-g3'
+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'),
-@@ -213,7 +213,7 @@
+@@ -217,7 +217,7 @@
      cflags = os.environ.get(
          'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -D_POSIX_C_SOURCE=200809L -std=c11'
 -            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
 +            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
          ).format(
+             float_conversion, std,
              optimize,
-             ' '.join(sanitize_args),
-@@ -227,7 +227,7 @@
+@@ -232,7 +232,7 @@
      )
      ldflags = os.environ.get(
          'OVERRIDE_LDFLAGS',
@@ -27,7 +29,7 @@
      )
      ldflags = shlex.split(ldflags)
      ldflags.append('-shared')
-@@ -606,20 +606,17 @@
+@@ -611,7 +611,7 @@
  
  
  def build_launcher(args, launcher_dir='.', bundle_type='source'):
@@ -36,11 +38,7 @@
      cppflags = []
      libs = []
      if args.profile or args.sanitize:
-         if args.sanitize:
--            cflags.append('-g3')
-             cflags.extend(get_sanitize_args(env.cc, env.ccver))
-             libs += ['-lasan'] if env.cc == 'gcc' and not is_macos else []
-         else:
+@@ -623,8 +623,6 @@
              cflags.append('-g')
          if args.profile:
              libs.append('-lprofiler')
diff --git a/x11-terms/kitty/files/kitty-9999-svg-icon.patch b/x11-terms/kitty/files/kitty-9999-svg-icon.patch
deleted file mode 100644
index ff9e00eb67c9..000000000000
--- a/x11-terms/kitty/files/kitty-9999-svg-icon.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- kitty-9999/setup.py.orig	2019-07-16 18:13:07.072868752 -0500
-+++ kitty-9999/setup.py	2019-07-16 18:13:40.082039929 -0500
-@@ -705,9 +705,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: