From 5e16b9213f6d3329eb12d915a5fae57c98596302 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 7 Feb 2020 15:53:59 +0100 Subject: gnome-extra/cinnamon-desktop: 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 --- .../cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild | 4 +- .../cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild | 4 +- .../cinnamon-desktop-4.0.1-r1.ebuild | 63 ++++++++++++++++++++++ .../cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild | 61 --------------------- 4 files changed, 69 insertions(+), 63 deletions(-) create mode 100644 gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild delete mode 100644 gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild index e992aeb0f027..a984f3d7084b 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild @@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS} sys-apps/accountsservice " RDEPEND="${COMMON_DEPEND} - dev-python/pygobject:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild index 15d3acece1d1..f9831b1fdf9f 100644 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild @@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS} sys-apps/accountsservice " RDEPEND="${COMMON_DEPEND} - dev-python/pygobject:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.4 diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild new file mode 100644 index 000000000000..9faa5c73cd35 --- /dev/null +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_6 ) + +inherit meson eutils gnome2 python-single-r1 + +DESCRIPTION="A collection of libraries and utilites used by Cinnamon" +HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html" +SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="0/4" # subslot = libcinnamon-desktop soname version +KEYWORDS="amd64 x86" +IUSE="+introspection systemd" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.37.3:2[dbus] + media-sound/pulseaudio[glib] + >=x11-libs/gdk-pixbuf-2.22:2[introspection?] + >=x11-libs/gtk+-3.3.16:3[introspection?] + >=x11-libs/libXext-1.1 + >=x11-libs/libXrandr-1.3 + x11-libs/cairo:=[X] + x11-libs/libX11 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + >=gnome-base/gsettings-desktop-schemas-3.5.91 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + sys-apps/accountsservice +" +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gtk-doc-am-1.4 + >=dev-util/intltool-0.40.6 + gnome-base/gnome-common + x11-base/xorg-proto + virtual/pkgconfig +" + +pkg_setup() { + python_setup +} + +src_configure() { + meson_src_configure +} + +src_install() { + meson_src_install + + # set sane default gschema values for systemd users + if use systemd; then + insinto /usr/share/glib-2.0/schemas/ + newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override + fi +} diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild deleted file mode 100644 index 11d093a363c7..000000000000 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.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 ) - -inherit meson eutils gnome2 python-single-r1 - -DESCRIPTION="A collection of libraries and utilites used by Cinnamon" -HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html" -SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0/4" # subslot = libcinnamon-desktop soname version -KEYWORDS="amd64 x86" -IUSE="+introspection systemd" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.37.3:2[dbus] - media-sound/pulseaudio[glib] - >=x11-libs/gdk-pixbuf-2.22:2[introspection?] - >=x11-libs/gtk+-3.3.16:3[introspection?] - >=x11-libs/libXext-1.1 - >=x11-libs/libXrandr-1.3 - x11-libs/cairo:=[X] - x11-libs/libX11 - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=gnome-base/gsettings-desktop-schemas-3.5.91 - introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) - sys-apps/accountsservice -" -RDEPEND="${COMMON_DEPEND} - dev-python/pygobject:3[${PYTHON_USEDEP}] -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.6 - gnome-base/gnome-common - x11-base/xorg-proto - virtual/pkgconfig -" - -pkg_setup() { - python_setup -} - -src_configure() { - meson_src_configure -} - -src_install() { - meson_src_install - - # set sane default gschema values for systemd users - if use systemd; then - insinto /usr/share/glib-2.0/schemas/ - newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override - fi -} -- cgit v1.2.3-65-gdbad