1 |
commit: 53f47bd928f3b470b69a3bfbf44d318dec4e1a6a |
2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
3 |
AuthorDate: Tue Mar 3 01:08:52 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 23:18:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f47bd9 |
7 |
|
8 |
x11-terms/terminator: bump version, support py3 |
9 |
|
10 |
Some notes: |
11 |
|
12 |
* I replaced gnome2 with xdg because gnome2 doesn't work with EAPI 7. I |
13 |
don't know whether the rest of things gnome2 eclass did is important. |
14 |
* I put myself to maintainer because Andreas Sturmlechner told me to. |
15 |
|
16 |
It seems to work, and the test passes. |
17 |
|
18 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
19 |
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com> |
20 |
Closes: https://bugs.gentoo.org/716446 |
21 |
Closes: https://github.com/gentoo/gentoo/pull/14826 |
22 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
23 |
|
24 |
x11-terms/terminator/Manifest | 1 + |
25 |
.../files/terminator-1.91-without-icon-cache.patch | 16 ++++++ |
26 |
x11-terms/terminator/metadata.xml | 10 ++-- |
27 |
x11-terms/terminator/terminator-1.92.ebuild | 58 ++++++++++++++++++++++ |
28 |
4 files changed, 82 insertions(+), 3 deletions(-) |
29 |
|
30 |
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest |
31 |
index 28305643e3a..5de1326fab2 100644 |
32 |
--- a/x11-terms/terminator/Manifest |
33 |
+++ b/x11-terms/terminator/Manifest |
34 |
@@ -1 +1,2 @@ |
35 |
DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d |
36 |
+DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1 |
37 |
|
38 |
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 |
39 |
new file mode 100644 |
40 |
index 00000000000..c924de3607f |
41 |
--- /dev/null |
42 |
+++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch |
43 |
@@ -0,0 +1,16 @@ |
44 |
+Without this patch, terminator's build script runs gtk-update-icon-cache which |
45 |
+causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as |
46 |
+its own. To avoid that, gtk-update-icon-cache is run later, as part of |
47 |
+xdg_pkg_postinst in the ebuild. |
48 |
+ |
49 |
+--- a/setup.py 2009-08-12 22:22:53.000000000 -0400 |
50 |
++++ b/setup.py 2009-08-12 22:22:57.000000000 -0400 |
51 |
+@@ -25,7 +25,7 @@ |
52 |
+ |
53 |
+ def __init__ (self, *args): |
54 |
+ self.without_gettext = False |
55 |
+- self.without_icon_cache = False |
56 |
++ self.without_icon_cache = True |
57 |
+ Distribution.__init__(self, *args) |
58 |
+ |
59 |
+ |
60 |
|
61 |
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml |
62 |
index 44b22d322ad..d11068fa01f 100644 |
63 |
--- a/x11-terms/terminator/metadata.xml |
64 |
+++ b/x11-terms/terminator/metadata.xml |
65 |
@@ -2,8 +2,12 @@ |
66 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
67 |
<pkgmetadata> |
68 |
<maintainer type="person"> |
69 |
- <email>chutzpah@g.o</email> |
70 |
- <name>Patrick McLean</name> |
71 |
+ <email>alexey+gentoo@××××××××.org</email> |
72 |
+ <name>Alexey Sokolov</name> |
73 |
+ </maintainer> |
74 |
+ <maintainer type="project"> |
75 |
+ <email>proxy-maint@g.o</email> |
76 |
+ <name>Proxy Maintainers</name> |
77 |
</maintainer> |
78 |
<longdescription> |
79 |
Much of the behaviour of Terminator is based on GNOME Terminal, and |
80 |
@@ -16,6 +20,6 @@ |
81 |
<flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag> |
82 |
</use> |
83 |
<upstream> |
84 |
- <remote-id type="launchpad">terminator</remote-id> |
85 |
+ <remote-id type="github">gnome-terminator/terminator</remote-id> |
86 |
</upstream> |
87 |
</pkgmetadata> |
88 |
|
89 |
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild |
90 |
new file mode 100644 |
91 |
index 00000000000..64edc13227e |
92 |
--- /dev/null |
93 |
+++ b/x11-terms/terminator/terminator-1.92.ebuild |
94 |
@@ -0,0 +1,58 @@ |
95 |
+# Copyright 1999-2020 Gentoo Authors |
96 |
+# Distributed under the terms of the GNU General Public License v2 |
97 |
+ |
98 |
+EAPI=7 |
99 |
+ |
100 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
101 |
+inherit distutils-r1 virtualx xdg-utils |
102 |
+ |
103 |
+DESCRIPTION="Multiple GNOME terminals in one window" |
104 |
+HOMEPAGE="https://github.com/gnome-terminator/terminator" |
105 |
+SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz" |
106 |
+ |
107 |
+LICENSE="GPL-2" |
108 |
+SLOT="0" |
109 |
+KEYWORDS="~amd64 ~ppc ~x86" |
110 |
+IUSE="dbus +libnotify test" |
111 |
+RESTRICT="!test? ( test )" |
112 |
+ |
113 |
+RDEPEND=" |
114 |
+ >=dev-libs/glib-2.32:2 |
115 |
+ dev-libs/keybinder:3[introspection] |
116 |
+ dev-python/configobj[${PYTHON_USEDEP}] |
117 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
118 |
+ dev-python/pycairo[${PYTHON_USEDEP}] |
119 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
120 |
+ >=x11-libs/gtk+-3.16:3 |
121 |
+ x11-libs/vte:2.91[introspection] |
122 |
+ dbus? ( sys-apps/dbus ) |
123 |
+ libnotify? ( x11-libs/libnotify[introspection] ) |
124 |
+" |
125 |
+BDEPEND=" |
126 |
+ dev-util/intltool |
127 |
+ test? ( ${RDEPEND} ) |
128 |
+" |
129 |
+ |
130 |
+PATCHES=( |
131 |
+ "${FILESDIR}"/terminator-1.91-without-icon-cache.patch |
132 |
+ "${FILESDIR}"/terminator-1.91-desktop.patch |
133 |
+) |
134 |
+ |
135 |
+src_prepare() { |
136 |
+ xdg_environment_reset |
137 |
+ distutils-r1_src_prepare |
138 |
+} |
139 |
+ |
140 |
+python_test() { |
141 |
+ virtx esetup.py test || die "tests fail with ${EPYTHON}" |
142 |
+} |
143 |
+ |
144 |
+pkg_postinst() { |
145 |
+ xdg_desktop_database_update |
146 |
+ xdg_icon_cache_update |
147 |
+} |
148 |
+ |
149 |
+pkg_postrm() { |
150 |
+ xdg_desktop_database_update |
151 |
+ xdg_icon_cache_update |
152 |
+} |