[gentoo-commits] proj/kde:master commit in: kde-plasma/kde-cli-tools/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     8d8e6306d9c2cff58ef45e182f020734561c390b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 22:49:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 20:36:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d8e6306

kde-plasma/kde-cli-tools: Drop obsolete blocker, no kdesu by default

kdesu is only operational in X and increasingly obsolete.
Add RDEPEND on sys-apps/dbus[X] to make USE kdesu work.
Remove /usr/bin/kdesu5 symlink (we've had /usr/bin/kdesu for >=2 years).

Bug: https://bugs.gentoo.org/429910
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kde-cli-tools/kde-cli-tools-5.16.0.ebuild       | 7 ++++---
 kde-plasma/kde-cli-tools/kde-cli-tools-5.16.49.9999.ebuild | 7 ++++---
 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild         | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.0.ebuild
index ea0cd7bf62..fe466b4b22 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.0.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.0.ebuild
@@ -11,7 +11,9 @@ inherit kde5
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+kdesu X"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -39,7 +41,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!kde-apps/kdesu
+	kdesu? ( sys-apps/dbus[X] )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
@@ -59,5 +61,4 @@ src_configure() {
 src_install() {
 	kde5_src_install
 	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
 }

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.49.9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.49.9999.ebuild
index f4ef7ab88f..757e81f84c 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.49.9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.49.9999.ebuild
@@ -11,7 +11,9 @@ inherit kde5
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
 KEYWORDS=""
-IUSE="+kdesu X"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -39,7 +41,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!kde-apps/kdesu
+	kdesu? ( sys-apps/dbus[X] )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
@@ -59,5 +61,4 @@ src_configure() {
 src_install() {
 	kde5_src_install
 	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
 }

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index f4ef7ab88f..757e81f84c 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -11,7 +11,9 @@ inherit kde5
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
 KEYWORDS=""
-IUSE="+kdesu X"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -39,7 +41,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!kde-apps/kdesu
+	kdesu? ( sys-apps/dbus[X] )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
@@ -59,5 +61,4 @@ src_configure() {
 src_install() {
 	kde5_src_install
 	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
 }