gentoo resync : 15.12.2019

4 files changed, 100 insertions, 97 deletions

diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index f63ec50efed1..95e9b9b6e894 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,5 +1,5 @@
-DIST kdelibs4support-5.60.0.tar.xz 3506364 BLAKE2B 6ab53cb0940ed01c2d286afa7a13f01e3f143a5ea56a7159e23486ca3eb522aa3043965e431c6a0cdd0708fe1e3f608c812c6cd5b05e23f5e19627a44c9578b1 SHA512 99d3735a1c61b72fb7c3d080acfad565e22da005710285eba97b13e758a5a7be9ab59a30759035e8627ea3f459d386e7016283ad8b83e36e670b57a3c6d3006b
 DIST kdelibs4support-5.64.0.tar.xz 3517040 BLAKE2B 5df22c4d02aa1ce6e980a6ba8d4ce53430ddc8eeb518be95b75aaa491703954f683db9db8d62077a882bfa0cb961600c604582372ea86511d8296239f24039a5 SHA512 7c87b2e02e569e684bb7532421ced3f8bb28171b899cfecc05f16e8e30b64515812c80a3ca3c79d4af7e2cfd5bd7b7fbbf586559948207193adb2692e57de433
-EBUILD kdelibs4support-5.60.0.ebuild 2203 BLAKE2B b04d3514545f0bc63b8207398f99c3c417d905680a607cc50a6ecd7fe36f8b6dca5315d7df15348991455accea99cb240fab8a909f54b445566a81e7868f0946 SHA512 85e13b0e3b4bad57cfd3c9b297ae4643b531fa9f2bc2d823c9ae805f0a0e607e403e0a5702b10c529af05be7e10d66f8668ef6a2d5cda814fc78e389d02308cc
-EBUILD kdelibs4support-5.64.0.ebuild 2508 BLAKE2B c1b6e9f3aa517622202f7ccb33d26f62809d098ffd443d2fdae6625f4902c313aa58e92011531a6239ff14f6ef50936867b3cbe4f11f7e1d79061680aea692ef SHA512 cef16781fcee19a3d73ae1f038d22e352934542fcab4b03d792d3df8f4cd644bc24969d5a2910e7046fdbf6b4445a4ef111971d2039897562a320ca746621c1d
+DIST kdelibs4support-5.65.0.tar.xz 3514060 BLAKE2B 5050b8a1c27564511a2d7e1b8e577e0d16c32e258b7096c76f0356f4361530fbfd68ed39b4aab593bc4a0726b9b0a47d5e261f236fa0426b0d2faaf85b7fb93a SHA512 5d41561a28999d460099fc97e69ba76340f9f46e67725dd9a66a5f8fdf5e6395f17908f997ecf84656d3fb7712490772df561a4122da946041f2c85d2053f341
+EBUILD kdelibs4support-5.64.0.ebuild 2505 BLAKE2B a15ef1eae15c9bd9d85ca0f052527af089901aafabc594b3dd0ba83bed91cc6d1e4772b4240891f370999ede246d6684f93496cb5c914f271415614735b90dec SHA512 d4aaab2abc9d33b059e4b39991ab8581ef5ea71c4f634bab6e92e7b893ece9e31ee6fb2117a6f54b5aa2b92e1c6bbf1844e316a0ada8c8465872f258eded34ef
+EBUILD kdelibs4support-5.65.0.ebuild 2502 BLAKE2B d4026ca15dfc46488c7bda914329324afeaa5b4a8c7db10e46b6c07637795fa1eb2911bc81866b2e88d87606dc2773d382cf1b763b97317ca8331c97c6fd7b11 SHA512 7e7a56b622fb4e02f5d75b3f76a480843c96f508db755102843bb687801c1b219c1a6afef6a53136e36d97d2e0499a20f90fd221e0d52315c68844defc555316
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.60.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.60.0.ebuild
deleted file mode 100644
index 736392194cf5..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.60.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="true"
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="libressl X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	app-text/docbook-xml-dtd:4.2
-	virtual/libintl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	test? ( $(add_qt_dep qtconcurrent) )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kitemmodels)
-	$(add_qt_dep qtxml)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	if ! use handbook; then
-		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild
index 2f990024c493..3440f2eda860 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="libressl X"
 
 BDEPEND="
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.65.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.65.0.ebuild
new file mode 100644
index 000000000000..35c41db0df77
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.65.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kauth-${PVCUT}:5
+	>=kde-frameworks/kcodecs-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${PVCUT}:5
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kcrash-${PVCUT}:5
+	>=kde-frameworks/kdbusaddons-${PVCUT}:5
+	>=kde-frameworks/kded-${PVCUT}:5
+	>=kde-frameworks/kdesignerplugin-${PVCUT}:5
+	>=kde-frameworks/kdoctools-${PVCUT}:5
+	>=kde-frameworks/kemoticons-${PVCUT}:5
+	>=kde-frameworks/kglobalaccel-${PVCUT}:5
+	>=kde-frameworks/kguiaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kiconthemes-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+	>=kde-frameworks/kitemviews-${PVCUT}:5
+	>=kde-frameworks/kjobwidgets-${PVCUT}:5
+	>=kde-frameworks/knotifications-${PVCUT}:5
+	>=kde-frameworks/kparts-${PVCUT}:5
+	>=kde-frameworks/kservice-${PVCUT}:5
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+	>=kde-frameworks/kunitconversion-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kwindowsystem-${PVCUT}:5
+	>=kde-frameworks/kxmlgui-${PVCUT}:5
+	>=kde-frameworks/solid-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	app-text/docbook-xml-dtd:4.2
+	virtual/libintl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kinit-${PVCUT}:5
+	>=kde-frameworks/kitemmodels-${PVCUT}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use handbook; then
+		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}