From 0de04f9324dd2b15888a38325b573ae2d3f92dd1 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 8 Feb 2020 08:01:16 +0100 Subject: x11-terms/guake: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- x11-terms/guake/guake-3.3.2-r1.ebuild | 62 +++++++++++++++++++++++++++++ x11-terms/guake/guake-3.3.2.ebuild | 61 ----------------------------- x11-terms/guake/guake-3.4.0-r1.ebuild | 11 +++--- x11-terms/guake/guake-3.6.1-r1.ebuild | 11 +++--- x11-terms/guake/guake-3.6.3-r1.ebuild | 74 +++++++++++++++++++++++++++++++++++ x11-terms/guake/guake-3.6.3.ebuild | 73 ---------------------------------- x11-terms/guake/guake-9999.ebuild | 11 +++--- 7 files changed, 154 insertions(+), 149 deletions(-) create mode 100644 x11-terms/guake/guake-3.3.2-r1.ebuild delete mode 100644 x11-terms/guake/guake-3.3.2.ebuild create mode 100644 x11-terms/guake/guake-3.6.3-r1.ebuild delete mode 100644 x11-terms/guake/guake-3.6.3.ebuild diff --git a/x11-terms/guake/guake-3.3.2-r1.ebuild b/x11-terms/guake/guake-3.3.2-r1.ebuild new file mode 100644 index 000000000000..1426b793e688 --- /dev/null +++ b/x11-terms/guake/guake-3.3.2-r1.ebuild @@ -0,0 +1,62 @@ +# 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.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild deleted file mode 100644 index 1e1f6615a606..000000000000 --- a/x11-terms/guake/guake-3.3.2.ebuild +++ /dev/null @@ -1,61 +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 - 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-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild index f4c8848b35df..204a40fe8f3b 100644 --- a/x11-terms/guake/guake-3.4.0-r1.ebuild +++ b/x11-terms/guake/guake-3.4.0-r1.ebuild @@ -19,17 +19,18 @@ IUSE="utempter" RDEPEND=" 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}] + $(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/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 diff --git a/x11-terms/guake/guake-3.6.1-r1.ebuild b/x11-terms/guake/guake-3.6.1-r1.ebuild index 240b059d9fc3..9b8a60187706 100644 --- a/x11-terms/guake/guake-3.6.1-r1.ebuild +++ b/x11-terms/guake/guake-3.6.1-r1.ebuild @@ -19,10 +19,12 @@ IUSE="utempter" RDEPEND=" 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}] + $(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] @@ -30,7 +32,6 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make diff --git a/x11-terms/guake/guake-3.6.3-r1.ebuild b/x11-terms/guake/guake-3.6.3-r1.ebuild new file mode 100644 index 000000000000..ccfa02f3d129 --- /dev/null +++ b/x11-terms/guake/guake-3.6.3-r1.ebuild @@ -0,0 +1,74 @@ +# 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.6.3.ebuild b/x11-terms/guake/guake-3.6.3.ebuild deleted file mode 100644 index fc373929f91e..000000000000 --- a/x11-terms/guake/guake-3.6.3.ebuild +++ /dev/null @@ -1,73 +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] - 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} - 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^} - -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-9999.ebuild b/x11-terms/guake/guake-9999.ebuild index e76390e51bc7..d062cfbe9bb9 100644 --- a/x11-terms/guake/guake-9999.ebuild +++ b/x11-terms/guake/guake-9999.ebuild @@ -19,10 +19,12 @@ IUSE="utempter" RDEPEND=" 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}] + $(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] @@ -30,7 +32,6 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make -- cgit v1.2.3-65-gdbad