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

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

commit:     2e4856f97d76d2ad7c00dcdc768670ab6ff0af6d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 13:45:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 13:46:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e4856f9

kde-plasma/ksshaskpass: Update paths to startup/shutdown scripts

Follow-up to f3fdca23a349b3059cad5834e5e4fe9f945a52c6

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../ksshaskpass/ksshaskpass-5.17.49.9999.ebuild      | 20 +++++++++++---------
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild       | 19 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
index 78d853dfae..b444897de0 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
@@ -10,17 +10,18 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
 HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
@@ -29,22 +30,23 @@ src_install() {
 
 	insinto /etc/xdg/plasma-workspace/env/
 	doins "${FILESDIR}/05-ksshaskpass.sh"
+	fperms +x /etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
 }
 
 pkg_postinst() {
 	ecm_pkg_postinst
 
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
 	elog "${PN} has been installed as your default askpass application"
 	elog "for Plasma 5 sessions."
 	elog "If that's not desired, select the one you want to use in"
 	elog
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh (ATTN: Path moved!)"
-	elog
-	elog "In order to have ssh-agent start with Plasma 5, do the following:"
-	elog " * Copy the necessary files to your home directory:"
-	elog "   - cp /etc/plasma/startup/10-agent-startup.sh ~/.config/plasma-workspace/env/"
-	elog "   - cp /etc/plasma/shutdown/10-agent-shutdown.sh ~/.config/plasma-workspace/shutdown/"
-	elog " * Edit 10-agent-startup.sh and uncomment the lines enabling ssh-agent."
-	elog " * In 10-agent-shutdown.sh uncomment the respective lines to properly kill"
-	elog "   the agent when the session ends."
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 64178bf680..181b59a8b5 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -17,11 +17,11 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
@@ -30,22 +30,23 @@ src_install() {
 
 	insinto /etc/xdg/plasma-workspace/env/
 	doins "${FILESDIR}/05-ksshaskpass.sh"
+	fperms +x /etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
 }
 
 pkg_postinst() {
 	ecm_pkg_postinst
 
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
 	elog "${PN} has been installed as your default askpass application"
 	elog "for Plasma 5 sessions."
 	elog "If that's not desired, select the one you want to use in"
 	elog
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh (ATTN: Path moved!)"
-	elog
-	elog "In order to have ssh-agent start with Plasma 5, do the following:"
-	elog " * Copy the necessary files to your home directory:"
-	elog "   - cp /etc/plasma/startup/10-agent-startup.sh ~/.config/plasma-workspace/env/"
-	elog "   - cp /etc/plasma/shutdown/10-agent-shutdown.sh ~/.config/plasma-workspace/shutdown/"
-	elog " * Edit 10-agent-startup.sh and uncomment the lines enabling ssh-agent."
-	elog " * In 10-agent-shutdown.sh uncomment the respective lines to properly kill"
-	elog "   the agent when the session ends."
 }