[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/files/, x11-terms/terminator/
commit: dc19935b5862fda3f5fd9433ce6e629d0bdf400b
Author: Alexey Sokolov asokolov org>
AuthorDate: Mon Feb 27 00:42:49 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Feb 27 09:04:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc19935b
x11-terms/terminator: drop 2.1.1-r1
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Joonas Niilola gentoo.org>
x11-terms/terminator/Manifest | 2 -
.../files/terminator-1.91-without-icon-cache.patch | 16 --
x11-terms/terminator/terminator-2.1.1-r1.ebuild| 66 --
3 files changed, 84 deletions(-)
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index d3f47cab0a09..a8abe33912cd 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,4 +1,2 @@
-DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B
f92235bacf34ec5bfe2400c6bbfc8bbdee3867531fac5129fb59b84459101f2d673e3a6699eecf1fa0d19c33d30467bb043010bd19737c2bc0461cea861c71a7
SHA512
a916b9718801bb015d14bdec2eede24c89101d5ea36d22131b7d34f8dad48b9db9e79811645ce571e3c95c9e4b2f18d6b8508f519de7ff54c4246c5f7b546af2
-DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B
d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c
SHA512
ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
DIST terminator-2.1.2.tar.gz 1039160 BLAKE2B
2ca98c1caeadfffd2c7f737947b216a1db438a426a95cb9871504b827c3e85384df157d96a47c5f3d2cdc33e5e6b0e35cb8019b7a4bbc92fe59603379610e2e0
SHA512
070bf49979dd93e694b536877bac2d6ad274a1e961ef74df90348da6520fc411e7d0a73cd0d0c8fa2989c94ea75758fd15c09357f4f2ca8e7f6a4ab6c1236748
DIST terminator-2.1.2.tar.gz.asc 866 BLAKE2B
3d998365e039935742635f049513f5c43cd45c067d7d31914bf8284b79af3daccdbd524b35c37ca419b96083e5986d365a6e7654b847d460c85179ff9da1886e
SHA512
422b81676c6a53f736d39b5ff771d87e18053c188e0e97807f199080523430ede1e6d90d3f001fb3654b4b6bc90da9cc5f874a2639fa87ef8848868caa71342e
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 c924de3607f5..
--- a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/terminator-2.1.1-r1.ebuild
b/x11-terms/terminator/terminator-2.1.1-r1.ebuild
deleted file mode 100644
index 16cec74dd7c2..
--- a/x11-terms/terminator/terminator-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1 optfeature verify-sig virtualx xdg
-
-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
- verify-sig? (
https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc
)
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-IUSE="test"
-
-RDEPEND="
- dev-libs/glib:2
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- gnome-base/gsettings-desktop-schemas[introspection]
- x11-libs/gtk+:3
- x11-libs/vte:2.91[introspection]
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
- test? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- x11-libs/libnotify[introspection]
- )
- verify-sig? ( sec-keys/openpgp-keys-terminator )
-"
-distutils_enable_tests pytest
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc
-
-PATCHES=(
- "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
- "${FILESDIR}"/terminator-1.91-desktop.patch
-)
-
-src_prepare() {
- xdg_environment_reset
- sed -i -e '/pytest-runner/d' setup.py || die
- distutils-r1_src_prepare
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-pkg_postinst() {
-
[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/files/, x11-terms/terminator/
commit: fa86a9e1dfcf443daaef7ae276e15318d6dfa8d7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jun 5 09:33:46 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jun 5 09:43:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa86a9e1
x11-terms/terminator: Drop 1.91
Bug: https://bugs.gentoo.org/716446
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-terms/terminator/Manifest | 1 -
.../terminator/files/0.90-without-icon-cache.patch | 11
x11-terms/terminator/terminator-1.91.ebuild| 67 --
3 files changed, 79 deletions(-)
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 5de1326fab2..b7d3b02a41b 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,2 +1 @@
-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/0.90-without-icon-cache.patch
b/x11-terms/terminator/files/0.90-without-icon-cache.patch
deleted file mode 100644
index c7862def3ea..000
--- a/x11-terms/terminator/files/0.90-without-icon-cache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
setup.py.orig 2009-08-12 22:22:53.0 -0400
-+++ 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/terminator-1.91.ebuild
b/x11-terms/terminator/terminator-1.91.ebuild
deleted file mode 100644
index 835d3640e10..000
--- a/x11-terms/terminator/terminator-1.91.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils 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 ~ppc 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} || die
- fi
- done
- popd > /dev/null
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- VIRTUALX_COMMAND="esetup.py"
- virtualmake test
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/files/, x11-terms/terminator/
commit: 016f8ca4ca4d6079e1b2a480b0d4dc97d738f9af
Author: Alexey Sokolov google com>
AuthorDate: Fri May 1 07:00:50 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon May 4 14:10:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016f8ca4
x11-terms/terminator: fix usage of distutils
Address post-submit comments on #14826
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov google.com>
Signed-off-by: Joonas Niilola gentoo.org>
.../files/terminator-1.92-make-tests-fail.patch| 25 ++
x11-terms/terminator/terminator-1.92.ebuild| 10 -
2 files changed, 30 insertions(+), 5 deletions(-)
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
new file mode 100644
index 000..ae722cb1168
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
@@ -0,0 +1,25 @@
+commit 9f855d41f3e6d610bd01df9688467fdbb341917c
+Author: Alexey Sokolov
+Date: Fri May 1 08:36:09 2020 +0100
+
+Make failed tests fail the test
+
+diff --git a/run_tests b/run_tests
+index 3bf51e4a..cc7fb56a 100755
+--- a/run_tests
b/run_tests
+@@ -4,10 +4,10 @@ for t in tests/test*; do
+ echo $t
+ file_type=$(file -b $t)
+ case ${file_type} in
+-*[Pp]ython*) python ${t} ;;
+-*Bourne*) bash ${t} ;;
+-*bash*) bash ${t} ;;
+-*perl*) perl ${t} ;;
++*[Pp]ython*) python ${t} || exit 1 ;;
++*Bourne*) bash ${t} || exit 1 ;;
++*bash*) bash ${t} || exit 1 ;;
++*perl*) perl ${t} || exit 1 ;;
+ *) echo "Unknown" ;;
+ esac
+ echo
diff --git a/x11-terms/terminator/terminator-1.92.ebuild
b/x11-terms/terminator/terminator-1.92.ebuild
index 64edc13227e..e0725520a7c 100644
--- a/x11-terms/terminator/terminator-1.92.ebuild
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -13,8 +13,7 @@
SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus +libnotify test"
-RESTRICT="!test? ( test )"
+IUSE="dbus +libnotify"
RDEPEND="
>=dev-libs/glib-2.32:2
@@ -30,12 +29,13 @@ RDEPEND="
"
BDEPEND="
dev-util/intltool
- test? ( ${RDEPEND} )
"
+distutils_enable_tests setup.py
PATCHES=(
"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
"${FILESDIR}"/terminator-1.91-desktop.patch
+ "${FILESDIR}"/terminator-1.92-make-tests-fail.patch
)
src_prepare() {
@@ -43,8 +43,8 @@ src_prepare() {
distutils-r1_src_prepare
}
-python_test() {
- virtx esetup.py test || die "tests fail with ${EPYTHON}"
+src_test() {
+ virtx distutils-r1_src_test
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/files/, x11-terms/terminator/
commit: 845b2d81e6eb9e842bd9450e5adc0be12e75ef01
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Jan 28 01:35:02 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Jan 28 01:35:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845b2d81
x11-terms/terminator: Drop old
Bug: https://bugs.gentoo.org/624160
Package-Manager: Portage-2.3.19, Repoman-2.3.6
x11-terms/terminator/Manifest | 3 -
x11-terms/terminator/files/0.94-session.patch | 13
.../files/terminator-0.97-brightness.patch | 35 --
.../terminator/files/terminator-1.0-desktop.patch | 11
x11-terms/terminator/terminator-0.97-r1.ebuild | 62 --
x11-terms/terminator/terminator-0.98.ebuild| 73 -
x11-terms/terminator/terminator-1.0.ebuild | 76 --
7 files changed, 273 deletions(-)
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 5fb65d1d112..28305643e3a 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,4 +1 @@
-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/0.94-session.patch
b/x11-terms/terminator/files/0.94-session.patch
deleted file mode 100644
index 4583b0cff7b..000
--- a/x11-terms/terminator/files/0.94-session.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
-index 1686006..960e53d 100755
a/terminatorlib/terminator.py
-+++ b/terminatorlib/terminator.py
-@@ -61,8 +61,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 set_origcwd(self, cwd):
- """Store the original cwd our process inherits"""
diff --git a/x11-terms/terminator/files/terminator-0.97-brightness.patch
b/x11-terms/terminator/files/terminator-0.97-brightness.patch
deleted file mode 100644
index 9e35d7d593f..000
--- a/x11-terms/terminator/files/terminator-0.97-brightness.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-=== modified file 'terminatorlib/prefseditor.py'
terminatorlib/prefseditor.py 2013-02-16 00:10:45 +
-+++ terminatorlib/prefseditor.py 2013-05-11 22:03:46 +
-@@ -923,6 +923,8 @@
-
- def on_inactive_color_offset_change_value(self, widget, scroll, value):
- """Inactive color offset setting changed"""
-+if value > 1.0:
-+ value = 1.0
- self.config['inactive_color_offset'] = round(value, 2)
- self.config.save()
-
-
-=== modified file 'terminatorlib/terminal.py'
terminatorlib/terminal.py 2013-02-15 15:10:55 +
-+++ terminatorlib/terminal.py 2013-05-11 22:03:46 +
-@@ -621,11 +621,17 @@
-
- factor = self.config['inactive_color_offset']
- self.fgcolor_inactive = self.fgcolor_active.copy()
-+dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)",
getattr(self.fgcolor_inactive, "red"),
-+
getattr(self.fgcolor_inactive, "green"),
-+
getattr(self.fgcolor_inactive, "blue")))
-
- for bit in ['red', 'green', 'blue']:
- setattr(self.fgcolor_inactive, bit,
- getattr(self.fgcolor_inactive, bit) * factor)
-
-+dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)",
getattr(self.fgcolor_inactive, "red"),
-+
getattr(self.fgcolor_inactive, "green"),
-+
getattr(self.fgcolor_inactive, "blue")))
- colors =
