commit:     1ba24fece412632e75365787b0206c30b663f3a3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 22:09:26 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 20:04:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ba24fec

kde-plasma/plasma-workspace: Update pkg_postinst

Keep old locations for now, but instruct users to copy to home directory.

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>

 kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild | 9 +++++++--
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild         | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
index be2b0fd5b6..9b09701f3a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
@@ -163,6 +163,11 @@ src_install() {
 pkg_postinst () {
        kde5_pkg_postinst
 
-       elog "TODO: /etc/plasma/{startup,shutdown} locations for 
gpg-agent/ssh-agent"
-       elog "do not currently work, see bug #688366."
+       elog "To enable gpg-agent and/or ssh-agent in Plasma sessions, 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/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index d975b23a77..4b7748e6ca 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -164,6 +164,11 @@ src_install() {
 pkg_postinst () {
        kde5_pkg_postinst
 
-       elog "TODO: /etc/plasma/{startup,shutdown} locations for 
gpg-agent/ssh-agent"
-       elog "do not currently work, see bug #688366."
+       elog "To enable gpg-agent and/or ssh-agent in Plasma sessions, 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