gentoo resync : 10.02.2019

5 files changed, 90 insertions, 13 deletions

diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index b90416347724..0d856891514b 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,5 +1,7 @@
-DIST kdoctools-5.52.0.tar.xz 424648 BLAKE2B 636593722d5e90d8d8dadffab7291f2e4dacfa4d7b11ddd3b8ce9a740c4f3100cb0dac6c2176fd49da80f8300653bf7cd0d85edd3d5eba0de5c99fe693462d80 SHA512 62be111cf594f8e4c3c1591329e26ebb557d8d65fcdcaba679ee8089e4b473a89921f8f640ff6354b6ba99ba731f2b18dec3054576f0d248d6b4fd75e65172b9
+AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.54.0.tar.xz 424772 BLAKE2B 84ca18c87b2a58370d4681ad88ed2f2effdf1d269a1bf550eed3b10a25997160fdc16fb7b39bc8b9816aa5cb3469467b2ab0448c379a6a6b0f10748cd4ec839a SHA512 b389fd1a7b2ea32d13ddca128ed2cb6375856f1c40f83c29a46e9ed1713de6e28e4415743403de37cf1f8a4ddcba4d7cc1e295e5c50443c4faf02939854f72cb
-EBUILD kdoctools-5.52.0.ebuild 754 BLAKE2B 4cf2d508a13181a4843fad575104f8daeb2161e35e8792cd09870fc999243fb2db67a2144ecc601ece5f26730befd4cee030560e901c0ead6b3d6d524637d566 SHA512 922c9d5841655434dae9858e105336c586115001e5c445dd20133e135df3ea0c13fddd7e69f835da41a675aa1632f3de7f39da77919a155e08c9c68269731b6e
-EBUILD kdoctools-5.54.0.ebuild 659 BLAKE2B f5d873bae0150b8a2a45bfa00872f5702f01b528342f6c07b6e5e476d75cf371c740c78eb20fcd7711a6fbde1cf2fbee36daab3d32e4a380800a7f41fbe2e794 SHA512 d905b79cc89bde647179b6d362647166733c52db1a9bb56c4d46821e34859b2d2d6020e36d833d3aac7ce54855005753f8e1218b765592cceb7283df0db510e5
+DIST kdoctools-5.55.0.tar.xz 424852 BLAKE2B a41d701aad709a2558643005be4d9a4facad627836bd2654fe3d9c9418c2d541187af8c02091c7621270381beb21520c515851f36233ded854fb93f0fdbfeccb SHA512 157f7b98b16b8724c66885a2512952230ca8492b2f495d3738f1f4793c24c94b05751c88d4c4c79b3bd942b70e33e5fecb56f855383d883ef1b2f0c1ea8007d1
+EBUILD kdoctools-5.54.0-r1.ebuild 824 BLAKE2B a36dd50fe691451dae54f8de78549ae156761fd34530812fc8996ca114d0c89dc72eabd2cd6f586ab03c68f418e584ba69b633d3f6c0afabb2dab9a08ece3c7d SHA512 50d0488cb1f66d53386e2313efb44eed40a40a5de4940984eb99b235d426be11c6a4deb65190f4a7ef98a0c7f8434c41b3637f43433189cf1f9fbcc310fad44a
+EBUILD kdoctools-5.54.0.ebuild 754 BLAKE2B 21e26b7e322d969dee69f1bb4a0df1ff6f5a78e14021197a2817322a4e0e8f1021253b1d5262e3f258fd9d60b95275d175fc63024287a4c6dea637188f43467f SHA512 a2ce911111472b5f28062615d9d5ab881ba067f99507dbf7b0b9b94ee3c48f9d62571bb51bd2cf96b97a37adb2a868063ec7f45db0afebbbaac6ce05a167db1f
+EBUILD kdoctools-5.55.0.ebuild 735 BLAKE2B 93cb5f57e5312b256e604a806643e2a6883e2f83c55caf3492f6be2ca058afe4100ee7ff2e3eae9bc344c021fd4418f5994b7c9a94cef3aeb58fbf3fab181c52 SHA512 94bec6d7bdb9bd2cb16b91d34cc75afe70f0d3c65e925ff1be4c1b2c2c6617b69a7461419e208d9f962faf7a6fbd6ec7f25268bc6d77097681bb9024c837be8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch
new file mode 100644
index 000000000000..cb6c35f19ff4
--- /dev/null
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch
@@ -0,0 +1,26 @@
+From 79f31819b95fcb0bd3d30630f769706923d41609 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 28 Jan 2019 22:50:56 +0100
+Subject: [PATCH] xslt.cpp: Add /usr/share/help dir to list of paths containing
+ documentation
+
+---
+ src/xslt.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/xslt.cpp b/src/xslt.cpp
+index 1000e33..a0fbe4c 100644
+--- a/src/xslt.cpp
++++ b/src/xslt.cpp
+@@ -494,5 +494,7 @@ QStringList getKDocToolsCatalogs()
+ QStringList KDocTools::documentationDirs()
+ {
+     /* List of paths containing documentation */
+-    return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
++    QStringList docDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("help"), QStandardPaths::LocateDirectory);
++    docDirs.append(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory));
++    return docDirs;
+ }
+-- 
+2.20.1
+
diff --git a/kde-frameworks/kdoctools/kdoctools-5.52.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.54.0-r1.ebuild
index 95d45c0e26ad..f42653740612 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.52.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.54.0-r1.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="nls"
 
-RDEPEND="
+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
@@ -19,11 +24,9 @@ RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 "
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( $(add_frameworks_dep ki18n) )
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo-docbundledir.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/kdoctools/kdoctools-5.54.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.54.0.ebuild
index f37a12e05588..7f4e8ca76700 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.54.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.54.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"
 
 RDEPEND="
@@ -32,3 +32,12 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# bug 665622
+	local myctestargs=(
+		-E "(kdoctools_install)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.55.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.55.0.ebuild
new file mode 100644
index 000000000000..30b8f289d9cf
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.55.0.ebuild
@@ -0,0 +1,37 @@
+# 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
+}