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 }