commit:     725dbd794d895749b72f42a764482ce60657e794
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 22:00:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 17:28:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=725dbd79

kde-plasma/ksshaskpass: Update env script install path, pkg_postinst

Bug: https://bugs.gentoo.org/688366
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../ksshaskpass/ksshaskpass-5.17.49.9999.ebuild    | 23 +++++++++++-----------
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild     | 23 +++++++++++-----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild 
b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
index 5a545a4040..35f1495c82 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
@@ -22,25 +22,24 @@ RDEPEND="${DEPEND}"
 src_install() {
        kde5_src_install
 
-       insinto /etc/plasma/startup
+       insinto /etc/xdg/plasma-workspace/env/
        doins "${FILESDIR}/05-ksshaskpass.sh"
 }
 
 pkg_postinst() {
        kde5_pkg_postinst
 
-       elog ""
-       elog "In order to have ssh-agent start at kde startup,"
-       elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-       elog "the lines enabling ssh-agent."
-       elog
-       elog "If you do so, do not forget to uncomment the respective"
-       elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-       elog "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 "/etc/plasma/startup/05-ksshaskpass.sh"
-       elog ""
+       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/startup/10-agent-startup.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 5a545a4040..35f1495c82 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -22,25 +22,24 @@ RDEPEND="${DEPEND}"
 src_install() {
        kde5_src_install
 
-       insinto /etc/plasma/startup
+       insinto /etc/xdg/plasma-workspace/env/
        doins "${FILESDIR}/05-ksshaskpass.sh"
 }
 
 pkg_postinst() {
        kde5_pkg_postinst
 
-       elog ""
-       elog "In order to have ssh-agent start at kde startup,"
-       elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-       elog "the lines enabling ssh-agent."
-       elog
-       elog "If you do so, do not forget to uncomment the respective"
-       elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-       elog "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 "/etc/plasma/startup/05-ksshaskpass.sh"
-       elog ""
+       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/startup/10-agent-startup.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."
 }

Reply via email to