public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2015-01-14  0:51 Manuel Rüger
  0 siblings, 0 replies; 14+ messages in thread
From: Manuel Rüger @ 2015-01-14  0:51 UTC (permalink / raw
  To: gentoo-commits

commit:     cbc3f998b13dab603e7c3fa303a97850f1802a64
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 14 00:51:33 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 00:51:33 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cbc3f998

[kde-plasma/ksshaskpass] Initial version.

Package-Manager: portage-2.2.15

---
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild | 24 ++++++++++++++++++++++++
 kde-plasma/ksshaskpass/metadata.xml            |  5 +++++
 2 files changed, 29 insertions(+)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
new file mode 100644
index 0000000..4b32446
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="kde-apps.org/content/show.php?content=50971"
+
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/ksshaskpass
+"

diff --git a/kde-plasma/ksshaskpass/metadata.xml b/kde-plasma/ksshaskpass/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-plasma/ksshaskpass/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2015-01-14  1:37 Johannes Huber
  0 siblings, 0 replies; 14+ messages in thread
From: Johannes Huber @ 2015-01-14  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     92db35d7d9b51efc9377346ff9f0a5662ad55a3c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 14 01:31:19 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 01:31:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=92db35d7

[kde-plasma/ksshaskpass] Update DEPEND and HOMEPAGE

Package-Manager: portage-2.2.15

---
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 4b32446..dd307c6 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -7,8 +7,7 @@ EAPI=5
 inherit kde5
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="kde-apps.org/content/show.php?content=50971"
-
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
 KEYWORDS=""
 IUSE=""
 
@@ -17,6 +16,7 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtwidgets:5
 "
 RDEPEND="
 	${DEPEND}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2015-01-14  1:37 Johannes Huber
  0 siblings, 0 replies; 14+ messages in thread
From: Johannes Huber @ 2015-01-14  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     99ebc66f34cd1bf1caf5339429d9e6f7f693249d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 14 01:37:08 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 01:37:08 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=99ebc66f

[kde-plasma/ksshaskpass] Version bump

Package-Manager: portage-2.2.15

---
 kde-plasma/ksshaskpass/ksshaskpass-5.1.95.ebuild | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.1.95.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.1.95.ebuild
new file mode 100644
index 0000000..3555322
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.1.95.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/ksshaskpass
+"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2016-07-24 11:58 Johannes Huber
  0 siblings, 0 replies; 14+ messages in thread
From: Johannes Huber @ 2016-07-24 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     fb47b1e9bf9345573e09ab4eefde467e8c87b889
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 11:57:39 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 11:57:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb47b1e9

kde-plasma/ksshaskpass: Update blocker

Due to pkg move in gentoo main tree.

Package-Manager: portage-2.3.0

 kde-plasma/ksshaskpass/ksshaskpass-5.7.49.9999.ebuild | 2 +-
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.7.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.7.49.9999.ebuild
index b917786..1f2d92c 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.7.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.7.49.9999.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!net-misc/ksshaskpass
+	!kde-plasma/ksshaskpass:4
 "
 
 src_install() {

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index b917786..1f2d92c 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!net-misc/ksshaskpass
+	!kde-plasma/ksshaskpass:4
 "
 
 src_install() {


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2019-10-22 20:06 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2019-10-22 20:06 UTC (permalink / raw
  To: gentoo-commits

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."
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2019-10-23  9:27 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2019-10-23  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2365dd8d43b2917e4dcec735e8e76195ec8c85c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 09:26:52 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 09:26:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2365dd8d

kde-plasma/ksshaskpass: Fix pkg_postinst paths

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

 kde-plasma/ksshaskpass/ksshaskpass-5.17.1.ebuild       | 4 ++--
 kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild | 4 ++--
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.1.ebuild
index 481d10022a..9e6cbd72bd 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.1.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.1.ebuild
@@ -37,8 +37,8 @@ pkg_postinst() {
 	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 "   - 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-5.17.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
index 35f1495c82..4303aedc45 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
@@ -37,8 +37,8 @@ pkg_postinst() {
 	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 "   - 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 35f1495c82..4303aedc45 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -37,8 +37,8 @@ pkg_postinst() {
 	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 "   - 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."


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2019-12-22 13:46 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2019-12-22 13:46 UTC (permalink / raw
  To: gentoo-commits

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."
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2019-12-22 20:34 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2019-12-22 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3293034ed718aaee2de79c999b53f313ce2beec1
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 20:16:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3293034e

kde-plasma/ksshaskpass: Add old script migration, update postinst

Follow-up to bdb0f5267d00191069c4bf88b98fe759441a2a2b and
77aa9069fe3cc4680c446a3d9ecd2f5f695f171d.

Bug: https://bugs.gentoo.org/688366
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    | 33 ++++++++++++++++++++--
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild     | 33 ++++++++++++++++++++--
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
index b444897de0..7d2b01d201 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
@@ -25,6 +25,28 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	ecm_pkg_setup
+
+	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
+	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
+	if [[ -f "${EROOT}"${srcfile} ]]; then
+		local md5=$(md5sum "${EROOT}"${srcfile})
+		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
+			elog "Existing modified "${EPREFIX}"${srcfile} detected."
+			elog "Copying to "${EPREFIX}"${newfile}..."
+			cp -v "${EROOT}"${srcfile} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
+		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
+	fi
+}
+
 src_install() {
 	ecm_src_install
 
@@ -37,7 +59,7 @@ 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 "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
 	elog "and uncomment the lines enabling ssh-agent."
 	elog
 	elog "If you do so, do not forget to uncomment the respective"
@@ -47,6 +69,11 @@ pkg_postinst() {
 	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 "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 script
+	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
+	fi
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 181b59a8b5..bea3649085 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -25,6 +25,28 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	ecm_pkg_setup
+
+	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
+	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
+	if [[ -f "${EROOT}"${srcfile} ]]; then
+		local md5=$(md5sum "${EROOT}"${srcfile})
+		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
+			elog "Existing modified "${EPREFIX}"${srcfile} detected."
+			elog "Copying to "${EPREFIX}"${newfile}..."
+			cp -v "${EROOT}"${srcfile} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
+		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
+	fi
+}
+
 src_install() {
 	ecm_src_install
 
@@ -37,7 +59,7 @@ 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 "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
 	elog "and uncomment the lines enabling ssh-agent."
 	elog
 	elog "If you do so, do not forget to uncomment the respective"
@@ -47,6 +69,11 @@ pkg_postinst() {
 	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 "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 script
+	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
+	fi
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2019-12-22 21:10 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2019-12-22 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     8663d2456e66081183896447811f6abbcf3dd2b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 14:20:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 21:09:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8663d245

kde-plasma/ksshaskpass: No fperms on /etc/xdg/plasma-workspace/env/

...necessary.

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

 kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild | 1 -
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
index 7d2b01d201..55a8bf623e 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.49.9999.ebuild
@@ -52,7 +52,6 @@ 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() {

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index bea3649085..c3ed60814f 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -52,7 +52,6 @@ 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() {


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2020-10-04 16:25 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-10-04 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     ec2afab1e1da8ad694f95010ba144e2108204a98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 15:43:09 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 15:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec2afab1

kde-plasma/ksshaskpass: rm obsolete /etc/plasma{/startup,}

Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/ksshaskpass/ksshaskpass-5.19.90.ebuild      | 1 +
 kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild | 1 +
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.19.90.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.90.ebuild
index e68d016a8f..1f3b0b24de 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.19.90.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.19.90.ebuild
@@ -75,4 +75,5 @@ pkg_postinst() {
 		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
 		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
 	fi
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
index da90925f6c..38fc551e6e 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
@@ -75,4 +75,5 @@ pkg_postinst() {
 		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
 		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
 	fi
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 04358ad1c8..d312e55141 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -75,4 +75,5 @@ pkg_postinst() {
 		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
 		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
 	fi
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2020-10-11 11:08 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-10-11 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     bad917c33fba7fb04ccb2d28e957d0689e4057c7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 08:08:05 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 08:34:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bad917c3

kde-plasma/ksshaskpass: Drop unused var, add not replace HOMEPAGE

Tweak DESCRIPTION.

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

 kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild       | 5 ++---
 kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild | 5 ++---
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild         | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
index 1f3b0b24de..74622de790 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
@@ -4,12 +4,11 @@
 EAPI=7
 
 KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.0
 inherit ecm kde.org
 
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
index 38fc551e6e..fcb93a585b 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
@@ -4,12 +4,11 @@
 EAPI=7
 
 KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.0
 inherit ecm kde.org
 
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index d312e55141..90b12a9625 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -4,12 +4,11 @@
 EAPI=7
 
 KFMIN=9999
-PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.0
 inherit ecm kde.org
 
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2020-10-11 11:08 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-10-11 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     82a4b5b8b62c9dfa0bc50eb2ec5278a8223dddc1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 08:11:36 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 08:34:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=82a4b5b8

kde-plasma/ksshaskpass: Cleanup pre-5.17 migration code

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

 kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild   | 28 +---------------------
 .../ksshaskpass/ksshaskpass-5.20.49.9999.ebuild    | 28 +---------------------
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild     | 28 +---------------------
 3 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
index 74622de790..3b6631f533 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
@@ -24,28 +24,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
 src_install() {
 	ecm_src_install
 
@@ -69,10 +47,6 @@ pkg_postinst() {
 	elog "If that's not desired, select the one you want to use in"
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
 
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
+	# Clean up pre-5.17.4 dirs
 	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
index fcb93a585b..114c496db8 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.49.9999.ebuild
@@ -24,28 +24,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
 src_install() {
 	ecm_src_install
 
@@ -69,10 +47,6 @@ pkg_postinst() {
 	elog "If that's not desired, select the one you want to use in"
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
 
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
+	# Clean up pre-5.17.4 dirs
 	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 90b12a9625..77949b1a2b 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -24,28 +24,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
 src_install() {
 	ecm_src_install
 
@@ -69,10 +47,6 @@ pkg_postinst() {
 	elog "If that's not desired, select the one you want to use in"
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
 
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
+	# Clean up pre-5.17.4 dirs
 	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2023-12-16 11:23 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2023-12-16 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     001302b33e44f5a8c100c59990ddb750e98a6a2e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 11:20:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 11:23:00 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=001302b3

kde-plasma/ksshaskpass: Drop obsolete pre-5.17.4 /etc/plasma cleanup

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/ksshaskpass/ksshaskpass-5.27.49.9999.ebuild | 3 ---
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild         | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.27.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.27.49.9999.ebuild
index 4f90cf7f3b..8a5b3182a4 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.27.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.27.49.9999.ebuild
@@ -46,7 +46,4 @@ pkg_postinst() {
 	elog "for Plasma 5 sessions."
 	elog "If that's not desired, select the one you want to use in"
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 dirs
-	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index aa18e3c795..c730311bf5 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -46,7 +46,4 @@ pkg_postinst() {
 	elog "for Plasma 6 sessions."
 	elog "If that's not desired, select the one you want to use in"
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 dirs
-	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/
@ 2023-12-16 11:23 Andreas Sturmlechner
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2023-12-16 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     084aa4575091450817730267a31901d975afea4a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 11:21:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 11:23:00 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=084aa457

kde-plasma/ksshaskpass: add kde-invent upstream metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/ksshaskpass/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-plasma/ksshaskpass/metadata.xml b/kde-plasma/ksshaskpass/metadata.xml
index d925f24397..8a7cc7ffeb 100644
--- a/kde-plasma/ksshaskpass/metadata.xml
+++ b/kde-plasma/ksshaskpass/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/ksshaskpass</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2023-12-16 11:23 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-22 13:46 [gentoo-commits] proj/kde:master commit in: kde-plasma/ksshaskpass/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-12-16 11:23 Andreas Sturmlechner
2023-12-16 11:23 Andreas Sturmlechner
2020-10-11 11:08 Andreas Sturmlechner
2020-10-11 11:08 Andreas Sturmlechner
2020-10-04 16:25 Andreas Sturmlechner
2019-12-22 21:10 Andreas Sturmlechner
2019-12-22 20:34 Andreas Sturmlechner
2019-10-23  9:27 Andreas Sturmlechner
2019-10-22 20:06 Andreas Sturmlechner
2016-07-24 11:58 Johannes Huber
2015-01-14  1:37 Johannes Huber
2015-01-14  1:37 Johannes Huber
2015-01-14  0:51 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox