From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA8CE138CA4 for ; Sun, 3 May 2015 16:38:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B7ECE0830; Sun, 3 May 2015 16:38:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 073E5E0830 for ; Sun, 3 May 2015 16:38:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8596E340EBC for ; Sun, 3 May 2015 16:38:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D555700 for ; Sun, 3 May 2015 16:38:21 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1430646063.47db1e38d043d3040b18c01445ab6f7b70ce7005.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/cantor/cantor-9999.ebuild X-VCS-Directories: kde-apps/cantor/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 47db1e38d043d3040b18c01445ab6f7b70ce7005 X-VCS-Branch: master Date: Sun, 3 May 2015 16:38:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e7a7444a-d770-403b-88a4-b2911baa7e3b X-Archives-Hash: f8b3caf07d18e28b4719087cc19eaa16 commit: 47db1e38d043d3040b18c01445ab6f7b70ce7005 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Apr 26 22:16:46 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Sun May 3 09:41:03 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=47db1e38 [kde-apps/cantor] Frameworks merged to master Dropped python3 support, build system requires fixing Package-Manager: portage-2.2.18 kde-apps/cantor/cantor-9999.ebuild | 62 +++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild index 2f572fe..2ac8976 100644 --- a/kde-apps/cantor/cantor-9999.ebuild +++ b/kde-apps/cantor/cantor-9999.ebuild @@ -4,20 +4,42 @@ EAPI=5 -KDE_HANDBOOK="optional" +KDE_HANDBOOK="true" +KDE_TEST="true" PYTHON_COMPAT=( python2_7 ) -inherit kde4-base python-single-r1 +# FIXME: PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) +inherit kde5 python-r1 -DESCRIPTION="KDE4 interface for doing mathematics and scientific computing" +DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="http://www.kde.org/applications/education/cantor http://edu.kde.org/cantor" KEYWORDS="" -IUSE="analitza debug postscript python qalculate +R" +IUSE="analitza lua postscript python qalculate +R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) +# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*') RDEPEND=" - analitza? ( $(add_kdebase_dep analitza) ) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kpty) + $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + analitza? ( $(add_kdeapps_dep analitza) ) + lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate @@ -25,7 +47,6 @@ RDEPEND=" postscript? ( app-text/libspectre ) python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) - dev-qt/qtxmlpatterns:4 " DEPEND="${RDEPEND} >=dev-cpp/eigen-2.0.3:2 @@ -34,29 +55,36 @@ DEPEND="${RDEPEND} RESTRICT="test" pkg_setup() { - use python && python-single-r1_pkg_setup - kde4-base_pkg_setup + use python && python_setup + kde5_pkg_setup +} + +src_prepare() { + # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo + sed -e '/^find_package(PythonLibs3)/ s/^/#/' \ + -i src/backends/CMakeLists.txt || die } src_configure() { local mycmakeargs=( - $(cmake-utils_use_with analitza) - $(cmake-utils_use_with postscript LibSpectre) - $(cmake-utils_use_with python PythonLibs) - $(cmake-utils_use_with qalculate) - $(cmake-utils_use_with R) + $(cmake-utils_use_find_package analitza Analitza5) + $(cmake-utils_use_find_package lua LuaJIT) + $(cmake-utils_use_find_package postscript LibSpectre) + $(cmake-utils_use_find_package python PythonLibs) + $(cmake-utils_use_find_package qalculate) + $(cmake-utils_use_find_package R) ) - kde4-base_src_configure + kde5_src_configure } pkg_postinst() { - kde4-base_pkg_postinst + kde5_pkg_postinst - if ! use analitza && ! use python && ! use qalculate && ! use R; then + if ! use analitza && ! use lua && ! use python && ! use qalculate && ! use R; then echo ewarn "You have decided to build ${PN} with no backend." ewarn "To have this application functional, please do one of below:" - ewarn " # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'python', 'qalculate' or 'R' USE flag enabled" + ewarn " # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'lua', 'python', 'qalculate' or 'R' USE flag enabled" ewarn " # emerge -vaDu sci-mathematics/maxima" echo fi