From a0a6dcbe1a5668bd29d2668fe959a065d566aaf2 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 6 Oct 2018 12:22:46 +0200 Subject: x11-terms/guake: Fix dependencies, runtime Bug: https://bugs.gentoo.org/667878 Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Jeroen Roovers --- x11-terms/guake/files/guake-3.4.0-paths.patch | 14 ++++++ x11-terms/guake/guake-3.4.0-r1.ebuild | 63 +++++++++++++++++++++++++++ x11-terms/guake/guake-3.4.0.ebuild | 61 -------------------------- x11-terms/guake/guake-9999.ebuild | 10 +++-- 4 files changed, 83 insertions(+), 65 deletions(-) create mode 100644 x11-terms/guake/files/guake-3.4.0-paths.patch create mode 100644 x11-terms/guake/guake-3.4.0-r1.ebuild delete mode 100644 x11-terms/guake/guake-3.4.0.ebuild (limited to 'x11-terms/guake') 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-3.4.0.ebuild b/x11-terms/guake/guake-3.4.0.ebuild deleted file mode 100644 index ec3ad80d6f2e..000000000000 --- a/x11-terms/guake/guake-3.4.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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/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 -" - -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-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() { -- cgit v1.2.3-65-gdbad