commit: 8dd1d562a906bd833f114bffd77765b973afddda
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Mar 8 18:38:13 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 16:26:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8dd1d562
kde-apps/rocs: KDE_HANDBOOK="optional"
Package-Manager: portage-2.2.27
.../files/rocs-15.12.2-doctools-optional.patch | 29 ++++++++++++++++++++++
...{rocs-15.12.2.ebuild => rocs-15.12.2-r1.ebuild} | 14 ++++-------
kde-apps/rocs/rocs-15.12.49.9999.ebuild | 14 ++++-------
kde-apps/rocs/rocs-9999.ebuild | 14 +++--------
4 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/kde-apps/rocs/files/rocs-15.12.2-doctools-optional.patch
b/kde-apps/rocs/files/rocs-15.12.2-doctools-optional.patch
new file mode 100644
index 0000000..a74464c
--- /dev/null
+++ b/kde-apps/rocs/files/rocs-15.12.2-doctools-optional.patch
@@ -0,0 +1,29 @@
+commit c4d77a5348fcf18aff734ccff13dcc87582a35be
+Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
+Date: Tue Mar 8 19:34:32 2016 +0100
+
+ Make KF5DocTools really optional
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc71ba0..8e2c4e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,7 +57,6 @@ find_package(KF5 5.15 REQUIRED COMPONENTS
+ CoreAddons
+ Crash
+ Declarative
+- DocTools
+ I18n
+ ItemViews
+ TextEditor
+@@ -80,7 +79,9 @@ remove_definitions(-DQT_NO_KEYWORDS)
+ ecm_optional_add_subdirectory(libgraphtheory)
+ ecm_optional_add_subdirectory(src)
+ ecm_optional_add_subdirectory(icons)
+-ecm_optional_add_subdirectory(doc)
++if(KF5DocTools_FOUND)
++ ecm_optional_add_subdirectory(doc)
++endif()
+
+ set_package_info(Boost "Boost C++ Libraries" "http://www.boost.org";)
+ feature_summary(WHAT ALL)
diff --git a/kde-apps/rocs/rocs-15.12.2.ebuild
b/kde-apps/rocs/rocs-15.12.2-r1.ebuild
similarity index 88%
rename from kde-apps/rocs/rocs-15.12.2.ebuild
rename to kde-apps/rocs/rocs-15.12.2-r1.ebuild
index 34a177e..9dd74ea 100644
--- a/kde-apps/rocs/rocs-15.12.2.ebuild
+++ b/kde-apps/rocs/rocs-15.12.2-r1.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_HANDBOOK="true"
+CMAKE_MIN_VERSION="3.0.0"
+KDE_HANDBOOK="optional"
KDE_TEST="true"
inherit kde5
@@ -28,7 +29,6 @@ RDEPEND="
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kxmlgui)
- dev-libs/grantlee:5
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
@@ -38,6 +38,7 @@ RDEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
$(add_qt_dep qtxmlpatterns)
+ dev-libs/grantlee:5
"
DEPEND="${RDEPEND}
>=dev-libs/boost-1.49
@@ -45,9 +46,4 @@ DEPEND="${RDEPEND}
RESTRICT=test # 1/10 tests currently fails
-src_prepare() {
- # Duplicate
- sed -e '/^find_package.*KF5DocTools/ s/^/#/' -i CMakeLists.txt || die
-
- kde5_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-doctools-optional.patch" )
diff --git a/kde-apps/rocs/rocs-15.12.49.9999.ebuild
b/kde-apps/rocs/rocs-15.12.49.9999.ebuild
index b0137d1..adb232f 100644
--- a/kde-apps/rocs/rocs-15.12.49.9999.ebuild
+++ b/kde-apps/rocs/rocs-15.12.49.9999.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_HANDBOOK="true"
+CMAKE_MIN_VERSION="3.0.0"
+KDE_HANDBOOK="optional"
KDE_TEST="true"
inherit kde5
@@ -28,7 +29,6 @@ RDEPEND="
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kxmlgui)
- dev-libs/grantlee:5
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
@@ -38,6 +38,7 @@ RDEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
$(add_qt_dep qtxmlpatterns)
+ dev-libs/grantlee:5
"
DEPEND="${RDEPEND}
>=dev-libs/boost-1.49
@@ -45,9 +46,4 @@ DEPEND="${RDEPEND}
RESTRICT=test # 1/10 tests currently fails
-src_prepare() {
- # Duplicate
- sed -e '/^find_package.*KF5DocTools/ s/^/#/' -i CMakeLists.txt || die
-
- kde5_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-doctools-optional.patch" )
diff --git a/kde-apps/rocs/rocs-9999.ebuild b/kde-apps/rocs/rocs-9999.ebuild
index b0137d1..e334976 100644
--- a/kde-apps/rocs/rocs-9999.ebuild
+++ b/kde-apps/rocs/rocs-9999.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_HANDBOOK="true"
+CMAKE_MIN_VERSION="3.0.0"
+KDE_HANDBOOK="optional"
KDE_TEST="true"
inherit kde5
@@ -28,7 +29,6 @@ RDEPEND="
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kxmlgui)
- dev-libs/grantlee:5
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
@@ -38,16 +38,10 @@ RDEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
$(add_qt_dep qtxmlpatterns)
+ dev-libs/grantlee:5
"
DEPEND="${RDEPEND}
>=dev-libs/boost-1.49
"
RESTRICT=test # 1/10 tests currently fails
-
-src_prepare() {
- # Duplicate
- sed -e '/^find_package.*KF5DocTools/ s/^/#/' -i CMakeLists.txt || die
-
- kde5_src_prepare
-}
