gentoo resync : 15.09.2019

3 files changed, 3 insertions, 96 deletions

diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 106bb48b1e58..bcd657d17c11 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,7 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
-AUX kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch 3512 BLAKE2B c7c63ba7cab552993ade973a700dd4459a88e30cff65724d8650f5148115848894d7de445b4106b1a05b9781a189a7080b5c89508e64ab3a16c61e044fc3bff3 SHA512 b7f53b5fd9f560af1246f7d31b9d78f3413177c848772285c5b38ddf5ca37aa3048cc8ae0883c374020cf12d3fafa458c4ca28714ce17cd9041a6d1f9c4947c2
 DIST kdoctools-5.60.0.tar.xz 426728 BLAKE2B b5fef9874fa07bc697cdb89d80f19d58f510b02c4d98d358920282b673c7be49644b1f38e8d48df7dcbb2b2d1ec920f1f6ea39df11f8939b996b310230fe1375 SHA512 0ef93030b14d99b95768370e4c9639bdbb2d5e31fa604ed216a101e372e0ccb9197c9f68eb961c7552e0a4e3523f5efc654d3c3a0bd8750539b866898a9f38fd
-DIST kdoctools-5.61.0.tar.xz 428156 BLAKE2B c31b1e09d1f3cbe6d96f9cf8fba2fe8052454e58767c86f4f662c976fda46f1da185aea0331828a47f435d167dcdc42d75dbc9e0b5c123bc4c6f710a336f75d7 SHA512 e4021eba26d9c1fba028d8c958997a9b4e7a20d7e4468c70b8b128c70c51f61e08287ee8c3a135799b8f610748121e51e565bacb072d16a7b8f7241aede52ac3
+DIST kdoctools-5.62.0.tar.xz 427696 BLAKE2B 99d2fbfc6c58e6ce80602f43c40c8703ea89d919b6d58e7197331831616dd3b2d3690792d39d71271bfc906ba37e9bf27a9fcb72d13edd4d9c4280c835311592 SHA512 6256250a19a0326400a928abc29d1daa79abc3f5ee02ce766ca3a5f3cc7d00ea1151d8625cfbcead3c13f93de1c2a92ed4d8b90e5fa78be3e46fde10793c282d
 EBUILD kdoctools-5.60.0.ebuild 829 BLAKE2B 5a2b69f0a6c2618af632542e459de1aab724cc0f4497fb2160cb4152e2fb58a012f1e906a851bce630a1175b90f8d8bd9813a6849a4f18bc34303107cd6db0fe SHA512 e15908d253cce8adea7a11ed2e424a14211e6a9067bae934529b3206fdf3229c368cbe018d93c2ce6b4c0e643f42225a313d4c2ee12e8e04c9f4fbe73ecbbde8
-EBUILD kdoctools-5.61.0-r1.ebuild 888 BLAKE2B 8a7b913fa05d85dde55d48bd4b10cc5adab9f0bceb82c429cf02d7168f91ba9cadb86b7b95f8c0d68621523f8153bb965f71e67f61615ac8af7cf6b5d10fb7d0 SHA512 d60811341ae75ac17b975def60a87be2f3f566971f53b3a9229792fa2f68f7fb8ca6664d771bdf6ea94c49c1a8ba83404dcd7093dbd84a7b86923b707bf42dc3
+EBUILD kdoctools-5.62.0.ebuild 832 BLAKE2B 196d19d7342de8c5c55d03824e8bc05096cc0de00d9db180d09d85244ed703b7c144294bd5a7bd67429e00dbdaa3cdf5f7f39a61188e7360b5aa847bd2440d76 SHA512 97ec366935ac281a524d025feb514f641a01e323120f3e12a952c31ec817b62ed5506bd5ce1c69a960cb9a3c0a1747e089ed9f3aa4ba47a4630a37dd4549251b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch b/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch
deleted file mode 100644
index ea250cb305ce..000000000000
--- a/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 2a23bf672f25da3a0b6619969f308133fbd92a7c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 17 Aug 2019 22:42:39 +0200
-Subject: [PATCH] KF5DocToolsMacros.cmake: Use non-deprecated KDEInstallDirs
- variables
-
-Summary:
-HTML_INSTALL_DIR -> KDE_INSTALL_DOCBUNDLEDIR
-MAN_INSTALL_DIR -> KDE_INSTALL_MANDIR
-
-BUG: 410998
-
-Test Plan: Install paths are correct by example of marble.
-
-Subscribers: kde-frameworks-devel, kde-doc-english
-
-Tags: #frameworks, #documentation
-
-Differential Revision: https://phabricator.kde.org/D23229
----
- KF5DocToolsMacros.cmake | 30 +++++++++++++++++++-----------
- 1 file changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/KF5DocToolsMacros.cmake b/KF5DocToolsMacros.cmake
-index 88a2b3e..91d8736 100644
---- a/KF5DocToolsMacros.cmake
-+++ b/KF5DocToolsMacros.cmake
-@@ -63,13 +63,13 @@
- #
- #   KDOCTOOLS_INSTALL(po) does the following:
- #   - Create man pages from footool.1.docbook and footool.conf.5.docbook,
--#     install them in ${MAN_INSTALL_DIR}/fr
-+#     install them in ${KDE_INSTALL_MANDIR}/fr
- #   - Create handbooks from index.docbook files, install the one from the
--#     fooslave/ directory in ${HTML_INSTALL_DIR}/fr/kioslave5/fooslave
--#     and the one from the docs/ directory in $[HTML_INSTALL_DIR}/fr
-+#     fooslave/ directory in ${KDE_INSTALL_DOCBUNDLEDIR}/fr/kioslave5/fooslave
-+#     and the one from the docs/ directory in ${KDE_INSTALL_DOCBUNDLEDIR}/fr
- #
--#   If ${HTML_INSTALL_DIR} is not set, share/doc/HTML is used instead.
--#   If ${MAN_INSTALL_DIR} is not set, share/man/<lang> is used instead.
-+#   If ${KDE_INSTALL_DOCBUNDLEDIR} is not set, share/doc/HTML is used instead.
-+#   If ${KDE_INSTALL_MANDIR} is not set, share/man/<lang> is used instead.
- #
- #  KDOCTOOLS_MEINPROC_EXECUTABLE - the meinproc5 executable
- #
-@@ -232,11 +232,19 @@ endfunction()
- 
- function(kdoctools_install podir)
-     file(GLOB lang_dirs "${podir}/*")
--    if (NOT MAN_INSTALL_DIR)
--        set(MAN_INSTALL_DIR share/man)
-+    if (NOT KDE_INSTALL_MANDIR)
-+        if (MAN_INSTALL_DIR) # TODO KF6: deprecated, remove
-+            set(KDE_INSTALL_MANDIR ${MAN_INSTALL_DIR})
-+        else()
-+            set(KDE_INSTALL_MANDIR share/man)
-+        endif()
-     endif()
--    if (NOT HTML_INSTALL_DIR)
--        set(HTML_INSTALL_DIR share/doc/HTML)
-+    if (NOT KDE_INSTALL_DOCBUNDLEDIR)
-+        if (HTML_INSTALL_DIR) # TODO KF6: deprecated, remove
-+            set(KDE_INSTALL_DOCBUNDLEDIR ${HTML_INSTALL_DIR})
-+        else()
-+            set(KDE_INSTALL_DOCBUNDLEDIR share/doc/HTML)
-+        endif()
-     endif()
-     foreach(lang_dir ${lang_dirs})
-         get_filename_component(lang ${lang_dir} NAME)
-@@ -246,13 +254,13 @@ function(kdoctools_install podir)
-             string(REGEX MATCH "\\.([0-9])\\.docbook" match ${docbook})
-             if (match)
-                 kdoctools_create_manpage(${docbook} ${CMAKE_MATCH_1}
--                    INSTALL_DESTINATION ${MAN_INSTALL_DIR}/${lang}
-+                    INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}/${lang}
-                 )
-             else()
-                 string(REGEX MATCH "${lang_dir}/docs/(.*)/index.docbook" match ${docbook})
-                 if (match)
-                     kdoctools_create_handbook(${docbook}
--                        INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${lang}
-+                        INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/${lang}
-                         SUBDIR ${CMAKE_MATCH_1}
-                     )
-                 endif()
--- 
-2.22.1
-
diff --git a/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild b/kde-frameworks/kdoctools/kdoctools-5.62.0.ebuild
index 1027f3f8456c..33355540123c 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.62.0.ebuild
@@ -26,10 +26,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch"
-	"${FILESDIR}/${P}-nondeprecated-kdeinstalldirs.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
 
 src_configure() {
 	local mycmakeargs=(