From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- kde-plasma/ksshaskpass/Manifest | 6 +- kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild | 46 -------------- kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild | 52 ++++++++++++---- kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild | 78 ++++++++++++++++++++++++ 4 files changed, 121 insertions(+), 61 deletions(-) delete mode 100644 kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild create mode 100644 kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild (limited to 'kde-plasma/ksshaskpass') diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest index b5cacbdc5cc0..27bf7f83b8ab 100644 --- a/kde-plasma/ksshaskpass/Manifest +++ b/kde-plasma/ksshaskpass/Manifest @@ -1,6 +1,6 @@ AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669 -DIST ksshaskpass-5.16.5.tar.xz 21416 BLAKE2B 832f4fcce536feea013ae3b71f1346e6dc6ddddc6036b000979d0860181a40f2eaf016c0ba59ac1fac929eabeed51a494fa55f8da062d58c27bf9cc711787f72 SHA512 b2ca1245ca55fce2fdd722b5b318bf137efffb9d6ee8ece30706cc369b51e1943f738cd95be29a01fd74e184175f4ce0d6fefdc58a2a621d80358dbfe293cfb9 DIST ksshaskpass-5.17.4.tar.xz 21468 BLAKE2B 29dae019ed6d4ee4806540b4e0ca2d3513faa0c9fea6f566172fa3f07745e354dc8821b41e3a282aa8a038efc80ca830d94af0669cd270d625ede355a27b1736 SHA512 fbb1031fd7541f37c4ad1119ad41ea7df6ca783cc6f1b53d40f7a11635fff1f7f60f6bc6d4860ec5e99caa3f293346cd71d7ddd6e05a28d60e71341eaff40121 -EBUILD ksshaskpass-5.16.5.ebuild 1208 BLAKE2B ea2987af04a4d3f03040a66a782090fd7e6be7194b30bb9dadaf2f0bb01e95b12616efa562563f4171ebbb9489828a37dc44416b394b5d242e1c17ec77d4b43b SHA512 a1cddc2234d04f3df3ad15f81c50e2935c752e9913d69da6b0bb6e0c7a1c6319bc63031a33c183d7b66456fc628fd62f166b020db34562aa1ea6ebedb0012306 -EBUILD ksshaskpass-5.17.4.ebuild 1536 BLAKE2B b11ed5435dfcc4dd3b2c0ceb7f0bcdfd236111b14b251ff313015ad4a16ff98f8c3e0fe12cb6fc62b47eaf4b87b872163e5aecf9f51579a5732142d787ac8cca SHA512 f984c1dd66899ba18ab40686d574a14b67f5d90e23d30ecfe5fce3440fb4d489b9c5b06ba2ec22f89dffa9777b63a7aea8e0def9e80fd277145dae0b16903b85 +DIST ksshaskpass-5.17.5.tar.xz 21372 BLAKE2B 134a533570b75d66cff195819d41b782b67e0f308d6b36efdd7ca223cfb8994baf29506e3cfc34c6786d35eedf792ed6519b40b0f39360468465c76a197c8362 SHA512 c3a6d5b914c13cdd2ca94a237168702729755ba51e036bef1fb5f09f9e7d1c01c176ba14f225c5ae3781434e8fcc047dd250f9da8d3704da09e9712819a5948a +EBUILD ksshaskpass-5.17.4.ebuild 2188 BLAKE2B 38cbcc30ebe8dfe95c8cbe4e383b8c37f54bf0d695afd49f463536234c8ebcf56232868b8b17b6d7d8592ffea9ad25707fdbfe1c9cc85311791cdd8b6e17c28d SHA512 357c980db7c372d8e4fc8f2bbd9fd77392e66f3fb82c49a9d2bb7b55fff1ecdd86dc2d1e09ff89ebdd1b21b385f7f0ce3b44c6f29d5d78c4a37d730554b335c3 +EBUILD ksshaskpass-5.17.5.ebuild 2191 BLAKE2B 1769fa2f03d1e902dcce4334dbaddba73999e3279bda59855b6768fd2ea7a093b494a5359c563ad2f30493da4c793ea2b195054ee964b36455f1967dc348b083 SHA512 6027e74a2b09979f8248ce06e37627b882c4f1f5261d11591b232885a18533506d9355d0b402d70f667cf669a5630304e0549cc0e17dadbc3cba6afc74ee3a66 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild deleted file mode 100644 index bebd3ba15c05..000000000000 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration" -HOMEPAGE="https://cgit.kde.org/ksshaskpass.git" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" - -src_install() { - kde5_src_install - - insinto /etc/plasma/startup - 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 "" -} diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild index 4709b97d6146..e9ba62d4e34c 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" +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 } diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild new file mode 100644 index 000000000000..2eb06335f07a --- /dev/null +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +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 +" +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 + + insinto /etc/xdg/plasma-workspace/env/ + doins "${FILESDIR}/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" + 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 "/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 +} -- cgit v1.2.3