From 34260b21a81f95de61c656a35643553d000de70e Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 8 Oct 2020 22:56:13 +0200 Subject: xfce-extra/xfce4-power-manager: Remove unnecessary dep on pm-utils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pm-utils are used only as a last resort fallback for suspend/hibernate support. The preferred provider for these functions is logind. However, both are entirely optional runtime deps, so just report missing logind in postinst. Signed-off-by: Michał Górny --- .../xfce4-power-manager-1.6.6-r1.ebuild | 64 ++++++++++++++++++++++ .../xfce4-power-manager-1.6.6.ebuild | 59 -------------------- .../xfce4-power-manager-1.7.0-r1.ebuild | 64 ++++++++++++++++++++++ .../xfce4-power-manager-1.7.0.ebuild | 59 -------------------- 4 files changed, 128 insertions(+), 118 deletions(-) create mode 100644 xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild delete mode 100644 xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild create mode 100644 xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild delete mode 100644 xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild (limited to 'xfce-extra') diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild new file mode 100644 index 000000000000..641b2904d0af --- /dev/null +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit xdg-utils + +DESCRIPTION="Power manager for the Xfce desktop environment" +HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86" +IUSE="kernel_linux networkmanager +panel-plugin policykit" + +COMMON_DEPEND=">=dev-libs/glib-2.42 + >=sys-power/upower-0.99.0 + >=x11-libs/gtk+-3.14:3 + >=x11-libs/libnotify-0.7 + x11-libs/libX11 + >=x11-libs/libXrandr-1.2 + x11-libs/libXext + x11-libs/libXtst + >=xfce-base/xfconf-4.12:= + >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] + >=xfce-base/libxfce4util-4.12:= + panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) + policykit? ( >=sys-auth/polkit-0.112 )" +RDEPEND="${COMMON_DEPEND} + networkmanager? ( net-misc/networkmanager )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + x11-base/xorg-proto" + +src_configure() { + local myconf=( + $(use_enable policykit polkit) + $(use_enable networkmanager network-manager) + $(use_enable panel-plugin xfce4panel) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update + + if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind + then + elog "Suspend/hibernate support requires a logind provider installed" + elog "(sys-apps/systemd or sys-auth/elogind)" + fi +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild deleted file mode 100644 index 4b9aa22bbe90..000000000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg-utils - -DESCRIPTION="Power manager for the Xfce desktop environment" -HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager" -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86" -IUSE="kernel_linux networkmanager +panel-plugin policykit" - -COMMON_DEPEND=">=dev-libs/glib-2.42 - >=sys-power/upower-0.99.0 - sys-power/pm-utils - >=x11-libs/gtk+-3.14:3 - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - >=x11-libs/libXrandr-1.2 - x11-libs/libXext - x11-libs/libXtst - >=xfce-base/xfconf-4.12:= - >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] - >=xfce-base/libxfce4util-4.12:= - panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) - policykit? ( >=sys-auth/polkit-0.112 )" -RDEPEND="${COMMON_DEPEND} - networkmanager? ( net-misc/networkmanager )" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -src_configure() { - local myconf=( - $(use_enable policykit polkit) - $(use_enable networkmanager network-manager) - $(use_enable panel-plugin xfce4panel) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild new file mode 100644 index 000000000000..3cc989ee9369 --- /dev/null +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit xdg-utils + +DESCRIPTION="Power manager for the Xfce desktop environment" +HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="kernel_linux networkmanager +panel-plugin policykit" + +COMMON_DEPEND=">=dev-libs/glib-2.42 + >=sys-power/upower-0.99.0 + >=x11-libs/gtk+-3.14:3 + >=x11-libs/libnotify-0.7 + x11-libs/libX11 + >=x11-libs/libXrandr-1.2 + x11-libs/libXext + x11-libs/libXtst + >=xfce-base/xfconf-4.12:= + >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] + >=xfce-base/libxfce4util-4.12:= + panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) + policykit? ( >=sys-auth/polkit-0.112 )" +RDEPEND="${COMMON_DEPEND} + networkmanager? ( net-misc/networkmanager )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + x11-base/xorg-proto" + +src_configure() { + local myconf=( + $(use_enable policykit polkit) + $(use_enable networkmanager network-manager) + $(use_enable panel-plugin xfce4panel) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update + + if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind + then + elog "Suspend/hibernate support requires a logind provider installed" + elog "(sys-apps/systemd or sys-auth/elogind)" + fi +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild deleted file mode 100644 index 9df144416fc2..000000000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg-utils - -DESCRIPTION="Power manager for the Xfce desktop environment" -HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager" -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="kernel_linux networkmanager +panel-plugin policykit" - -COMMON_DEPEND=">=dev-libs/glib-2.42 - >=sys-power/upower-0.99.0 - sys-power/pm-utils - >=x11-libs/gtk+-3.14:3 - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - >=x11-libs/libXrandr-1.2 - x11-libs/libXext - x11-libs/libXtst - >=xfce-base/xfconf-4.12:= - >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] - >=xfce-base/libxfce4util-4.12:= - panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) - policykit? ( >=sys-auth/polkit-0.112 )" -RDEPEND="${COMMON_DEPEND} - networkmanager? ( net-misc/networkmanager )" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -src_configure() { - local myconf=( - $(use_enable policykit polkit) - $(use_enable networkmanager network-manager) - $(use_enable panel-plugin xfce4panel) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3-65-gdbad