From c58ff58d2944c28baa69791e38d1297fe89f452f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 14 Sep 2019 18:02:55 +0200 Subject: kde-frameworks: Drop KDE Frameworks 5.61.0 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- kde-frameworks/kdoctools/Manifest | 1 - ...tools-5.61.0-nondeprecated-kdeinstalldirs.patch | 89 ---------------------- .../kdoctools/kdoctools-5.61.0-r1.ebuild | 49 ------------ 3 files changed, 139 deletions(-) delete mode 100644 kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch delete mode 100644 kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild (limited to 'kde-frameworks/kdoctools') diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest index 555c9d137456..f0c03dc55a1a 100644 --- a/kde-frameworks/kdoctools/Manifest +++ b/kde-frameworks/kdoctools/Manifest @@ -1,3 +1,2 @@ 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 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 -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/ 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/ 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.61.0-r1.ebuild deleted file mode 100644 index 1027f3f8456c..000000000000 --- a/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild +++ /dev/null @@ -1,49 +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" - "${FILESDIR}/${P}-nondeprecated-kdeinstalldirs.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 -} -- cgit v1.2.3-65-gdbad