From 4b74fb6d2bf96da71a29c91a8c137ad4e6021f9c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 22 Sep 2020 00:50:02 +0200 Subject: [PATCH] trinity-base/klaptopdaemon: Fix RDEPEND suspect, fix DESCRIPTION local mycmakeargs Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner --- .../klaptopdaemon/klaptopdaemon-14.0.6.ebuild | 18 +++++++++++------- .../klaptopdaemon/klaptopdaemon-14.0.7.ebuild | 18 +++++++++++------- .../klaptopdaemon/klaptopdaemon-9999.ebuild | 15 +++++++++------ 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/trinity-base/klaptopdaemon/klaptopdaemon-14.0.6.ebuild b/trinity-base/klaptopdaemon/klaptopdaemon-14.0.6.ebuild index e9dfd119..335b7ba9 100644 --- a/trinity-base/klaptopdaemon/klaptopdaemon-14.0.6.ebuild +++ b/trinity-base/klaptopdaemon/klaptopdaemon-14.0.6.ebuild @@ -1,23 +1,27 @@ # Copyright 1999-2016 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 -DESCRIPTION="KLaptopdaemon - Trinity battery monitoring and management for laptops." +DESCRIPTION="Trinity battery monitoring and management for laptops" -IUSE="xscreensaver" KEYWORDS="~amd64 ~x86" +IUSE="xscreensaver" -DEPEND="x11-libs/libXtst +RDEPEND=" + x11-libs/libXtst xscreensaver? ( x11-libs/libXScrnSaver ) - virtual/os-headers" -RDEPEND="${DEPEND}" +" +DEPEND="${RDEPEND} + virtual/os-headers +" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_DPMS=ON -DWITH_XSCREENSAVER="$(usex xscreensaver)" ) diff --git a/trinity-base/klaptopdaemon/klaptopdaemon-14.0.7.ebuild b/trinity-base/klaptopdaemon/klaptopdaemon-14.0.7.ebuild index e9dfd119..335b7ba9 100644 --- a/trinity-base/klaptopdaemon/klaptopdaemon-14.0.7.ebuild +++ b/trinity-base/klaptopdaemon/klaptopdaemon-14.0.7.ebuild @@ -1,23 +1,27 @@ # Copyright 1999-2016 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 -DESCRIPTION="KLaptopdaemon - Trinity battery monitoring and management for laptops." +DESCRIPTION="Trinity battery monitoring and management for laptops" -IUSE="xscreensaver" KEYWORDS="~amd64 ~x86" +IUSE="xscreensaver" -DEPEND="x11-libs/libXtst +RDEPEND=" + x11-libs/libXtst xscreensaver? ( x11-libs/libXScrnSaver ) - virtual/os-headers" -RDEPEND="${DEPEND}" +" +DEPEND="${RDEPEND} + virtual/os-headers +" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_DPMS=ON -DWITH_XSCREENSAVER="$(usex xscreensaver)" ) diff --git a/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild b/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild index 153e91d8..b8fd6525 100644 --- a/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild +++ b/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild @@ -3,21 +3,24 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 -DESCRIPTION="KLaptopdaemon - Trinity battery monitoring and management for laptops." +DESCRIPTION="Trinity battery monitoring and management for laptops" IUSE="xscreensaver" -DEPEND="x11-libs/libXtst +RDEPEND=" + x11-libs/libXtst xscreensaver? ( x11-libs/libXScrnSaver ) - virtual/os-headers" -RDEPEND="${DEPEND}" +" +DEPEND="${RDEPEND} + virtual/os-headers +" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_DPMS=ON -DWITH_XSCREENSAVER="$(usex xscreensaver)" )