gentoo resync : 18.11.2019

3 files changed, 74 insertions, 72 deletions

diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index b99cab4013ff..780d7752eac6 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.60.0.tar.xz 2081160 BLAKE2B 9c38c63af99c4ec8ca4e4c6e31ff01eec9a917ef085771eb9ef8a13498f733d8226a735a441ee554b45baf6731b991f67cd537ed4fe761e465c909e6116d82a8 SHA512 97e6fe62ef8afd05e5798b7fb92906f9cd6e8094d993605c90a0b35f7e10ba2e2d5e735083be09ce51356ad2d13d07122a2468c3e947a19ea9678e32c311e811
-DIST khtml-5.63.0.tar.xz 2083564 BLAKE2B 06c258dad11065e928f1ddab607592debbd7303babb40b5e96816aae8d4685bc54aa388292f7ffd9912dcc331aed06b4d0f6c256a895a7d2a1699419f11e28e1 SHA512 b2e80b853bf14aef34d9774e9fa552c2aed2a4d4cdd5b83bd9a045f84bf5718b4099374e10f85185632ab58c576970a22caf5584524ff57b96fb6ef806d8920f
+DIST khtml-5.64.0.tar.xz 2083068 BLAKE2B 652d097d3b628e2aca16e70bf79e92955c55a5ec5aaa8cbdb9ca6019bd66b0f1b0157931c24248691e78edca38a9c260ff0170d9c0595ee19e30930df428db91 SHA512 920412d9526fc478817b4aaf9a762d75f109f69af3a9eccea8f4a9e855e17666e47b65548f430f0f654ea87afba7d556357d8dd1a910c6a466e1aeb1a9ee9d5e
 EBUILD khtml-5.60.0.ebuild 1595 BLAKE2B 16ad7c591eaf71a3eaebbc82c7a72847a59566789863960f233de3e9f338446c0ddb960ed5fa91790899e42659efe37a223a31e011e31af1279d62e5f3b6a412 SHA512 255507edecde5e1bc7d15b065d36648690c79741fc9997430bee7852f8d3a531f0b44fbb941083c7486fe18806c82beac4f8761cc1a5f13b7043e36fdbc9ef3d
-EBUILD khtml-5.63.0.ebuild 1598 BLAKE2B 86d13ad2a1e5da43152c0ac1879a71dc4006910d4d336ee8d0dbe71149a03fb32be3da59b82f32c437fe5bd9c1cb7ff17ad888877ebfb05b6a1ae97dc6dc5740 SHA512 565410e34ecbcd6e26fbe0de98ac8961a0256c4ef2197ab5f376b5700198f82608ded6d5dfd001448a2a312519052c1b50321a14317e6a1db83f7895b627142f
+EBUILD khtml-5.64.0.ebuild 1811 BLAKE2B 7b3394fe36b39da4bf9b695f9d19493c9aa48fbf3df140dfa7b9826e64d0996b46fd92f39c8c66b89202a185733603fc304202f22ab073e338834ccb7a3b62cb SHA512 1d0f2660cbd11c73fa2950daebe451ca6965eeb67854018da2af6854f4a9fb21a6a0879373b97b5c115a08a71e11460968625e8ba855d1694c44a82ddc465dea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.63.0.ebuild b/kde-frameworks/khtml/khtml-5.63.0.ebuild
deleted file mode 100644
index 29c6260dec32..000000000000
--- a/kde-frameworks/khtml/khtml-5.63.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	virtual/jpeg:0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qtx11extras) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.64.0.ebuild b/kde-frameworks/khtml/khtml-5.64.0.ebuild
new file mode 100644
index 000000000000..efd1781b4dcf
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.64.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+	dev-lang/perl
+	dev-util/gperf
+"
+RDEPEND="
+	>=kde-frameworks/karchive-${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/kglobalaccel-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kiconthemes-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+	>=kde-frameworks/kjobwidgets-${PVCUT}:5
+	>=kde-frameworks/kjs-${PVCUT}:5
+	>=kde-frameworks/knotifications-${PVCUT}:5
+	>=kde-frameworks/kparts-${PVCUT}:5
+	>=kde-frameworks/kservice-${PVCUT}:5
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+	>=kde-frameworks/kwallet-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kwindowsystem-${PVCUT}:5
+	>=kde-frameworks/kxmlgui-${PVCUT}:5
+	>=kde-frameworks/sonnet-${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/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	virtual/jpeg:0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}