commit: 253f3e296b05abc8a84065c115bfb3ddec9e7764 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Oct 23 14:23:40 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Oct 23 16:22:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=253f3e29
app-text/kbibtex: Drop upstreamed patch Package-Manager: portage-2.3.0 .../kbibtex/files/kbibtex-doctools-optional.patch | 40 ---------------------- app-text/kbibtex/kbibtex-9999.ebuild | 2 -- 2 files changed, 42 deletions(-) diff --git a/app-text/kbibtex/files/kbibtex-doctools-optional.patch b/app-text/kbibtex/files/kbibtex-doctools-optional.patch deleted file mode 100644 index 57527b0..0000000 --- a/app-text/kbibtex/files/kbibtex-doctools-optional.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit d23557e8a5c4170c5d2a20cb17421e5f0b303f94 -Author: Andreas Sturmlechner <[email protected]> -Date: Sun Mar 13 12:22:09 2016 +0100 - - Make KF5DocTools optional - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb33c9e..0525db1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,7 +61,6 @@ find_package( - find_package( - KF5 ${KF5_MIN_VERSION} - REQUIRED -- DocTools - I18n - XmlGui - KIO -@@ -74,6 +73,8 @@ find_package( - Wallet - ) - -+find_package(KF5DocTools) -+ - # Version number for the exported headers / libs - set( - VERSION_BRANCH "0.8" -@@ -182,9 +183,9 @@ add_subdirectory( - add_subdirectory( - xslt - ) -+if(KF5DocTools_FOUND) -+ add_subdirectory(doc) -+endif() --add_subdirectory( -- doc --) - add_subdirectory( - mime - ) diff --git a/app-text/kbibtex/kbibtex-9999.ebuild b/app-text/kbibtex/kbibtex-9999.ebuild index 0cde411..fa8769e 100644 --- a/app-text/kbibtex/kbibtex-9999.ebuild +++ b/app-text/kbibtex/kbibtex-9999.ebuild @@ -60,8 +60,6 @@ S="${WORKDIR}/${P/_/-}" PATCHES=( "${FILESDIR}/${PN}-revert-removing-qtoauth.patch" "${FILESDIR}/${PN}-part-revert-reenable-qtoauth.patch" - - "${FILESDIR}/${PN}-doctools-optional.patch" # RR pending upstream ) src_prepare() {
