From 11ee5ea7cf027da8dfb80b71b6164a417122f2e1 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 21 Sep 2020 20:44:23 +0200 Subject: [PATCH] trinity-base/konsole: Add missing IUSE metadata - Sort DEPENDs - local mycmakeargs Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner --- trinity-base/konsole/konsole-14.0.6.ebuild | 14 +++++++------- trinity-base/konsole/konsole-14.0.7.ebuild | 17 +++++++++-------- trinity-base/konsole/konsole-9999.ebuild | 15 ++++++++------- trinity-base/konsole/metadata.xml | 3 +++ 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/trinity-base/konsole/konsole-14.0.6.ebuild b/trinity-base/konsole/konsole-14.0.6.ebuild index 0ee6196f..dcfacc1c 100644 --- a/trinity-base/konsole/konsole-14.0.6.ebuild +++ b/trinity-base/konsole/konsole-14.0.6.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 -DESCRIPTION="X terminal for use with Trinity." -KEYWORDS="~amd64 ~x86" +DESCRIPTION="X terminal for use with Trinity" +KEYWORDS="~amd64 ~x86" IUSE="sudo" DEPEND="x11-libs/libX11 x11-libs/libXrender" RDEPEND="${DEPEND} - sudo? ( app-admin/sudo ) + ~trinity-base/kcontrol-${PV} x11-apps/bdftopcf - ~trinity-base/kcontrol-${PV}" + sudo? ( app-admin/sudo )" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XRENDER=ON -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)" ) diff --git a/trinity-base/konsole/konsole-14.0.7.ebuild b/trinity-base/konsole/konsole-14.0.7.ebuild index 0ee6196f..5ce92ccc 100644 --- a/trinity-base/konsole/konsole-14.0.7.ebuild +++ b/trinity-base/konsole/konsole-14.0.7.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 -DESCRIPTION="X terminal for use with Trinity." -KEYWORDS="~amd64 ~x86" +DESCRIPTION="X terminal for use with Trinity" +KEYWORDS="~amd64 ~x86" IUSE="sudo" -DEPEND="x11-libs/libX11 +DEPEND=" + x11-libs/libX11 x11-libs/libXrender" RDEPEND="${DEPEND} - sudo? ( app-admin/sudo ) + ~trinity-base/kcontrol-${PV} x11-apps/bdftopcf - ~trinity-base/kcontrol-${PV}" + sudo? ( app-admin/sudo )" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XRENDER=ON -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)" ) diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild index abe8312b..178ddb8c 100644 --- a/trinity-base/konsole/konsole-9999.ebuild +++ b/trinity-base/konsole/konsole-9999.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 -DESCRIPTION="X terminal for use with Trinity." +DESCRIPTION="X terminal for use with Trinity" IUSE="sudo" -DEPEND="x11-libs/libX11 +DEPEND=" + x11-libs/libX11 x11-libs/libXrender" RDEPEND="${DEPEND} - sudo? ( app-admin/sudo ) + ~trinity-base/kcontrol-${PV} x11-apps/bdftopcf - ~trinity-base/kcontrol-${PV}" + sudo? ( app-admin/sudo )" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XRENDER=ON -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)" ) diff --git a/trinity-base/konsole/metadata.xml b/trinity-base/konsole/metadata.xml index 6e9f5e4a..fbfeb4f2 100644 --- a/trinity-base/konsole/metadata.xml +++ b/trinity-base/konsole/metadata.xml @@ -5,4 +5,7 @@ fatzer2@gmail.com Alexander Golubev + + Enable support for run-as-root through app-admin/sudo +