From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C0FC1395E2 for ; Thu, 24 Nov 2016 23:01:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BE4AE0B0B; Thu, 24 Nov 2016 23:01:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30D39E0B0B for ; Thu, 24 Nov 2016 23:01:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9019333FECD for ; Thu, 24 Nov 2016 23:01:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 054724A8 for ; Thu, 24 Nov 2016 23:01:07 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1480028465.8020ac5d40ea32bb5fa45ae7e2b16828f95f2408.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/terminator/Manifest x11-terms/terminator/files/0.93-session.patch x11-terms/terminator/files/terminator-1.0-desktop.patch x11-terms/terminator/terminator-1.0.ebuild X-VCS-Directories: x11-terms/terminator/ x11-terms/terminator/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 8020ac5d40ea32bb5fa45ae7e2b16828f95f2408 X-VCS-Branch: master Date: Thu, 24 Nov 2016 23:01:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6c3c74f0-7e3f-44e1-bfa7-7a4fc9d3795c X-Archives-Hash: 4222e1dacf0d3072fb81e8be3e75d395 commit: 8020ac5d40ea32bb5fa45ae7e2b16828f95f2408 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Nov 24 23:00:53 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Nov 24 23:01:05 2016 +0000 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..00000000 --- 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 00000000..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 00000000..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 + rm ${i} || die + fi + done + popd > /dev/null + fi + + sed \ + -e "/'share', 'doc'/s:${PN}:${PF}:g" \ + -i setup.py terminatorlib/util.py || die + + use doc || \ + sed \ + -e '/install_documentation/s:True:False:g' \ + -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + VIRTUALX_COMMAND="esetup.py" + virtualmake test +} + +pkg_postinst() { + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm +}