gentoo resync : 02.08.2019

3 files changed, 2 insertions, 50 deletions

diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 87784ba60882..db83e90e9377 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,4 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
-DIST kdoctools-5.57.0.tar.xz 426072 BLAKE2B 4446a883199b927904ea420eb01bc28301bb5a49c0ac1977229b2227a68c630f29156bdb26b1308abfc2fa30371663bd91a366e8aaa60ec0891b2c1dad7e6b07 SHA512 b4428e106414768d11cfa8cd285fca17b7ee088b89138f394a62ad5209ab89e9364d623180ccf73faad8e2ed902ec38dc4548259355ab1cebce75148de71a722
 DIST kdoctools-5.60.0.tar.xz 426728 BLAKE2B b5fef9874fa07bc697cdb89d80f19d58f510b02c4d98d358920282b673c7be49644b1f38e8d48df7dcbb2b2d1ec920f1f6ea39df11f8939b996b310230fe1375 SHA512 0ef93030b14d99b95768370e4c9639bdbb2d5e31fa604ed216a101e372e0ccb9197c9f68eb961c7552e0a4e3523f5efc654d3c3a0bd8750539b866898a9f38fd
-EBUILD kdoctools-5.57.0.ebuild 829 BLAKE2B 5a2b69f0a6c2618af632542e459de1aab724cc0f4497fb2160cb4152e2fb58a012f1e906a851bce630a1175b90f8d8bd9813a6849a4f18bc34303107cd6db0fe SHA512 e15908d253cce8adea7a11ed2e424a14211e6a9067bae934529b3206fdf3229c368cbe018d93c2ce6b4c0e643f42225a313d4c2ee12e8e04c9f4fbe73ecbbde8
-EBUILD kdoctools-5.60.0.ebuild 832 BLAKE2B 196d19d7342de8c5c55d03824e8bc05096cc0de00d9db180d09d85244ed703b7c144294bd5a7bd67429e00dbdaa3cdf5f7f39a61188e7360b5aa847bd2440d76 SHA512 97ec366935ac281a524d025feb514f641a01e323120f3e12a952c31ec817b62ed5506bd5ce1c69a960cb9a3c0a1747e089ed9f3aa4ba47a4630a37dd4549251b
+EBUILD kdoctools-5.60.0.ebuild 829 BLAKE2B 5a2b69f0a6c2618af632542e459de1aab724cc0f4497fb2160cb4152e2fb58a012f1e906a851bce630a1175b90f8d8bd9813a6849a4f18bc34303107cd6db0fe SHA512 e15908d253cce8adea7a11ed2e424a14211e6a9067bae934529b3206fdf3229c368cbe018d93c2ce6b4c0e643f42225a313d4c2ee12e8e04c9f4fbe73ecbbde8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.57.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.57.0.ebuild
deleted file mode 100644
index 1ca1508df78b..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.57.0.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
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( $(add_frameworks_dep ki18n) )
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	app-text/sgml-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package nls KF5I18n)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.60.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.60.0.ebuild
index 33355540123c..1ca1508df78b 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.60.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.60.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="