diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-22 14:45:11 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-22 19:57:58 +0100 |
commit | d82536728651a74bb9e3db51040aeded8824df89 (patch) | |
tree | 413a3e47745ff9fb52f0f25b9536c6fd27a38b00 /kde-plasma/ksshaskpass | |
parent | kde-plasma/plasma-workspace: Improve old script detection/migration (diff) | |
download | gentoo-d82536728651a74bb9e3db51040aeded8824df89.tar.gz gentoo-d82536728651a74bb9e3db51040aeded8824df89.tar.bz2 gentoo-d82536728651a74bb9e3db51040aeded8824df89.zip |
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@gentoo.org>
Diffstat (limited to 'kde-plasma/ksshaskpass')
-rw-r--r-- | kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild index 4709b97d6146..1d96ba90764a 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild @@ -10,20 +10,43 @@ 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="~amd64 ~arm ~arm64 ~x86" 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}" +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 @@ -34,17 +57,22 @@ src_install() { 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" + 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." + 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 } |