gentoo resync : 31.01.2018

9 files changed, 2 insertions, 281 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 5ad49c79329d..5280628422e9 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 1bbc26350aeb..650b33f7a81d 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,14 +1,5 @@
 AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff6132257d27ddb7e29f9bc16733805c3cf1b8707dd4320bde8fd47636aa6e71161847cdcbb06759762674fcd81fa1717bf2d4 SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca
-AUX 0.94-session.patch 496 BLAKE2B 8cfa12992bbecb5e45a191728f592296052f517dc58040e0935eec2a20b71301fb13e84ecf9112d16a1a26f6bfd60f36de170e375cf51ad8dcc06108799835f7 SHA512 3a753cfe2be04132229327167d120c35814a9cdaf2eae2837eb4d294e90ce07ece7a6e4fbb69129474967fab3ad14e596d6c5a4eab55c909e234d19801aaaaae
-AUX terminator-0.97-brightness.patch 1622 BLAKE2B 96e276b181be412349289f579febb3b9c2cb2065a74665de1e0ce41a2f11391bc2be890071e9055ced87e9381cd5cba1929fd4b89146eb98ec80ff8cf754dbe1 SHA512 d87fbce864014d32ba57d3c81664384a13faacb7fb5b890b3eb524c915b505a98a86222700e22c6fce81031fa2b262d4830fb9ae608d5078608bb4a3507e4973
-AUX terminator-1.0-desktop.patch 302 BLAKE2B 37a78bce91534c98b79bdcde7ee2a73d25ac3cb14c90abc2d292d20e9b19c140d7c905ea4fa4b64646e97d9f66bd16281c41c6d473dd9cda218b6c1fc107c5aa SHA512 5da00b0117de9f8c56fee033685d28caaf2ca3b3926fcd9317113d397289fa79fa74912acbd9cd343efcac3fcf4b79d4374ccadf0f715de38ef046229e442a66
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
-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
-EBUILD terminator-0.97-r1.ebuild 1265 BLAKE2B 191cbf1a093852ccf08896625dcb429cd0267b31d229e2d8f687896ba975a2871b697a96cbf4064a7e8b92e49c96211bee3b0f80768f8ec23c41efb54a54d06b SHA512 6c7e0b90ab14481f56ef9d62f2722abfca52dcd130dff9721843b4969ea7dfc2d8ff6e220a483b3d104683391447c38ec1c9899efce4abdcd0d1eef5bb2aaba1
-EBUILD terminator-0.98.ebuild 1472 BLAKE2B 43c51165bee42fb823370b85d3b2532c92197e7340076b9e7274aa31831b85cbc652e51b38b897440f4ebd58581c23864b605eca9b4940f9e903c76ee1baed5c SHA512 f51c25917604d8eeea36251dd633dc028464c140ace44fff8bead72f15f84958b571f77b1f18335d932e23bc543302c87d258dbe00e36870fa70236d83b04759
-EBUILD terminator-1.0.ebuild 1528 BLAKE2B ebaa6fded528b809a6275f1105fcff2fb8e7bf66f9173ce044c11987d8ca09dcb4956d1c15972137217842ef9beea65f77e14811f72552e7310e63b57452536a SHA512 4e77c853bba93727f04eb1b3c46d9086e1933d73e18fdcbf3441b7d7a5ee817d7c5eb76f4b558c0dbe4682aaa630722eddf1a76d9f01455bd543726b7b44d6d4
-EBUILD terminator-1.91.ebuild 1324 BLAKE2B d2791882a3c1e695b9925043f4b9d3db317ec2abec55e4771e0ff7e3708847718d10477be15f3bd824bae6f3beb34ac5f824f98fd0c09166f5b0ed2f5f74289a SHA512 36f14e66f1921550bac93f98ac94da8803c138e33a53bed25ef0c9830df804fea5b7f8b122672bb864bd807e3dffc2dd47b42e257fcbbf736507885da38d7c17
+EBUILD terminator-1.91.ebuild 1323 BLAKE2B 70af2c6b48e51313424814c41a0831fbc2d11911340ad481535398a4d2c1aa32cc937238d5cd6d039b2ab50b961ad67ac360eddec823597755c9ea23e00f6eb5 SHA512 a47082b5f7327ac918369dc28c574157c94a025a0b8a178749fa13c1af8173ca55f593762184b7106a2667073c72a64996cccc95d7387f32563949d0e021c439
 MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b
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 4583b0cff7b6..000000000000
--- 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 9e35d7d593f6..000000000000
--- 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 +0000
-+++ terminatorlib/prefseditor.py	2013-05-11 22:03:46 +0000
-@@ -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 +0000
-+++ terminatorlib/terminal.py	2013-05-11 22:03:46 +0000
-@@ -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 = self.config['palette'].split(':')
-         self.palette_active = []
-         self.palette_inactive = []
-
diff --git a/x11-terms/terminator/files/terminator-1.0-desktop.patch b/x11-terms/terminator/files/terminator-1.0-desktop.patch
deleted file mode 100644
index 2edf260d76b3..000000000000
--- a/x11-terms/terminator/files/terminator-1.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-0.97-r1.ebuild b/x11-terms/terminator/terminator-0.97-r1.ebuild
deleted file mode 100644
index 892774b21200..000000000000
--- a/x11-terms/terminator/terminator-0.97-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 distutils-r1
-
-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 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"
-
-S="${WORKDIR}"/trunk
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.90-without-icon-cache.patch
-		"${FILESDIR}"/0.94-session.patch
-		"${FILESDIR}"/${P}-brightness.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
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/terminator/terminator-0.98.ebuild b/x11-terms/terminator/terminator-0.98.ebuild
deleted file mode 100644
index 45c961dd5710..000000000000
--- a/x11-terms/terminator/terminator-0.98.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 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="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
-	)
-
-	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
-}
diff --git a/x11-terms/terminator/terminator-1.0.ebuild b/x11-terms/terminator/terminator-1.0.ebuild
deleted file mode 100644
index 22d00846e1b2..000000000000
--- a/x11-terms/terminator/terminator-1.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 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="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]
-	dev-python/psutil
-	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
-}
diff --git a/x11-terms/terminator/terminator-1.91.ebuild b/x11-terms/terminator/terminator-1.91.ebuild
index 727c4abd75ab..fafc26d73c57 100644
--- a/x11-terms/terminator/terminator-1.91.ebuild
+++ b/x11-terms/terminator/terminator-1.91.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dbus +libnotify"
 
 RDEPEND="