summaryrefslogtreecommitdiff
path: root/x11-terms/terminator
diff options
context:
space:
mode:
Diffstat (limited to 'x11-terms/terminator')
-rw-r--r--x11-terms/terminator/Manifest9
-rw-r--r--x11-terms/terminator/files/terminator-1.91-desktop.patch12
-rw-r--r--x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch16
-rw-r--r--x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch25
-rw-r--r--x11-terms/terminator/files/terminator-1.92-metainfo.patch32
-rw-r--r--x11-terms/terminator/files/terminator-1.92-single-tab.patch25
-rw-r--r--x11-terms/terminator/metadata.xml21
-rw-r--r--x11-terms/terminator/terminator-1.92-r1.ebuild61
-rw-r--r--x11-terms/terminator/terminator-1.92-r2.ebuild61
9 files changed, 0 insertions, 262 deletions
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
deleted file mode 100644
index a6e07c6..0000000
--- a/x11-terms/terminator/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
1AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
2AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
3AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40
4AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d
5AUX terminator-1.92-single-tab.patch 1024 BLAKE2B 4611e9275573233bb3c9f618f13348fbc36f880e4a9e239a8d1ee20e2795e90bdbb41c61f5126e166f39008d7b9d917708bc66a73c0fe1445145e74da43b967d SHA512 fda7d93d015d9a8a7847f9ebff222c15372437763b823194e5502be0d592d1ecad54f9050464bdfbda786fcbcc0e9e9f1feac5ee3b2097b3823e3096a31d3be4
6DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
7EBUILD terminator-1.92-r1.ebuild 1481 BLAKE2B 6c6f69263e2262a03bf604228b801c4f30d95b19a749fb353e8b74948245b1ea4fe97492958bf54fe8ae424b79ae8f7a1516e94408908e7c67684163812da609 SHA512 da1cddac602b19c354a58b1394f2d279490e9428b2911fc827dac315de5c645a1cc6109d083f9ee2f0e730e3e8f5d8e7aae5fc58d8abc6c3d42ecd38c0bd97a2
8EBUILD terminator-1.92-r2.ebuild 1476 BLAKE2B 652dd27a1e6cd94e0a2dcb0f30177fc620295df942733699ee00530f29dfe9580d56408daf36f41bbd5961bcbf566e479957691b0e8d3929e30d14881a98abcb SHA512 520cedfc8e0c93785fe1aa8b338c5fa8a8fcda5f0040b4a6c7a5e83232d723f91ba11dee006cb0a25505ca89bb8972f2e4d4b439d6dac0ad0872f53aa9ff9243
9MISC 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
deleted file mode 100644
index 4cbbfa4..0000000
--- a/x11-terms/terminator/files/terminator-1.91-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- a/data/terminator.desktop.in
2+++ b/data/terminator.desktop.in
3@@ -9,8 +9,8 @@
4 StartupNotify=true
5 X-Ubuntu-Gettext-Domain=terminator
6 X-Ayatana-Desktop-Shortcuts=NewWindow;
7 Keywords=terminal;shell;prompt;command;commandline;
8-[NewWindow Shortcut Group]
9+[X-NewWindow Shortcut Group]
10 Name=Open a New Window
11 Exec=terminator
12 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
deleted file mode 100644
index c924de3..0000000
--- a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Without this patch, terminator's build script runs gtk-update-icon-cache which
2causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
3its own. To avoid that, gtk-update-icon-cache is run later, as part of
4xdg_pkg_postinst in the ebuild.
5
6--- a/setup.py 2009-08-12 22:22:53.000000000 -0400
7+++ b/setup.py 2009-08-12 22:22:57.000000000 -0400
8@@ -25,7 +25,7 @@
9
10 def __init__ (self, *args):
11 self.without_gettext = False
12- self.without_icon_cache = False
13+ self.without_icon_cache = True
14 Distribution.__init__(self, *args)
15
16
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
deleted file mode 100644
index ae722cb..0000000
--- a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1commit 9f855d41f3e6d610bd01df9688467fdbb341917c
2Author: Alexey Sokolov <sokolov@google.com>
3Date: Fri May 1 08:36:09 2020 +0100
4
5 Make failed tests fail the test
6
7diff --git a/run_tests b/run_tests
8index 3bf51e4a..cc7fb56a 100755
9--- a/run_tests
10+++ b/run_tests
11@@ -4,10 +4,10 @@ for t in tests/test*; do
12 echo $t
13 file_type=$(file -b $t)
14 case ${file_type} in
15- *[Pp]ython*) python ${t} ;;
16- *Bourne*) bash ${t} ;;
17- *bash*) bash ${t} ;;
18- *perl*) perl ${t} ;;
19+ *[Pp]ython*) python ${t} || exit 1 ;;
20+ *Bourne*) bash ${t} || exit 1 ;;
21+ *bash*) bash ${t} || exit 1 ;;
22+ *perl*) perl ${t} || exit 1 ;;
23 *) echo "Unknown" ;;
24 esac
25 echo
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
deleted file mode 100644
index ae2fed5..0000000
--- a/x11-terms/terminator/files/terminator-1.92-metainfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
2Author: Alexey Sokolov <sokolov@google.com>
3Date: Fri May 1 20:38:00 2020 +0100
4
5 Install AppStream data as .metainfo.xml
6
7 Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
8
9diff --git a/setup.py b/setup.py
10index 7c54977e..38a819a9 100755
11--- a/setup.py
12+++ b/setup.py
13@@ -72,7 +72,7 @@ class BuildData(build):
14 [file_data.write(line.lstrip('_')) for line in file_in]
15
16 appdata_in='data/terminator.appdata.xml.in'
17- appdata_data='data/terminator.appdata.xml'
18+ appdata_data='data/terminator.metainfo.xml'
19 rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
20 "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
21 appdata_in + " " + appdata_data)
22@@ -205,9 +205,9 @@ setup(name=APP_NAME,
23 license='GNU GPL v2',
24 scripts=['terminator', 'remotinator'],
25 data_files=[
26 ('bin', ['terminator.wrapper']),
27- ('share/appdata', ['data/terminator.appdata.xml']),
28 ('share/applications', ['data/terminator.desktop']),
29+ ('share/metainfo', ['data/terminator.metainfo.xml']),
30 (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
31 (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
32 ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
diff --git a/x11-terms/terminator/files/terminator-1.92-single-tab.patch b/x11-terms/terminator/files/terminator-1.92-single-tab.patch
deleted file mode 100644
index 1ad215a..0000000
--- a/x11-terms/terminator/files/terminator-1.92-single-tab.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1diff -rupN terminator-1.92.old/terminatorlib/terminal.py terminator-1.92/terminatorlib/terminal.py
2--- terminator-1.92.old/terminatorlib/terminal.py 2020-04-18 12:36:56.385817800 +0200
3+++ terminator-1.92/terminatorlib/terminal.py 2020-05-04 09:45:38.714358482 +0200
4@@ -887,6 +887,21 @@ class Terminal(Gtk.VBox):
5 # FIXME: Does keybindings really want to live in Terminator()?
6 mapping = self.terminator.keybindings.lookup(event)
7
8+ # sgs patch
9+ if (
10+ mapping and (
11+ mapping.startswith('switch_to_tab') or
12+ mapping in ('next_tab', 'prev_tab')
13+ )
14+ ):
15+ window = self.get_toplevel()
16+ child = window.get_children()[0]
17+ if isinstance(child, Terminal):
18+ # not a Notebook instance => a single tab is used
19+ # .get_n_pages() can not be used
20+ return(False)
21+ #
22+
23 if mapping == "hide_window":
24 return(False)
25
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
deleted file mode 100644
index fff37e0..0000000
--- a/x11-terms/terminator/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3<pkgmetadata>
4 <maintainer type="person">
5 <email>sgs@pichove.org</email>
6 <name>Simeon Simeonov</name>
7 </maintainer>
8 <longdescription>
9 Much of the behaviour of Terminator is based on GNOME Terminal, and
10 we are adding more features from that as time goes by, but we also
11 want to extend out in different directions with useful features for
12 sysadmins and other users. If you have any suggestions, please file
13 wishlist bugs! (see below for the address) (patched by sgs)
14 </longdescription>
15 <use>
16 <flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
17 </use>
18 <upstream>
19 <remote-id type="github">gnome-terminator/terminator</remote-id>
20 </upstream>
21</pkgmetadata>
diff --git a/x11-terms/terminator/terminator-1.92-r1.ebuild b/x11-terms/terminator/terminator-1.92-r1.ebuild
deleted file mode 100644
index f9e10a2..0000000
--- a/x11-terms/terminator/terminator-1.92-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
1# Copyright 1999-2020 Gentoo Authors
2# Distributed under the terms of the GNU General Public License v2
3
4EAPI=7
5
6PYTHON_COMPAT=( python3_{6,7,8} )
7DISTUTILS_USE_SETUPTOOLS="no"
8inherit distutils-r1 virtualx xdg-utils
9
10DESCRIPTION="Multiple GNOME terminals in one window (patched by sgs)"
11HOMEPAGE="https://github.com/gnome-terminator/terminator"
12SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
13
14LICENSE="GPL-2"
15SLOT="0"
16KEYWORDS="amd64 ~ppc x86"
17IUSE="dbus +libnotify"
18
19RDEPEND="
20 >=dev-libs/glib-2.32:2
21 dev-libs/keybinder:3[introspection]
22 dev-python/configobj[${PYTHON_USEDEP}]
23 dev-python/psutil[${PYTHON_USEDEP}]
24 dev-python/pycairo[${PYTHON_USEDEP}]
25 dev-python/pygobject:3[${PYTHON_USEDEP}]
26 >=x11-libs/gtk+-3.16:3
27 x11-libs/vte:2.91[introspection]
28 dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
29 libnotify? ( x11-libs/libnotify[introspection] )
30"
31BDEPEND="
32 dev-util/intltool
33"
34distutils_enable_tests setup.py
35
36PATCHES=(
37 "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
38 "${FILESDIR}"/terminator-1.91-desktop.patch
39 "${FILESDIR}"/terminator-1.92-make-tests-fail.patch
40 "${FILESDIR}"/terminator-1.92-metainfo.patch
41 "${FILESDIR}"/${P}-single-tab.patch
42)
43
44src_prepare() {
45 xdg_environment_reset
46 distutils-r1_src_prepare
47}
48
49src_test() {
50 virtx distutils-r1_src_test
51}
52
53pkg_postinst() {
54 xdg_desktop_database_update
55 xdg_icon_cache_update
56}
57
58pkg_postrm() {
59 xdg_desktop_database_update
60 xdg_icon_cache_update
61}
diff --git a/x11-terms/terminator/terminator-1.92-r2.ebuild b/x11-terms/terminator/terminator-1.92-r2.ebuild
deleted file mode 100644
index f1c426e..0000000
--- a/x11-terms/terminator/terminator-1.92-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
1# Copyright 1999-2020 Gentoo Authors
2# Distributed under the terms of the GNU General Public License v2
3
4EAPI=7
5
6PYTHON_COMPAT=( python3_{6,7,8} )
7DISTUTILS_USE_SETUPTOOLS="no"
8inherit distutils-r1 virtualx xdg-utils
9
10DESCRIPTION="Multiple GNOME terminals in one window (patched by sgs)"
11HOMEPAGE="https://github.com/gnome-terminator/terminator"
12SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
13
14LICENSE="GPL-2"
15SLOT="0"
16KEYWORDS="amd64 ~ppc x86"
17IUSE="dbus +libnotify X"
18
19RDEPEND="
20 dev-libs/glib:2
21 dev-python/configobj[${PYTHON_USEDEP}]
22 dev-python/psutil[${PYTHON_USEDEP}]
23 dev-python/pycairo[${PYTHON_USEDEP}]
24 dev-python/pygobject:3[${PYTHON_USEDEP}]
25 x11-libs/gtk+:3
26 x11-libs/vte:2.91[introspection]
27 dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
28 libnotify? ( x11-libs/libnotify[introspection] )
29 X? ( dev-libs/keybinder:3[introspection] )
30"
31BDEPEND="
32 dev-util/intltool
33"
34distutils_enable_tests setup.py
35
36PATCHES=(
37 "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
38 "${FILESDIR}"/terminator-1.91-desktop.patch
39 "${FILESDIR}"/terminator-1.92-make-tests-fail.patch
40 "${FILESDIR}"/terminator-1.92-metainfo.patch
41 "${FILESDIR}"/${P}-single-tab.patch
42)
43
44src_prepare() {
45 xdg_environment_reset
46 distutils-r1_src_prepare
47}
48
49src_test() {
50 virtx distutils-r1_src_test
51}
52
53pkg_postinst() {
54 xdg_desktop_database_update
55 xdg_icon_cache_update
56}
57
58pkg_postrm() {
59 xdg_desktop_database_update
60 xdg_icon_cache_update
61}