gentoo resync : 14.05.2020

3 files changed, 73 insertions, 0 deletions

diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
new file mode 100644
index 000000000000..c924de3607f5
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
@@ -0,0 +1,16 @@
+Without this patch, terminator's build script runs gtk-update-icon-cache which
+causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
+its own. To avoid that, gtk-update-icon-cache is run later, as part of
+xdg_pkg_postinst in the ebuild.
+
+--- a/setup.py	2009-08-12 22:22:53.000000000 -0400
++++ b/setup.py	2009-08-12 22:22:57.000000000 -0400
+@@ -25,7 +25,7 @@
+ 
+   def __init__ (self, *args):
+     self.without_gettext = False
+-    self.without_icon_cache = False
++    self.without_icon_cache = True
+     Distribution.__init__(self, *args)
+ 
+ 
diff --git a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
new file mode 100644
index 000000000000..ae722cb11685
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
@@ -0,0 +1,25 @@
+commit 9f855d41f3e6d610bd01df9688467fdbb341917c
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Fri May 1 08:36:09 2020 +0100
+
+    Make failed tests fail the test
+
+diff --git a/run_tests b/run_tests
+index 3bf51e4a..cc7fb56a 100755
+--- a/run_tests
++++ b/run_tests
+@@ -4,10 +4,10 @@ for t in tests/test*; do
+     echo $t
+     file_type=$(file -b $t)
+     case ${file_type} in
+-        *[Pp]ython*) python ${t} ;;
+-        *Bourne*) bash ${t} ;;
+-        *bash*)   bash ${t} ;;
+-        *perl*)   perl ${t} ;;
++        *[Pp]ython*) python ${t} || exit 1 ;;
++        *Bourne*) bash ${t} || exit 1 ;;
++        *bash*)   bash ${t} || exit 1 ;;
++        *perl*)   perl ${t} || exit 1 ;;
+         *) echo "Unknown" ;;
+     esac
+     echo
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
new file mode 100644
index 000000000000..ae2fed5d48f0
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
@@ -0,0 +1,32 @@
+commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Fri May 1 20:38:00 2020 +0100
+
+    Install AppStream data as .metainfo.xml
+    
+    Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+
+diff --git a/setup.py b/setup.py
+index 7c54977e..38a819a9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -72,7 +72,7 @@ class BuildData(build):
+           [file_data.write(line.lstrip('_')) for line in file_in]
+ 
+       appdata_in='data/terminator.appdata.xml.in'
+-      appdata_data='data/terminator.appdata.xml'
++      appdata_data='data/terminator.metainfo.xml'
+       rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
+                  "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
+                  appdata_in + " " + appdata_data)
+@@ -205,9 +205,9 @@ setup(name=APP_NAME,
+       license='GNU GPL v2',
+       scripts=['terminator', 'remotinator'],
+       data_files=[
+                   ('bin', ['terminator.wrapper']),
+-                  ('share/appdata', ['data/terminator.appdata.xml']),
+                   ('share/applications', ['data/terminator.desktop']),
++                  ('share/metainfo', ['data/terminator.metainfo.xml']),
+                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
+                   (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
+                   ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),