gentoo resync : 13.06.2020

6 files changed, 5 insertions, 160 deletions

diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 37ea882ad8bc..e1957b9e64fd 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,10 +1,5 @@
 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-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766
-DIST guake-3.6.3.tar.gz 1192394 BLAKE2B 18aeee4151b9d88dc5eab089de404e0c61a3baa9ce09d579af048805125ce239574e6f7e154da6fcca3b24b9e630f7ba037f8a988ce43ce8f7e57c42e3e772ae SHA512 11515f3645eb4c8cac05d50a1bec0a14582cf94ac4bdaae85cf6fd3da0e428e044410f18893dd50f073eede042ac447983e233ba3742b113c03385a44058d401
 DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
-EBUILD guake-3.3.2-r1.ebuild 1381 BLAKE2B 51d408bd31231a9018b789e93df1ae50230bad1522edee417103833f4bb74c81780983e1a978529ccbc33030678b73779aa303b95ad4811c508e4007494acd4c SHA512 24da5fc65cb004908c2b879799fa5a92316d82178a448f858b3f13547728653e70e40aba58f4c2df22e6b47887bbc0746ad8462d18e4df95ea8809bbdb95fa71
-EBUILD guake-3.6.3-r1.ebuild 1711 BLAKE2B def9646520fb8b6db390879c82d583a608cacb0e63a300bb5cbc3110793164cd0cebe7e89589f1ed54d838744b8f958460f8982116bc7904ab5b4b7e140b918d SHA512 df38bb59ac80f5f0e44dd8e19f86eae56f2059bd06583eca7df542a9446c13eaef3b6faa316002f9458e756fc5b876847956e1c00f1cc19bb53981bd65f498a2
-EBUILD guake-3.7.0.ebuild 1683 BLAKE2B fee53fd8986d02cc3e06e50229f43db116db70b2a9fc811e46ac7ec9ce2e8ede7fab0036cec2f14c1b7d22a8b71b4031495e5749922ab0dd841d030dba2b18dd SHA512 1d22e28840b1703dcb90da7876ff8535e3fec5dff3d26855b4ea88745e973fa424bbc27003d7212d2f810af2c2825af479895fe2464dd7fa4d4f92e7569aeded
-EBUILD guake-9999.ebuild 1441 BLAKE2B ba71bca4472e7097c22d714f52837136acb6d2f46f3b8f9a043fadb163346daeb32ee57a23e1b2d74d13aeaadbabf6885cacc2ff7d116e72b6e7ffe716a1bdc7 SHA512 dc63dfb8f74f918d74f223ac628451d6bd2184d4e961b3f7ec5e6f17a3ff47a64ea4faaf4aa82adffb714df506c5504e2274296b100fb057e8dcf509ddd2ea3f
+EBUILD guake-3.7.0.ebuild 1684 BLAKE2B 881da9288378855c973b79b273efd22af7eae33d1f517df8a0da160ba9d0a6678e9b7e9a7ec6a8d6f8c0464f7abed8e4b54488b255a74261f155fdd43e4c4407 SHA512 ff107919cb0b36ba4ba9b639f9132c215a8b67adcb534a40df6372c62644ada67fb549b17c17bf96eddd561eb0ed4e0d19e5eb724472c6d5c6b9f58a294f0f22
+EBUILD guake-9999.ebuild 1445 BLAKE2B 21be5f4d247ac9adc7a1a00387d57c63dc6f12553a0dd4dadd6b7508cf3f7281a80aceede48bbcf683ca7a395c4a2a27fa1f995228b03a0ecc22b8bde44605b5 SHA512 d83179ecd59f9685ab1acd0eedef20d6acd2a5a2f03f93c8e50130965335b086830a1d4a7058506dcd15ebdbaf81d1023841688f289ae840a5152aa1a68eb37f
 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
deleted file mode 100644
index 30a47294d5ec..000000000000
--- a/x11-terms/guake/files/guake-3.4.0-paths.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.3.2-r1.ebuild b/x11-terms/guake/guake-3.3.2-r1.ebuild
deleted file mode 100644
index 1426b793e688..000000000000
--- a/x11-terms/guake/guake-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_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/keybinder:3
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/libnotify
-	x11-libs/vte:2.91
-	utempter? ( sys-libs/libutempter )
-"
-DEPEND="
-	${RDEPEND}
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext
-	sys-devel/make
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.2-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-3.6.3-r1.ebuild b/x11-terms/guake/guake-3.6.3-r1.ebuild
deleted file mode 100644
index ccfa02f3d129..000000000000
--- a/x11-terms/guake/guake-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_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
-	dev-libs/keybinder:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/vte:2.91[introspection]
-	utempter? ( sys-libs/libutempter )
-"
-DEPEND="
-	${RDEPEND}
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext
-	sys-devel/make
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.2-paths.patch
-)
-S=${WORKDIR}/${P^}
-
-pkg_setup() {
-	GUAKE_SCHEMA_DIR="${EROOT}"/usr/share/glib-2.0/schemas
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' ${PN}/paths.py || die
-}
-
-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-3.7.0.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
index ec327169929e..b10718f1fbae 100644
--- a/x11-terms/guake/guake-3.7.0.ebuild
+++ b/x11-terms/guake/guake-3.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils xdg-utils
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index d062cfbe9bb9..7c92f743a64b 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 git-r3 gnome2-utils xdg-utils