gentoo resync : 21.07.2018

9 files changed, 69 insertions, 62 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index aeffb81b3f10..35ffc292ac2e 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index fbee867c6a8d..83d437c4317e 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,8 +1,8 @@
-DIST guake-0.8.12.tar.gz 410820 BLAKE2B 47138b058b4e3145bab3a78a4e2a400649147369fd8ea10b10c8be9bd801ba5c58e1625bf7b91c7cb82178868e76ca43679bf03eb3b418b1d6160ff465777130 SHA512 492d5f601925b3ef33536fad441492ec2e440f4f59c39fe45a415bdcca1e1424c9e41958b3b43c87d502c665db5d558222065b0d0ef6af4137e5562db1401aff
 DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38
 DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2
-EBUILD guake-0.8.12.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
+DIST guake-3.3.0.tar.gz 1006849 BLAKE2B 387ca17a881beebb84c81fda29a3f44ab3f297841010128bc4c5c4eded83d3325562bc88858fd1a8824a7c26d3bb9050bbe17399934f6e6cdcf8b4bf3c15d8a6 SHA512 1558e34f29060e449d676077c90df92ea9bc3a57857094be8d98cd283010de1125b7eeb3fbc3b3fcd08cacac9cf8ee461adb28cc29c491e8d2c3ad32fa39754b
 EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
 EBUILD guake-0.8.8.ebuild 1058 BLAKE2B 5dbb934d346f0278b921a6a25d28d1dee40460ca122d7e4594a78f1f6a4043afa576d6813f2231ef9747667141ca9c3deb182aef00bb7b30bf89d14ad6b2c0db SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135
+EBUILD guake-3.3.0.ebuild 1408 BLAKE2B fd7e60a807ae41598ddae780ea0c7de5ac4e235ef4428621d42b9a24c3b5a52c69ee749d7e54ce63070b69427bff9333b2066970fa5f66f65d6a5196e8946f94 SHA512 41a7855e52f76031de624945e79d6e51f0abe17c6e1370efb1151df1e18e914a345e30e5d1962fd4caf6201a22533acf48e5b48ea0f1b5c2c4e8eba62e1d138b
 EBUILD guake-9999.ebuild 1084 BLAKE2B 2acc98de63dc489fa76d969dbeb91c6363c5c624e6052327dee8b143f60729cad5a6fad414e9bae2774c16a34314812f5d5237789a6898693aa042587d6641e8 SHA512 fd45ce1f2b51ca645e7a68b58d3a8483b530e8f99033a7e756375512481e4087f89f9f72fc6845b84882fdf79c9cba8c7b447935d64df0fdba5058dcfa90a8a2
-MISC metadata.xml 362 BLAKE2B a0ef1875797df07778deab0b5755c7714df46cc267bed36b37729395e303d5415fe8d0a61cc292c37af28118c4dc9346520ecdc0c7d942c3bde045a79bcd1dd3 SHA512 a3a6f19649b81ef87c6775fea804fed2358e2a440fe7c2328ea6f743fa3ae303ad743a8067746b05be2b23090e7dbbb6fee4b05c0d8ce12605378de7cc7cca72
+MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-0.8.12.ebuild b/x11-terms/guake/guake-0.8.12.ebuild
deleted file mode 100644
index 8af1404f5b97..000000000000
--- a/x11-terms/guake/guake-0.8.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="Drop-down terminal for GTK+ desktops"
-HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/keybinder:0[python,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eapply_user
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-3.3.0.ebuild b/x11-terms/guake/guake-3.3.0.ebuild
new file mode 100644
index 000000000000..06cadd17185a
--- /dev/null
+++ b/x11-terms/guake/guake-3.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+MY_PN="Guake"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+	dev-libs/keybinder:3
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/libnotify
+	x11-libs/vte:2.91
+	utempter? ( sys-libs/libutempter )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext
+	sys-devel/make"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	emake prepare-install prefix=/usr
+	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+}
+
+python_install_all() {
+	emake install-schemas install-locale prefix=/usr DESTDIR="${D}"
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index c92b9b25198a..49c1dac718b0 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/metadata.xml
@@ -8,4 +8,8 @@
   <upstream>
     <remote-id type="github">Guake/guake</remote-id>
   </upstream>
+  <use>
+    <flag name='utempter'>Include utmp management support
+      via <pkg>sys-libs/libutempter</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index 85baab0a5664..d3678f63c12d 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -6,5 +6,5 @@ AUX kterm-underline.patch 467 BLAKE2B 5aa8a79a4262418f08d2618c3bc9a5ad2efaddba0c
 DIST kterm-6.2.0-wpi.patch.gz 6629 BLAKE2B 7a40d2305677cc8e8f7a0aba6c1a6ed2de19fac578a668719285a63f26c4b572e8b49e95e765f95a66ee54d485634acd9e685105ebb12503a23e5d2989adfd68 SHA512 b3ae44ce3a2a5ed7d08055c7b9a006844441c77727694ec1eb5f07752f745c8f1990ce23115070006999bd035fd934f09322bb6dc407f825f0da2b06a163faab
 DIST kterm-6.2.0.ext02.patch.gz 15290 BLAKE2B 031d59df558bbc8d6044a508542fe39b8e733df5964e6ba940be0914e376cf5f8e457028cfc9fbc2f8bb044babdffdb71ca6c43f246a74a781377c8a6c2a4dc1 SHA512 95b70f61496ed43dcbdda22b3250c651b3dbce07ef2209a7baec3f729ef954d6781dd5e18a5368d34792db4a3e310adec4fad5c05d3dfd211c0dc7f89c5ae356
 DIST kterm-6.2.0.tar.gz 200448 BLAKE2B 99fa24b6fea6244df87e1ee052bd3368c8baab1271bc5530903c5b04dd0f5b531134f9d3721923a3d4c20fa8c84d01a22398b26c49d967e1a3aeabf1293f7350 SHA512 c84a5b57154dc14ab93e1bc6cd33103495716c203a648d57044672c4218cb7e4e80110f7e6e7c0900c80c2e55843ecb190de4f61d0c72dcf9b1ada306348ce1f
-EBUILD kterm-6.2.0-r6.ebuild 2034 BLAKE2B 4a4b06c00d76e156be3f01bd5c759a6306c8c7f6917090880038deb6eda37d316a0b5d849a1247831b29b60aeac508149d0b632123145189822cbdfd23f794b3 SHA512 ad90392ba34bb20b20ce3538895911a0923650e04b89c24b7ba8ece7255e995e1ea7fad8781a8f6c11f3fbeec364f428d35e96b513c2da5d1868d59060ea0f20
+EBUILD kterm-6.2.0-r6.ebuild 1993 BLAKE2B d13a67df8714962a68caf21aa9f2d16805d30ca17d3af50dde0faffa871b9ece7e8b8af94e0e463f2ba3444cafbe30bb0fd2c1c2bb69228f8756d2cdda93207e SHA512 dc3cd9435cacac75124989184b4e0824abca26cdbdf54c6e4f30b7fc3c04a60ff5f77b6cf913517e63b9593a69b50a5257e78e78c640a26ea5404833beeea04f
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index a4867bab0a45..f030178b8cd9 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -65,9 +65,8 @@ src_install(){
 
 	# install man pages
 	newman ${PN}.man ${PN}.1
-	insinto /usr/share/man/ja/man1
 	iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1
-	newins ${PN}.ja.1 ${PN}.1
+	doman ${PN}.ja.1
 
 	# Remove link to avoid collision
 	rm -f "${ED}"/usr/lib/X11/app-defaults
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 99b77320d589..077a1f4becfb 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -4,5 +4,5 @@ AUX tilda-0.9.6-makefile.patch 689 BLAKE2B d2132b3567d9bfdf9301184c73e5ba5f7add9
 DIST tilda-0.9.6.tar.gz 307517 BLAKE2B dba49f28cf92a514977da5f8099e7f19366723b89785c9d9897138500eac7281a97d3ea3365acb08f17edb0a71ffe3a63d631987aaf39aa6e0058290f037e9dc SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0
 DIST tilda-1.4.1.tar.gz 471340 BLAKE2B a84d125bf81e384706347401ebbf7b11813bf5ed422e6b374e918ed564b9bfe168ebf3fef163b91a15350b49166b0040e90afdef716cc1762ecc410710f72c29 SHA512 d16878e762d94f94c219e8e711223a771a2ab816f02573f693cfbcfa0eee5aafff8a274898a65df168c0bf78258aa16e5a3be6b0c3dee418af61c68f43ed74c6
 EBUILD tilda-0.9.6-r1.ebuild 733 BLAKE2B 2a90d0c6e10d60308e79f7d2e67be41838fd788cdd855c618aea34bd589e9a877f9abd8409557cf891271ac403d160718583b865d572487960e2e21f23007c77 SHA512 2e8f74f654aff6e93f233fea124389cbf9af08ce920c37adea88d461d3b6623d9a6f140e6037ad7f64cf71439b61a8b46909eb352d0bd832819a037f2677a79d
-EBUILD tilda-1.4.1.ebuild 717 BLAKE2B bb125bde5f07a6dd52c6fcd907566b5a492fae9e04c344115578fc1a8817665fd76a2423567ae9888d654dd6e42940c23fd41a99f1264bebf16451da6054c8c5 SHA512 36a6e6c9e0307bf2f0dc6e7a2b0a41a46d4e7c8bb8c2e9f2d655d6f63b06e5cc95be32f95deaeffc36dbe9e2b2a2c3577395e7c8301f015d05b52a60c74d857d
+EBUILD tilda-1.4.1.ebuild 714 BLAKE2B 63c725245a1b3339e6a22a6c4d392c94e34790fcc1422063c5f713325a8a0c020807ae22aa15ca5b21dd55abafbd886bb6987ffbf3bc8614e4f3048a7c4849ac SHA512 255bd3a860655654fe925f366001b3137e0410ba2ae2080cc7d97678ee3b00a148221a0881754a58d10ffb04892cef3abc41968082c0ebfe6d853664d226feaf
 MISC metadata.xml 319 BLAKE2B 69510b8b8d8658d9cc6884a960bd6b2511da1ae40e771c1edcfa836b0f1033bd4b66d5cbdb3d664108d90d0afa77de6caacb42f8f0bed5d9f8c88abeb34463d4 SHA512 013ac97bba6505168215a97c531a4fcac607b678aaf804ffdfb44611b61e930709621bedd71f7fbea06b25f8bd7000530f878cf57c419c9938afd61155ff060a
diff --git a/x11-terms/tilda/tilda-1.4.1.ebuild b/x11-terms/tilda/tilda-1.4.1.ebuild
index 1900b21ec9f0..3e84244d59a7 100644
--- a/x11-terms/tilda/tilda-1.4.1.ebuild
+++ b/x11-terms/tilda/tilda-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/vte:2.91