commit: 2d52aa607d3e39020338f780f52e5228ebfe1bd8
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Mar 7 00:40: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=2d52aa60
kde-apps/step: Depend on new forceoptional magic, EAPI=6
Package-Manager: portage-2.2.27
kde-apps/step/files/step-15.12.2-doctools.patch | 34 +++++++++++++++++++++++++
kde-apps/step/step-15.12.49.9999.ebuild | 23 ++++++++---------
kde-apps/step/step-9999.ebuild | 21 ++++++---------
3 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/kde-apps/step/files/step-15.12.2-doctools.patch
b/kde-apps/step/files/step-15.12.2-doctools.patch
new file mode 100644
index 0000000..4371598
--- /dev/null
+++ b/kde-apps/step/files/step-15.12.2-doctools.patch
@@ -0,0 +1,34 @@
+commit 1ba1e576e20e9008d3fd862deb7bbcca61f3e4d8
+Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
+Date: Thu Mar 10 20:10:50 2016 +0100
+
+ Remove duplicate KF5DocTools search, make it optional
+
+ Using ecm_optional_add_subdirectory, as long as KDELibs4Support
+ makes it impossible to disable KF5DocTools.
+
+ REVIEW: 127335
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b0dd543..9623485 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,6 @@ find_package(KF5 REQUIRED COMPONENTS
+ NewStuff
+ Plotting
+ )
+-find_package(KF5DocTools REQUIRED)
+ find_package(Eigen3 3.2.2 REQUIRED)
+ find_package(GSL)
+ find_package(Qalculate)
+@@ -69,7 +68,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
-Wno-unused-parameter")
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN3_INCLUDE_DIR})
+
+-add_subdirectory(doc)
++if(KF5DocTools_FOUND)
++ ecm_optional_add_subdirectory(doc)
++endif()
+ add_subdirectory(stepcore)
+ add_subdirectory(step)
+ add_subdirectory(autotests)
diff --git a/kde-apps/step/step-15.12.49.9999.ebuild
b/kde-apps/step/step-15.12.49.9999.ebuild
index f25c046..1c7ce9f 100644
--- a/kde-apps/step/step-15.12.49.9999.ebuild
+++ b/kde-apps/step/step-15.12.49.9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_HANDBOOK="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="forceoptional"
inherit kde5
DESCRIPTION="Interactive physics simulator"
@@ -30,7 +30,6 @@ DEPEND="
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
- =dev-cpp/eigen-3.2*:3
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui)
$(add_qt_dep qtopengl)
@@ -38,29 +37,27 @@ DEPEND="
$(add_qt_dep qtsvg)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ =dev-cpp/eigen-3.2*:3
sci-libs/cln
gsl? ( >=sci-libs/gsl-1.9-r1 )
qalculate? ( >=sci-libs/libqalculate-0.9.5 )
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-doctools.patch" )
+
src_prepare() {
- use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
- -i CMakeLists.txt || die
+ kde5_src_prepare
- # Duplicate
- sed -e '/^find_package.*Qt5Test/ s/^/#/' \
- -i autotests/CMakeLists.txt || die
+ # FIXME: Drop duplicate upstream
sed -e '/find_package.*Xml Test/ s/^/#/' \
-i stepcore/CMakeLists.txt || die
-
- kde5_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package gsl)
- $(cmake-utils_use_find_package qalculate)
+ $(cmake-utils_use_find_package gsl GSL)
+ $(cmake-utils_use_find_package qalculate Qalculate)
)
kde5_src_configure
}
diff --git a/kde-apps/step/step-9999.ebuild b/kde-apps/step/step-9999.ebuild
index f25c046..445229f 100644
--- a/kde-apps/step/step-9999.ebuild
+++ b/kde-apps/step/step-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_HANDBOOK="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="forceoptional"
inherit kde5
DESCRIPTION="Interactive physics simulator"
@@ -30,7 +30,6 @@ DEPEND="
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
- =dev-cpp/eigen-3.2*:3
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui)
$(add_qt_dep qtopengl)
@@ -38,6 +37,7 @@ DEPEND="
$(add_qt_dep qtsvg)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ =dev-cpp/eigen-3.2*:3
sci-libs/cln
gsl? ( >=sci-libs/gsl-1.9-r1 )
qalculate? ( >=sci-libs/libqalculate-0.9.5 )
@@ -45,22 +45,17 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
- -i CMakeLists.txt || die
+ kde5_src_prepare
- # Duplicate
- sed -e '/^find_package.*Qt5Test/ s/^/#/' \
- -i autotests/CMakeLists.txt || die
+ # FIXME: Drop duplicate upstream
sed -e '/find_package.*Xml Test/ s/^/#/' \
-i stepcore/CMakeLists.txt || die
-
- kde5_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package gsl)
- $(cmake-utils_use_find_package qalculate)
+ $(cmake-utils_use_find_package gsl GSL)
+ $(cmake-utils_use_find_package qalculate Qalculate)
)
kde5_src_configure
}
