[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/

2020-05-04 Thread Joonas Niilola 
commit: 472a3393145f37f03c9ca961f02e2ec6848743cb
Author: Alexey Sokolov  google  com>
AuthorDate: Sun May  3 15:50:27 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May  4 14:11:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472a3393

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  google.com>
Closes: https://github.com/gentoo/gentoo/pull/15589
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/terminator-1.92-metainfo.patch   | 32 ++
 x11-terms/terminator/terminator-1.92.ebuild|  2 ++
 2 files changed, 34 insertions(+)

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 000..ae2fed5d48f
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
@@ -0,0 +1,32 @@
+commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
+Author: Alexey Sokolov 
+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 e0725520a7c..5891577d909 100644
--- 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() {

[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/

2020-04-30 Thread Patrick McLean 
commit: 53f47bd928f3b470b69a3bfbf44d318dec4e1a6a
Author: Alexey Sokolov  google  com>
AuthorDate: Tue Mar  3 01:08:52 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Apr 30 23:18:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f47bd9

x11-terms/terminator: bump version, support py3

Some notes:

* I replaced gnome2 with xdg because gnome2 doesn't work with EAPI 7. I
  don't know whether the rest of things gnome2 eclass did is important.
* I put myself to maintainer because Andreas Sturmlechner told me to.

It seems to work, and the test passes.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov  google.com>
Closes: https://bugs.gentoo.org/716446
Closes: https://github.com/gentoo/gentoo/pull/14826
Signed-off-by: Patrick McLean  gentoo.org>

 x11-terms/terminator/Manifest  |  1 +
 .../files/terminator-1.91-without-icon-cache.patch | 16 ++
 x11-terms/terminator/metadata.xml  | 10 ++--
 x11-terms/terminator/terminator-1.92.ebuild| 58 ++
 4 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 28305643e3a..5de1326fab2 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1 +1,2 @@
 DIST terminator-1.91.tar.gz 910536 BLAKE2B 
887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9
 SHA512 
6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
+DIST terminator-1.92.tar.gz 910613 BLAKE2B 
d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63
 SHA512 
9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1

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 000..c924de3607f
--- /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.0 -0400
 b/setup.py 2009-08-12 22:22:57.0 -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/metadata.xml 
b/x11-terms/terminator/metadata.xml
index 44b22d322ad..d11068fa01f 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -2,8 +2,12 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   chutz...@gentoo.org
-   Patrick McLean
+   alexey+gen...@asokolov.org
+   Alexey Sokolov
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers


Much of the behaviour of Terminator is based on GNOME Terminal, 
and
@@ -16,6 +20,6 @@
Enables desktop notifications 
viadev-python/notify-python


-   terminator
+   gnome-terminator/terminator

 

diff --git a/x11-terms/terminator/terminator-1.92.ebuild 
b/x11-terms/terminator/terminator-1.92.ebuild
new file mode 100644
index 000..64edc13227e
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -0,0 +1,58 @@
+# 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"
+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=(
+

[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/, profiles/

2018-01-11 Thread Sebastian Pipping 
commit: c150d6ab20f93daf0400a75e2ff9ec035ad6a740
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Thu Jan 11 23:42:44 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Thu Jan 11 23:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c150d6ab

x11-terms/terminator: 1.91

Bump to prevent removal in entirety

Bug: https://bugs.gentoo.org/624160
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 profiles/package.mask  |  3 +-
 x11-terms/terminator/Manifest  |  1 +
 .../terminator/files/terminator-1.91-desktop.patch | 12 
 x11-terms/terminator/terminator-1.91.ebuild| 67 ++
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 008307e8e8e..50c5e98d58f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -294,9 +294,10 @@ dev-vcs/monotone
 app-misc/tasque
 
 # Pacho Ramos  (28 Dec 2017)
+# Sebastian Pipping  (12 Jan 2018)
 # Needs a major version bump and relies on lots of dead libs (#624160).
 # Removal in a month.
-x11-terms/terminator
+ (28 Dec 2017)
 # Requires dead gnome2 python bindings (#629180) and old gstreamer, also all

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 649a265bcb6..5fb65d1d112 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,3 +1,4 @@
 DIST terminator-0.97.tar.gz 5025337 BLAKE2B 
2d220166d76d0d5380f3541f2a0817cf22d6b04272af6970d76bd2ff1cd0b120b9f2766ee79d099a9ccbdf4c78dca917a87907b02ee03a21b16e3cc2f85a3806
 SHA512 
ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470
 DIST terminator-0.98.tar.gz 6007243 BLAKE2B 
852182a52470646dc11a44b6d2ba4e3002bcdaef3482117ff2d5da6c5b6f96d00f0bb3e5e051c46f98a8e5f59d81aab9ccef0942f45da355ca4d0e4418c3eb43
 SHA512 
c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573
 DIST terminator-1.0.tar.gz 881675 BLAKE2B 
89c89f24c7950c7a7589a051d1deaf1198c519d31a4c887c0205df6ce30f66fd557acfa7c5d16a70c0a8e4e388efcb4f4125c9f7315aeb81fd4e98bac9b4d1e7
 SHA512 
5dbd7463dd8eca2f3554d7d51ae4b8745279485f39b3160feff93c8a02e5e753fff24ecbeaed756320e8ef3e58f14f2c367efa41180224176cff49eaed04d590
+DIST terminator-1.91.tar.gz 910536 BLAKE2B 
887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9
 SHA512 
6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d

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 000..4cbbfa4626d
--- /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/terminator-1.91.ebuild 
b/x11-terms/terminator/terminator-1.91.ebuild
new file mode 100644
index 000..727c4abd75a
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.91.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="https://launchpad.net/terminator/;
+SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +libnotify"
+
+RDEPEND="
+   >=x11-libs/gtk+-3.16:3
+   >=dev-libs/glib-2.32:2
+   dev-libs/keybinder:3[introspection]
+   dev-python/psutil
+   x11-libs/vte:2.91[introspection]
+   dbus? ( sys-apps/dbus )
+   dev-python/pycairo[${PYTHON_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   libnotify? (
+   dev-python/notify-python[${PYTHON_USEDEP}]
+   x11-libs/libnotify[introspection]
+   )
+"
+DEPEND="
+   dev-util/intltool
+"
+
+python_prepare_all() {
+   local PATCHES=(
+   "${FILESDIR}"/0.90-without-icon-cache.patch
+   "${FILESDIR}"/${P}-desktop.patch
+   )
+
+   local i p
+   if [[ -n "${LINGUAS+x}" ]] ; then
+   pushd "${S}"/po > /dev/null
+   strip-linguas -i .
+   for i in *.po; do
+   if ! has ${i%.po} ${LINGUAS} ; then
+   rm ${i} ||

[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/

2016-11-24 Thread Jeroen Roovers 
commit: 8020ac5d40ea32bb5fa45ae7e2b16828f95f2408
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Nov 24 23:00:53 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Nov 24 23:01:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8020ac5d

x11-terms/terminator: Version bump.

Package-Manager: portage-2.3.2

 x11-terms/terminator/Manifest  |  1 +
 x11-terms/terminator/files/0.93-session.patch  | 13 
 .../terminator/files/terminator-1.0-desktop.patch  | 11 
 x11-terms/terminator/terminator-1.0.ebuild | 76 ++
 4 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index d43ebf7..2a5f79f 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,2 +1,3 @@
 DIST terminator-0.97.tar.gz 5025337 SHA256 
0281b568913f392eec92ebee3c6fea15afe4f4e01869bad38d9efe0eb305be49 SHA512 
ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470
 WHIRLPOOL 
9d83bd34e1018dc535af573af27d08b425def1af5498de7be793e7c90298d0140c2e78479bae4264fa7315bcfa9b36d2d464f822b58af0d7452802a3cfc18583
 DIST terminator-0.98.tar.gz 6007243 SHA256 
0a6d8c9ffe36d67e60968fbf2752c521e5d498ceda42ef171ad3e966c02f26c1 SHA512 
c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573
 WHIRLPOOL 
b9a6e9bba8a945ca51aca6936b00dfc51b9c1d266315450b2f63af2d64600c18a7ff9cce712a342f236aded0bbda07b7d1a979685f68d45006a14cf7b0d9a160
+DIST terminator-1.0.tar.gz 881675 SHA256 
88aa09e96591c4fd7ff2765617acee6c9bae9c188db2590652a8aba53bbbdadd SHA512 
5dbd7463dd8eca2f3554d7d51ae4b8745279485f39b3160feff93c8a02e5e753fff24ecbeaed756320e8ef3e58f14f2c367efa41180224176cff49eaed04d590
 WHIRLPOOL 
80f83b3fbd25c2128e5c6a9b0f104b0afbd8c1404e63fd559ceb7999de4849ee8e15a8f0bfd3c314c668f8b0f4fbbf7fae916664ae5c0f27b6c44b78b2f1e4c3

diff --git a/x11-terms/terminator/files/0.93-session.patch 
b/x11-terms/terminator/files/0.93-session.patch
deleted file mode 100644
index c904a8c..
--- a/x11-terms/terminator/files/0.93-session.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
-index 34726cb..5adb7e7 100755
 a/terminatorlib/terminator.py
-+++ b/terminatorlib/terminator.py
-@@ -60,8 +60,6 @@ class Terminator(Borg):
- self.doing_layout = False
- if not self.pid_cwd:
- self.pid_cwd = get_pid_cwd()
--if self.gnome_client is None:
--self.attempt_gnome_client()
- 
- def attempt_gnome_client(self):
- """Attempt to find a GNOME Session to register with"""

diff --git a/x11-terms/terminator/files/terminator-1.0-desktop.patch 
b/x11-terms/terminator/files/terminator-1.0-desktop.patch
new file mode 100644
index ..2edf260
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.0-desktop.patch
@@ -0,0 +1,11 @@
+--- a/data/terminator.desktop.in
 b/data/terminator.desktop.in
+@@ -9,7 +9,7 @@
+ StartupNotify=true
+ X-Ubuntu-Gettext-Domain=terminator
+ X-Ayatana-Desktop-Shortcuts=NewWindow;
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open a New Window
+ Exec=terminator
+ TargetEnvironment=Unity

diff --git a/x11-terms/terminator/terminator-1.0.ebuild 
b/x11-terms/terminator/terminator-1.0.ebuild
new file mode 100644
index ..37de204
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html;
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc gnome +libnotify"
+
+RDEPEND="
+   dev-libs/keybinder:0[python]
+   x11-libs/vte:0[python]
+   dbus? ( sys-apps/dbus )
+   gnome? (
+   dev-python/gconf-python
+   dev-python/libgnome-python
+   dev-python/pygobject:2[${PYTHON_USEDEP}]
+   dev-python/pygtk:2[${PYTHON_USEDEP}]
+   )
+   libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+"
+DEPEND="
+   dev-util/intltool
+"
+
+python_prepare_all() {
+   local PATCHES=(
+   "${FILESDIR}"/0.90-without-icon-cache.patch
+   "${FILESDIR}"/0.94-session.patch
+   "${FILESDIR}"/${P}-desktop.patch
+   )
+
+   local i p
+   if [[ -n "${LINGUAS+x}" ]] ; then
+   pushd "${S}"/po > /dev/null
+   strip-linguas -i .
+   for i in *.po; do
+   if ! has ${i%.po} ${LINGUAS} ; then
+