gentoo resync : 25.11.2020

3 files changed, 12 insertions, 37 deletions

diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 7c3ca57c687d..601b14ecec86 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.18.5.tar.xz 22148 BLAKE2B 31521b28a840bfbb14cdef2484dde8908a0ffbeda5d54663243bd93a070d77d72019b5436f0a4f838e7c8b9f60992b06636e181b6ced51d17a13ba4f7c3918b6 SHA512 8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf
 DIST ksshaskpass-5.19.5.tar.xz 23572 BLAKE2B c399be04e33a51968c7c3d962039f7aaff176c7a14bb5d8d2da36e999908aba1f3fa07337412390470cab1342a70bd37b2241b750e7bf852980c77810f311873 SHA512 7bd70985cb4a133e49d58b27c9266222913097154b78f60fc55b7ea3e684723b3ae55cdd0b44f58dd7c2cb54cc2f6046907b7881355b437689d9e470c2aafdd4
-EBUILD ksshaskpass-5.18.5.ebuild 2200 BLAKE2B d61278bda981d6764b8472b12884bf4c6685d788eddbeab0acb76d1d7da7460040abbb73a88c092947b14ef303d730e27ccffadccba946676ac36476474692b9 SHA512 411797a3eaaf443b8236fa3f87124224baf03b91ab806bb56b238660529b0ea14e772afc4cdda82b9d5e13fddb7ba4e116ad97fbb97e64f922d62617fe5d90a9
-EBUILD ksshaskpass-5.19.5.ebuild 2203 BLAKE2B d303576af08258a574fec28f8e1081ccea26d76a24fe1e0dcbb0cba1a62209864096989eca4d083f5473da4a5d778c1a47331bfa2d4df661d778641fd9c89812 SHA512 8837b123097b2504e43ad5499e7bb818125bc7ed12ee5292ca539ba8e2924fa6a20ecf526e77cbcccf8705de262501b996555271444bda0ceab7f659fe75f0fb
+DIST ksshaskpass-5.20.3.tar.xz 23516 BLAKE2B a8c868df495307003765488bb8a2b1ac4c39470905944d696a24f1b8dd49fd7f03e8eae7b10556fe94d8a8ff29e949357dd92aa208f075a15666aad637cb96c7 SHA512 e072f04b187f0047a12ac0e1ee02c28bbaffcd89650a98f9e16bef36c074a1ac9b84a861c6a9e379e8bdc1329cca5afbb1b03ec7dbec36b4027297e7fa988992
+EBUILD ksshaskpass-5.19.5-r1.ebuild 2256 BLAKE2B 5f2dc91ac1d7282916293f3688a02097d356b253d3c3a490e7b9aafb7e7229ddc9ccf41bcd49a5cf6b3d598e44bcfad3a844ecc2a0ea4e2fb926cd7456e8956c SHA512 1c9f0696fe8a7f109eea8508ab1888023eff5b3c5ef1c90706b78952c65a76a4d43ee5160f96de01d626591fd0546254ee3f0ad3d7bb7a4b95829341d18e76e8
+EBUILD ksshaskpass-5.20.3.ebuild 1436 BLAKE2B 09032ed1f73d570d966c8da06d23ccf3cb17be74cd42d72b59a718c8070692c33e82a82eb38a2effaba225944ee38b7457108b919b2c16b0a04a64f6fc768772 SHA512 0b06ec5fb4fe0be972bdf3c74f679eb1e4eb6c6d0010f5db26f9998e104573616e73d140bae2e38909db97f73db946b6f85b1498eb5b3b0477abdb3b57ce6103
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
index 7555b875998c..92cb90f82a19 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
@@ -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.19.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild
index b954ef9eec32..004a7a7eb33f 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 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"
@@ -25,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
 
@@ -70,9 +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
 }