4 files changed, 87 insertions, 5 deletions
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 667f448893f4..6f0a55273f71 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,11 +1,14 @@
 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
 EBUILD guake-3.3.2.ebuild 1375 BLAKE2B 7a6bdb335f6e183f794e50276be61f0f3910f4a626e4fd1e45e5e7443968bc6e9b29492f65f8b7a5032a9a59044a2b7cda3617a098b8b84d7aaa0769b6adbb6a SHA512 50846354bb23ca4799d506afdda2ae4aafd26029dff318862d230decd7ebc59e85e02526bdb88b771a4e3cc3bbca6b36c55ce8b91a0263a5ddfbc681bee99471
-EBUILD guake-9999.ebuild 1337 BLAKE2B ed4774014d089d3d1cab77ec1a942a753a0f29d4889614261896d695b97fb6dbd6da0de0e931f0ab4f0ff87fe3992f50f64234c2f6ac1fd3234b580710903700 SHA512 214191f9ba92e65b38d0b0813c274c80d2fb0ce834001f9141ab752f0b62470d9738fa21ac16c213728649e5945c7586fee5d3c65c63a9ae975c20ed2e50f5bf
+EBUILD guake-3.4.0-r1.ebuild 1489 BLAKE2B 8305fd4a2f76f780686758d6958b8986923ed6400512b5e539e35888b804afa241e405874e618aade95db0f2575f1f11c15a17c93997e9bc97f809dcc7a089bd SHA512 428689bded27b8f67b4123c8c7d475eb4ece7531e86d7b80dcbaf6aff4912539a5782d27f00dc04f3046a0e01c425590f3391af861d9d6040b22666708ecfdfb
+EBUILD guake-9999.ebuild 1451 BLAKE2B 88093ded4bca1b26b77d554a5b048733e6a19ca728fcf7c513fcd11f8180de68e139edcca2984adbc912fdfcaf9a3d89a04041688660638203442da5511bb204 SHA512 1dd05b62e534278e2e728ca8ff211b5c1dc68a3ad22a6c19d9ce84691d6243a6da7eebec09a2e6d0a3534f7b9c66e9ef2e16c446537958bbfd9c99153e63ee61
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/files/guake-3.4.0-paths.patch b/x11-terms/guake/files/guake-3.4.0-paths.patch
new file mode 100644
index 000000000000..30a47294d5ec
--- /dev/null
+++ b/x11-terms/guake/files/guake-3.4.0-paths.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/667878
+https://github.com/Guake/guake/issues/1436
+
+--- a/guake/paths.py
++++ b/guake/paths.py
+@@ -35,7 +35,7 @@
+ 
+ 
+ def get_data_files_dir():
+-    d = os.path.dirname(os.path.dirname(sys.modules["guake"].__file__))
++    d = os.path.dirname(sys.modules["guake"].__file__)
+     p = os.path.basename(os.path.abspath(os.path.join(d, "..")))
+     if p in ["site-packages", "dist-packages"]:
+         # current "guake" package has been installed in a prefix structure (/usr, /usr/local or
diff --git a/x11-terms/guake/guake-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..a9aeb41ea1cf
--- /dev/null
+++ b/x11-terms/guake/guake-3.4.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+	dev-libs/glib[${PYTHON_USEDEP}]
+	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[introspection]
+	x11-libs/vte:2.91[introspection]
+	utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	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_compile_all() {
+	emake prepare-install prefix=/usr
+	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+	default
+}
+
+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/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 46f3706e7f3d..593f8375adb6 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,13 +17,14 @@ KEYWORDS=""
 IUSE="utempter"
 
 RDEPEND="
-	dev-libs/keybinder:3
+	dev-libs/glib[${PYTHON_USEDEP}]
+	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/vte:2.91[introspection]
 	utempter? ( sys-libs/libutempter )
 "
 DEPEND="
@@ -36,6 +37,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+	"${FILESDIR}"/${PN}-3.4.0-paths.patch
 )
 
 python_compile_all() {