gentoo resync : 15.12.2019

4 files changed, 57 insertions, 61 deletions

diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index a8e6aa031408..a8cc646f28f4 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
-DIST kwallet-5.60.0.tar.xz 308420 BLAKE2B 93eafec141e01c9d77a7ea43cc9e6f7c445717b02ae5a1cea7c7f3bd1e54878c539b674b2ad4ba24fc7b3731b118ed6c71b56b5fadcdc18e1afc4a9ad1fd1ac7 SHA512 8e0d1dbf9d54deaffd1d06394f0e609e4a2dadc12f3aa92f181949bca9a37b48e70414674aef5287576d986d27f58940157d618dd3f8ec24a7a003a3c31d3858
 DIST kwallet-5.64.0.tar.xz 293828 BLAKE2B c42a0c325eb3b5b1cbeb107dd6d302ba257ae73a9c17b7a79a49a0daf978473fa5f9b8229dd4ad6ae742e8834d8b83a8922fbae8de9f56a81e16857b57800b40 SHA512 78a4f2b5587f6bbdbc4b6473083246c6b9f68b4e47093d5061cee1c91b855b1822bdc72437dc25259728ce8cff3d8849d4b343d2fc3921cd05beac1c00159d6d
-EBUILD kwallet-5.60.0.ebuild 1580 BLAKE2B 492d58b45fa94058200db9d917a41e7f16c1add6c51ee290411885bebd5d137abb7d907cea580a02e9d8d2e575d0091424be303956ea3e607a90500737e974cf SHA512 65b3c86c0661c4f7be0e70cac97aa3069cc37c991984a53428c8034c3ec985fb067d3c5e53276221ff59e09cf61970ce56b8dfd28969a3ae3b509818f24b1301
-EBUILD kwallet-5.64.0.ebuild 1434 BLAKE2B 4da627670909297b8f733d85561ae30c2ed668cf949b9f950ed68ceef8617da6bb516cbc7fe6f644fdeaaf1586349a0bab07495c77b52245583221e60dd52250 SHA512 9fe7def4017c9c454727cc2b826715de974b35f5efb1f1b68d878000e03b9c0f88de5a4e35a75d6b99a12130128197899ec2a27893b73166dc71bbcae3314e1f
+DIST kwallet-5.65.0.tar.xz 295064 BLAKE2B 1213df62ad2fc44291254ab1130dfd11b891c5d821ef491e82558d668decca336f576c213e904b05221959e767d6b1a7e579b48915f291ebe9d17a7f9752aa51 SHA512 a73f5934cb63d306207540ff05ad4583353a98aeb59e3b8a0e94a7d0934511e4fe943b6761555c3105f8950b20e4143d484c8a5c068822327077cad6fec7fd90
+EBUILD kwallet-5.64.0.ebuild 1431 BLAKE2B 7eaaaac464dd8e6cbf7bf5b8d499aae2a39b42b2b20634406bb2645f9607719b67f1a626cc936201ed838b5b7064048cc5038780aa401e248fabd9f3da94ede9 SHA512 f330f93aee3e86db627ff94267b07aa816cc3e9e38495a6750c4c621d10deaef9572bdc254eb1553ee3a670362472409db74089f55f25ab87700255845d61911
+EBUILD kwallet-5.65.0.ebuild 1422 BLAKE2B d4d9e41577baf63f2b0deda7c012f45b876dd4b5776aa6eccb55ff114ab1aaff31e94a5acda427c8633c575f70e6559a8a50e9802b78d173dd83390069c31959 SHA512 5cc9b493d93ab198ea9c31992015620446f3ad4c248ab2643db10a8df190989812ae0259a04f43966af38729151946fb4fef8129cd3c0fa2072f485a7f3a367b
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.60.0.ebuild b/kde-frameworks/kwallet/kwallet-5.60.0.ebuild
deleted file mode 100644
index 1e9fd33fbd5a..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.60.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="gpg +man"
-
-BDEPEND="
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libgcrypt:0=
-	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
-		elog
-		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
-		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
-		elog
-	fi
-	if has_version "kde-apps/kwalletd"; then
-		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
-		elog "that still require old kwalletd4. After migration has finished,"
-		elog "kde-apps/kwalletd can be removed."
-	fi
-	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
-}
diff --git a/kde-frameworks/kwallet/kwallet-5.64.0.ebuild b/kde-frameworks/kwallet/kwallet-5.64.0.ebuild
index 309fe1ce6f25..46130c8eb563 100644
--- a/kde-frameworks/kwallet/kwallet-5.64.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.64.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gpg +man"
 
 BDEPEND="
diff --git a/kde-frameworks/kwallet/kwallet-5.65.0.ebuild b/kde-frameworks/kwallet/kwallet-5.65.0.ebuild
new file mode 100644
index 000000000000..29b38aebf152
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.65.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpg +man"
+
+BDEPEND="
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kdbusaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/knotifications-${PVCUT}:5
+	>=kde-frameworks/kservice-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kwindowsystem-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/libgcrypt:0=
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package man KF5DocTools)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
+		elog
+		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
+		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
+		elog
+	fi
+	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+}