x11-terms/terminator: improvements

* install metainfo to correct (modern) path
* declare not using setuputils

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov <sokolov@google.com>
Closes: https://github.com/gentoo/gentoo/pull/15589
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

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 (file)
index 0000000..ae2fed5
--- /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']),

diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild
index e0725520a7cd2036b737c06353d82e380803fa2e..5891577d909ce37640d7d4aa848c7ef25818dda4 100644 (file)
--- a/x11-terms/terminator/terminator-1.92.ebuild
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="no"
 inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="Multiple GNOME terminals in one window"
@@ -36,6 +37,7 @@ PATCHES=(
        "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
        "${FILESDIR}"/terminator-1.91-desktop.patch
        "${FILESDIR}"/terminator-1.92-make-tests-fail.patch
+       "${FILESDIR}"/terminator-1.92-metainfo.patch
 )
 
 src_prepare() {