gentoo resync : 13.01.2018

8 files changed, 90 insertions, 101 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 2fb71ce4f9b2..2f6012f1e786 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 9c069484efa3..1bbc26350aeb 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,10 +2,13 @@ AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff613225
 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
-MISC metadata.xml 724 BLAKE2B 3b37e0ff3700488ba09b40bff1ab1f4da02b124945611bf67ab6a791cebaf712d9f54f90e61391fa45879b3cffb066b4485577f98e6befa32f6a37a4cfa293e7 SHA512 368312b4fd4993bac07293d0884a2e9398c1e76577424558f9e9a00de6e1119f24f1c0f07a89a7606766ed01c5e5569ba50eac51c98229677ee4762a05ac1185
+EBUILD terminator-1.91.ebuild 1324 BLAKE2B d2791882a3c1e695b9925043f4b9d3db317ec2abec55e4771e0ff7e3708847718d10477be15f3bd824bae6f3beb34ac5f824f98fd0c09166f5b0ed2f5f74289a SHA512 36f14e66f1921550bac93f98ac94da8803c138e33a53bed25ef0c9830df804fea5b7f8b122672bb864bd807e3dffc2dd47b42e257fcbbf736507885da38d7c17
+MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b
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 000000000000..4cbbfa4626d2
--- /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/metadata.xml b/x11-terms/terminator/metadata.xml
index c129c91cdf5c..44b22d322ad3 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<longdescription>
 		Much of the behaviour of Terminator is based on GNOME Terminal, and
 		we are adding more features from that as time goes by, but we also
diff --git a/x11-terms/terminator/terminator-1.91.ebuild b/x11-terms/terminator/terminator-1.91.ebuild
new file mode 100644
index 000000000000..727c4abd75ab
--- /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} || 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
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 53555ff16ffc..0e5d53228840 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,7 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
-DIST xterm-328.tgz 1264517 BLAKE2B 7ac6ff7b6e576c0c9a7fb5d096f9aabfd9cd7fe1ddb31a23322a510ce37e7d305231e85ac5085b1543cd0028eb53997c55eca076d22975901881454f1fb5ce71 SHA512 4f3381440394e0cd2d6c4d6645573ab2eac1c1c98e510eb0b3281ed4d2b1082e57ae58b7f756a03704eb275925ae497a1ae6c5907d6ba1b8ec95f92eaf939656
-DIST xterm-329.tgz 1265450 BLAKE2B acfe00128978aae4fd26d7a116137d1d08a8fdf3bcd1b0171ef3082919c9e3c1f07d8fbde8dc1d7f5cc0561fdada1ac8bdb1cae75e26e4a5a2c6e84ac857f4f9 SHA512 b6d68bde0796dc6848c02bb0f780b778226e110e7b495fd8c8d45870b1e78b1b91263a45748ef0fbfbd3a7262f4af78daeca07984c3f4cba4c5da67c4c3f0347
 DIST xterm-330.tgz 1273183 BLAKE2B 5a73e251d3c19ed8591962eb280922c89ad8c67b6970d33e83a8900c6aa349e042ef911ccbdecb8d00addbd0f748bca79c34480bccc746675f837313bab3bfd3 SHA512 3886745179ebabc10feea401444a153dc3f9e5f4c91da381870857fe21f514e0e975193af498b7c2b365602f833dd08e6c706e25cfc1e687d565125672136b62
+DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347
 EBUILD xterm-327.ebuild 2630 BLAKE2B aadb3fd9282689da927791112f29e4a7f6c702a7c2c4288619dff490f826b72cf1b626c262888430d8fb86cfa44e7d39aa80b42a81ace9c7a8eced115c9daf2a SHA512 e6a979b95b5df8a3abcaaffc5de491feec31b6ab0a24b338612605e4916eb8e7c4384912f2c33a1f47372c144288dff5c6ef6df19c2711ceb11513a4c78f1f88
-EBUILD xterm-328.ebuild 2639 BLAKE2B 650bdbd7a9303650fbee72b2c8af3746c63ba61d4099e836a51d66af8f22ae9e9c460595361d778c9770961ab662e4861e2cb37422bafb0b6b78c24b44fb06e0 SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501
-EBUILD xterm-329.ebuild 2639 BLAKE2B 650bdbd7a9303650fbee72b2c8af3746c63ba61d4099e836a51d66af8f22ae9e9c460595361d778c9770961ab662e4861e2cb37422bafb0b6b78c24b44fb06e0 SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501
 EBUILD xterm-330.ebuild 2639 BLAKE2B 650bdbd7a9303650fbee72b2c8af3746c63ba61d4099e836a51d66af8f22ae9e9c460595361d778c9770961ab662e4861e2cb37422bafb0b6b78c24b44fb06e0 SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501
+EBUILD xterm-331.ebuild 2639 BLAKE2B d312fa6e6771dec3f1da74bc094b28cfdda22ebbf67b1564e7b3a0eacfca34ef79c3bbaf141e76107739d05bd2ad20d6eafbb37ccd7a48f52764325f6e0b4d2a SHA512 eb9f13ef78487c7850aa1db64af74ebde33587d38954a5663d427aec7ad69a10ecef35dcc4d1341406718accd9821a70cdf8588c3429000e1c9efbdb3ffd70cf
 MISC metadata.xml 404 BLAKE2B 675f80c795392f88f38bde9e8cfc1a83632e830245baf8d35bc0836fb302897c0eb5065156733831e2b23da0ce916fe6353efa3aebe2b90159fc9b1e587264cb SHA512 2f6acf3970872f23aa82f12b76fce6758d579aaaf7d988b8a2b75d9d845528fef5d50faafa5de1d3e49262dda8b706107902beac035a5ff1fb171d35aaa2dd08
diff --git a/x11-terms/xterm/xterm-329.ebuild b/x11-terms/xterm/xterm-329.ebuild
deleted file mode 100644
index 1dfbec154c2a..000000000000
--- a/x11-terms/xterm/xterm-329.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-proto/kbproto
-	x11-proto/xproto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults="${DEFAULTS_DIR}" \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		$(use_with xinerama) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable openpty) \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	default
-
-	dohtml xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-328.ebuild b/x11-terms/xterm/xterm-331.ebuild
index 1dfbec154c2a..c9683e8dda78 100644
--- a/x11-terms/xterm/xterm-328.ebuild
+++ b/x11-terms/xterm/xterm-331.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5