gentoo resync : 04.05.2019

5 files changed, 19 insertions, 124 deletions

diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index e3739c53a9e7..df91c3fa6624 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,14 +1,10 @@
 AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
 AUX guake-3.4.0-paths.patch 507 BLAKE2B b314a96a6a3f3795046a1d19dffc2037d8cfbba7028f83cfd30a913ada76b1d6073c9439857de1a4a5ee293ef7e9d7b8d0ad90eb01613ef61d099dc26ac32d23 SHA512 509ed5717eeb39330fa8f2fbb5653b8065e31ae2a5cbd36eb8b3ce768cff39f5ec42819cfff7ef7f12e114b242febb69af068d0be7f18b70ebce83eebdbda159
-DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38
-DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2
-DIST guake-3.3.0.tar.gz 1006849 BLAKE2B 387ca17a881beebb84c81fda29a3f44ab3f297841010128bc4c5c4eded83d3325562bc88858fd1a8824a7c26d3bb9050bbe17399934f6e6cdcf8b4bf3c15d8a6 SHA512 1558e34f29060e449d676077c90df92ea9bc3a57857094be8d98cd283010de1125b7eeb3fbc3b3fcd08cacac9cf8ee461adb28cc29c491e8d2c3ad32fa39754b
 DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766
 DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e31f753a9e30f1609eba34b1f09bb133bd5413436e375eda39bb2716c1ad8ef8e0baf6641b540f03efc95e9406 SHA512 94053383a28c60fefbed70f166669a9a1528e9505c3bbfc1688312ef896e1c25c006536c755f01dca4868a97b30d857b044715f59f7a345fa4dc6075fac72ab6
-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 1355 BLAKE2B cc7e4a89920a56b095f22e7542acbba3aed0ae5ca4acb709ef278749f499f44f0448b0fccb7949c97726aa7a9e7c981c34878aac2259d38966501b9e3569f60a SHA512 cd4507485ee77ee61b7e51a75de238c6102d27b89e8871fb0c9f65fc86d6d2deb0f2a661cf2ada94cc0d05cb4d80124963bfaeedd29bb8c572a0ab02bb538280
+DIST guake-3.6.1.tar.gz 1181556 BLAKE2B 62b47a5a00a6e90d28afd8a74e747b8d77e36d450d4349687bf341ec1d338a01c5c46dddd1cca2bd507ea7a1056a5fbb5870b15c70e91347c4c8692577eb0573 SHA512 12e005e413bfa37f368caa7995c3b8d6c40bdca3ccdc7e3795c26d977981629971f75ae5d024b5c5c205c2d5a1bf6a80e49dbef95a1e8dd6511694da079865b6
 EBUILD guake-3.3.2.ebuild 1369 BLAKE2B 642b467207f8c7e06e31cb8ff7a78253833572be5ff2fdc868ee1a6cd788f5fa713d73bfa549127b9d45ac721ae91755be1c658f4930308404d4aff949a87c48 SHA512 8ece4d1c9f8deae919c55d00609c0c850504a0f8305dd39751962ab11debb48f7344da3a06a48a462ca282a4e5b2e2a82a5dbcfd698f103f770d30f4b31b3fc3
 EBUILD guake-3.4.0-r1.ebuild 1471 BLAKE2B cc59b72a8adff828124411ce4cefb777ec5fa990fe549b60f36d5f406c777c3698fb7d5f785d061c742be4db504e644ec6bd27f64c8e93798eec674610770a83 SHA512 96db7b3cc5906166f8f2f463ffbf95e96d175af32ee865d57d90ec4ed9ce6397e454b84ddfaabcf506383d2b20461c84a51aaa3c943cbd05d045e70a834ef6fd
-EBUILD guake-9999.ebuild 1433 BLAKE2B fbb5bc1663b5b33ab401301457fad155209df4402b88eb4695c3b46b888c584073c1ee7b02c67570119e364e3c47856c0ac44a740d10134b7d6efe19eee184a0 SHA512 7f4d7330a5cb770c5a2a0e86e2630ff1b3088973f36981c9cde233ca57e6e2732abedaf33ecc035e89dcadfe6f2f8f104da05f527bdc4ded4b3d6c1e41e53316
+EBUILD guake-3.6.1-r1.ebuild 1506 BLAKE2B f071355fc4e766344ddc8469350fb6ca68df4331fbfe66514c6b6df5d1d11a9ff80b81cbb0c45c388c34fdf66249ca7a13ff2727c0168842def0db17eb77bef5 SHA512 0c08e595e233f986fda6da8c715f9bebe186db7a635d8266c5a0bde0813181db034ca8e50d4d343f75e4931ae4d62288dbdf00e4f94e4ac6b9a1569e6e1b0e90
+EBUILD guake-9999.ebuild 1429 BLAKE2B 0885c769c1377052fce3584cb85d8c3d07b1d27951229ee2916429818a2c2bd6e4760c8a39205e34c970959cead58fb44440b23534ac24ef54185b564e3fe2ea SHA512 5996f2fd949cdec9753b67098dace61db96ed6c74e73dee39bb3c736a2403a5fbda52dcf03d32ecc39e8c6fdd32bee582e71e186752a52424a4b584b55012694
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-0.8.13.ebuild b/x11-terms/guake/guake-0.8.13.ebuild
deleted file mode 100644
index 8af1404f5b97..000000000000
--- a/x11-terms/guake/guake-0.8.13.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-0.8.8.ebuild b/x11-terms/guake/guake-0.8.8.ebuild
deleted file mode 100644
index 1544863d0db5..000000000000
--- a/x11-terms/guake/guake-0.8.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 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.6.1-r1.ebuild
index 2fb100b8ed4b..86405cb3ffd0 100644
--- a/x11-terms/guake/guake-3.3.0.ebuild
+++ b/x11-terms/guake/guake-3.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
-DESCRIPTION="Drop-down terminal for GTK+ desktops"
+DESCRIPTION="Drop-down terminal for GNOME"
 HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
 SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
 
@@ -17,13 +17,15 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="utempter"
 
 RDEPEND="
-	dev-libs/keybinder:3
+	dev-libs/glib
+	dev-libs/keybinder:3[introspection]
 	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
+	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/vte:2.91[introspection]
 	utempter? ( sys-libs/libutempter )
 "
 DEPEND="
@@ -33,12 +35,17 @@ DEPEND="
 	sys-devel/gettext
 	sys-devel/make
 "
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+	"${FILESDIR}"/${PN}-3.4.0-paths.patch
+)
 S=${WORKDIR}/${P^}
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
+python_compile_all() {
 	emake prepare-install prefix=/usr
 	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+	default
 }
 
 python_install_all() {
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index b12d887f6d2e..09ef8d7f6bd8 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
 	x11-libs/vte:2.91[introspection]
 	utempter? ( sys-libs/libutempter )
 "
@@ -37,7 +38,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.2-paths.patch
-	"${FILESDIR}"/${PN}-3.4.0-paths.patch
 )
 
 python_compile_all() {