7 files changed, 142 insertions, 0 deletions

diff --git a/README.md b/README.md
index 072912c..07b6501 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,9 @@ and niceties - https://github.com/blackm0re/i3lock-extended
 when no multiple tabs are spawned. This patch is expected to go upstream in the
 next official release of *sakura*.
 
+* x11-terms/terminator - contains own patch that prevents tab events to be consumed
+when no multiple tabs are spawned.
+
 
 ## Setup
 
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
new file mode 100644
index 0000000..9c2efa6
--- /dev/null
+++ b/x11-terms/terminator/Manifest
@@ -0,0 +1,6 @@
+AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
+AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
+AUX terminator-1.92-single-tab.patch 1024 BLAKE2B 4611e9275573233bb3c9f618f13348fbc36f880e4a9e239a8d1ee20e2795e90bdbb41c61f5126e166f39008d7b9d917708bc66a73c0fe1445145e74da43b967d SHA512 fda7d93d015d9a8a7847f9ebff222c15372437763b823194e5502be0d592d1ecad54f9050464bdfbda786fcbcc0e9e9f1feac5ee3b2097b3823e3096a31d3be4
+DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
+EBUILD terminator-1.92.ebuild 1380 BLAKE2B fa520b244a25e89ba98599257023caa1607444fa543c9c467edfb23af9fbdaa2299ccba28d921042ac827ae11f38e98c5c9f752c72491e65836d15f4078847db SHA512 023c77d76adadcc427cc961596f81d05def1ca3be023ff6d856d359809eab457a4f5c36e27d5171b8c57d6adbc86d33cc253abcdca069c2489ff1e13dad87797
+MISC metadata.xml 834 BLAKE2B 59ff943ca3ecfe92e3029c6573d69fb4e9ed09e0a0bcec160545dabf12baace6cdb7424920fafb6f90e0d7d2c2466978fe60b2aa3058936beca7b3b7a583d7e8 SHA512 1a1e181b6cb668239ff8973545b7a8d13908c892c2106bf702f9e8d4d22530cb812c2af57ba93ef41be2ddc566c9ff48588597210cf90ea001e5c7a10075f341
diff --git a/x11-terms/terminator/files/terminator-1.91-desktop.patch b/x11-terms/terminator/files/terminator-1.91-desktop.patch
new file mode 100644
index 0000000..4cbbfa4
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-desktop.patch
@@ -0,0 +1,12 @@
+--- a/data/terminator.desktop.in
++++ b/data/terminator.desktop.in
+@@ -9,8 +9,8 @@
+ StartupNotify=true
+ X-Ubuntu-Gettext-Domain=terminator
+ X-Ayatana-Desktop-Shortcuts=NewWindow;
+ Keywords=terminal;shell;prompt;command;commandline;
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open a New Window
+ Exec=terminator
+ TargetEnvironment=Unity
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 0000000..c924de3
--- /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-single-tab.patch b/x11-terms/terminator/files/terminator-1.92-single-tab.patch
new file mode 100644
index 0000000..1ad215a
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-single-tab.patch
@@ -0,0 +1,25 @@
+diff -rupN terminator-1.92.old/terminatorlib/terminal.py terminator-1.92/terminatorlib/terminal.py
+--- terminator-1.92.old/terminatorlib/terminal.py       2020-04-18 12:36:56.385817800 +0200
++++ terminator-1.92/terminatorlib/terminal.py   2020-05-04 09:45:38.714358482 +0200
+@@ -887,6 +887,21 @@ class Terminal(Gtk.VBox):
+         # FIXME: Does keybindings really want to live in Terminator()?
+         mapping = self.terminator.keybindings.lookup(event)
+ 
++        # sgs patch
++        if (
++                mapping and (
++                    mapping.startswith('switch_to_tab') or
++                    mapping in ('next_tab', 'prev_tab')
++                )
++        ):
++            window = self.get_toplevel()
++            child = window.get_children()[0]
++            if isinstance(child, Terminal):
++                # not a Notebook instance => a single tab is used
++                # .get_n_pages() can not be used
++                return(False)
++        #
++
+         if mapping == "hide_window":
+             return(False)
+ 
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
new file mode 100644
index 0000000..fff37e0
--- /dev/null
+++ b/x11-terms/terminator/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>sgs@pichove.org</email>
+                <name>Simeon Simeonov</name>
+        </maintainer>
+        <longdescription>
+                Much of the behaviour of Terminator is based on GNOME Terminal, and
+                we are adding more features from that as time goes by, but we also
+                want to extend out in different directions with useful features for
+                sysadmins and other users. If you have any suggestions, please file
+                wishlist bugs! (see below for the address) (patched by sgs)
+        </longdescription>
+        <use>
+                <flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
+        </use>
+        <upstream>
+                <remote-id type="github">gnome-terminator/terminator</remote-id>
+        </upstream>
+</pkgmetadata>
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild
new file mode 100644
index 0000000..a0deaff
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Multiple GNOME terminals in one window (patched by sgs)"
+HOMEPAGE="https://github.com/gnome-terminator/terminator"
+SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="dbus +libnotify test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+        >=dev-libs/glib-2.32:2
+        dev-libs/keybinder:3[introspection]
+        dev-python/configobj[${PYTHON_USEDEP}]
+        dev-python/psutil[${PYTHON_USEDEP}]
+        dev-python/pycairo[${PYTHON_USEDEP}]
+        dev-python/pygobject:3[${PYTHON_USEDEP}]
+        >=x11-libs/gtk+-3.16:3
+        x11-libs/vte:2.91[introspection]
+        dbus? ( sys-apps/dbus )
+        libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+        dev-util/intltool
+        test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+        "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
+        "${FILESDIR}"/terminator-1.91-desktop.patch
+        "${FILESDIR}"/${P}-single-tab.patch
+)
+
+src_prepare() {
+        xdg_environment_reset
+        distutils-r1_src_prepare
+}
+
+python_test() {
+        virtx esetup.py test || die "tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+        xdg_desktop_database_update
+        xdg_icon_cache_update
+}
+
+pkg_postrm() {
+        xdg_desktop_database_update
+        xdg_icon_cache_update
+}