gentoo resync : 16.01.2021

5 files changed, 2 insertions, 190 deletions

diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index d7b51f10c830..08311093bd98 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,8 +1,3 @@
-AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
-DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
-DIST guake-3.8.0.tar.gz 1125090 BLAKE2B 72ee6b5e93c3433fcc2863d2b0aa198326cc4889126454040ce870fdeaa0ba110723410355ae49b5e2e4876fcad3f9d849873adaddfcf1ecfa83dc1583db57eb SHA512 6e0bb6b4a0c92c163bd6151c65936a38d93624166af5a4e2b042f9ade7f28683c8e8fad802b23a07edd478e2dd3b99a559069c9935f1154585be936d1b7a96ed
 DIST guake-3.8.1.tar.gz 1127132 BLAKE2B e91f74bf119c76ad214b5c29bceb4fe18f19c97f14dbb2973c6118bbb9affc06e919c56e0cd24f96b710d9c2468006289fcf1c13a2050e93cc01972f0c9ebe99 SHA512 5fbf4cc37bc501e4533bd27c1c7e1f783e570457867289702ab2122fcb6a55708df151e4307c4cf84a242ac1d2874ef5e8eb9411318e24eca140102a42b426f4
-EBUILD guake-3.7.0.ebuild 1767 BLAKE2B 3358dad3874118a2af413ba00a48fb072bf3cde0ec0d4d0a371ef0d7de2973ae4ba2f1d4d744821ad33201252a386191a59872a1d84cf3baa5ad2e2e27690f9c SHA512 38b8cfa20a37f06474978f067fd125aa863d92b1128af685540041d1ae49a6b4702878f5a248cebbe35b387bd8101ec5e23e49a57485f6d42936de80d2ba093b
-EBUILD guake-3.8.0.ebuild 2108 BLAKE2B 8901e7aa3c6eb928677537cdf495ebf7b282a8009ca649f396f9c5eadd4dcb831870b7ba2a95184b42f50b59424b86cf95cc2fc799c316b1a57a17539fb3d127 SHA512 fa5eb19d9bebeb4fea5c22c77ec9bc8c76b35ea681e904b417dbc114ef5b197382a8e177f555ff3eb1ef3f63d0f8933f8e5f25e4ed83145900e4870812b56c6e
-EBUILD guake-3.8.1.ebuild 2064 BLAKE2B 2598566d14c644941ce543b7dfac1dee3d0e3c58879c0bf5f2decacf3d8725f5db6718729c51e626794bd0e079360f4502bf7be2b1e72ba9477364f053b0f09c SHA512 dad37ac15b3f124075618bf85e47c5083e90002d9f5f58415de0be741ec21e5bd743e0def9bae1151fe15eea590ad805faf47b12d9da0630bc4258d384dba334
+EBUILD guake-3.8.1.ebuild 2068 BLAKE2B d6fc6bdfb04a232954da1ca25254eb5482bea88cd232dbeae42b9a8574c7545a7393fcb6dd4654f3805c22f053c91724740fe22614760e9e7260efe22971a3e6 SHA512 dbcf5ade306799d3b5956c78d879858e0fa3b246cb3e10a822ed9be6046764e3a1d6615d6857451d437c9fe6053fa07619c523633a6dba2a226946f688676803
 MISC metadata.xml 418 BLAKE2B 4eaf1e46ca71463bf5e7c54f31941d391851b2415872e06e41bc97b8d2278ac58c544ff869a5050e4d20abc670c20d4c7d364a8d68a7d9fb21baae2fa061af69 SHA512 52a8f383fc6bd2757dfc41fd0758c2b47ee177ecf49bf840a4e8ee8b32421a8f3c6a08270fa72f8cd2d87f8bfe663390ae18f17ea9ad18715099fe575de726d1
diff --git a/x11-terms/guake/files/guake-3.3.2-paths.patch b/x11-terms/guake/files/guake-3.3.2-paths.patch
deleted file mode 100644
index d2d94daa4b1a..000000000000
--- a/x11-terms/guake/files/guake-3.3.2-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -81,7 +81,7 @@
- 
- 	@if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi
- 	@if [ -f guake/paths.py ]; then mv guake/paths.py guake/paths.py.dev; fi
--	@cp -f guake/paths.py.in guake/paths.py
-+	-@cp -f guake/paths.py.in guake/paths.py
- 	@sed -i -e 's|{{ LOCALE_DIR }}|"$(localedir)"|g' guake/paths.py
- 	@sed -i -e 's|{{ IMAGE_DIR }}|"$(IMAGE_DIR)"|g' guake/paths.py
- 	@sed -i -e 's|{{ GLADE_DIR }}|"$(GLADE_DIR)"|g' guake/paths.py
-@@ -368,7 +368,7 @@
- 
- generate-paths:
- 	@echo "Generating path.py..."
--	@cp -f guake/paths.py.in guake/paths.py
-+	-@cp -f guake/paths.py.in guake/paths.py
- 	@# Generic
- 	@sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|""|g' guake/paths.py
- 	@sed -i -e 's|{{ AUTOSTART_FOLDER }}|""|g' guake/paths.py
diff --git a/x11-terms/guake/guake-3.7.0.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
deleted file mode 100644
index 44023bbf3653..000000000000
--- a/x11-terms/guake/guake-3.7.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Guake/guake.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="
-	https://github.com/Guake/guake/
-	https://pypi.org/project/guake/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="utempter"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/keybinder:3[introspection]
-	$(python_gen_cond_dep '
-		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/libwnck:3[introspection]
-	x11-libs/vte:2.91[introspection]
-	utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.2-paths.patch
-)
-
-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.8.0.ebuild b/x11-terms/guake/guake-3.8.0.ebuild
deleted file mode 100644
index 45bb69d378a7..000000000000
--- a/x11-terms/guake/guake-3.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="http://guake-project.org/"
-SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="utempter"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	dev-libs/keybinder:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/vte:2.91[introspection]
-	utempter? ( sys-libs/libutempter )"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pbr[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-		)
-	')
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	emake PREFIX="${EPREFIX}/usr" prepare-install # paths.py.in -> paths.py
-
-	export PBR_VERSION=${PV} # needed if using github's tarball
-}
-
-python_test() {
-	# - uses /usr/bin/bash if SHELL is not exported
-	# - pytest-xvfb fails with Terminated, virtx alone works
-	SHELL=${SHELL} virtx epytest -p no:xvfb
-}
-
-python_install() {
-	# done here so tests don't use the system's
-	sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
-		-e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
-		-i "${BUILD_DIR}"/lib/guake/paths.py || die
-	rm -r "${BUILD_DIR}"/lib/guake/tests || die
-
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-{locale,schemas}
-
-	dodoc NEWS.rst README.rst
-
-	mv "${D}"/{,"${EPREFIX}"/usr/share/}metainfo || die
-}
-
-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.8.1.ebuild b/x11-terms/guake/guake-3.8.1.ebuild
index f1c55d56c102..c7b0ddb9600b 100644
--- a/x11-terms/guake/guake-3.8.1.ebuild
+++ b/x11-terms/guake/guake-3.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="utempter"
 
 RDEPEND="