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 8362A138CBB for ; Sun, 26 Apr 2015 22:32:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86BA3E0897; Sun, 26 Apr 2015 22:32:30 +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 3BFADE0897 for ; Sun, 26 Apr 2015 22:32:30 +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 3A10C340F5F for ; Sun, 26 Apr 2015 22:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D28A98B for ; Sun, 26 Apr 2015 22:32:25 +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: <1429906477.f7e4287a0ab7c4a5ab43992c3dad439a17d8afe6.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/step/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/step/step-9999.ebuild X-VCS-Directories: kde-apps/step/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: f7e4287a0ab7c4a5ab43992c3dad439a17d8afe6 X-VCS-Branch: master Date: Sun, 26 Apr 2015 22:32:25 +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: f0fbe7b3-21c4-49a2-ace1-8d010e12708c X-Archives-Hash: 6a49fdf5f5cc5ead59c5cec4c3301f9b commit: f7e4287a0ab7c4a5ab43992c3dad439a17d8afe6 Author: Andreas Sturmlechner gmail com> AuthorDate: Fri Apr 24 20:01:06 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Fri Apr 24 20:14:37 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f7e4287a [kde-apps/step] Frameworks merged to master Package-Manager: portage-2.2.18 kde-apps/step/step-9999.ebuild | 54 +++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/kde-apps/step/step-9999.ebuild b/kde-apps/step/step-9999.ebuild index 4da6f38..8d9d58c 100644 --- a/kde-apps/step/step-9999.ebuild +++ b/kde-apps/step/step-9999.ebuild @@ -4,25 +4,63 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="true" +KDE_TEST="true" +inherit kde5 -DESCRIPTION="The KDE physics simulator" +DESCRIPTION="Interactive physics simulator" HOMEPAGE="http://edu.kde.org/step" KEYWORDS="" -IUSE="debug +gsl +qalculate" +IUSE="+gsl +qalculate" DEPEND=" - >=dev-cpp/eigen-2.0.3:2 + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kplotting) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + >=dev-cpp/eigen-3.2.4:3 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sci-libs/cln gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) " RDEPEND="${DEPEND}" +src_prepare() { + use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ + -i CMakeLists.txt || die + + # Duplicate + sed -e '/^find_package.*Qt5Test/ s/^/#/' \ + -i autotests/CMakeLists.txt || die + sed -e '/find_package.*Xml Test/ s/^/#/' \ + -i stepcore/CMakeLists.txt || die + + kde5_src_prepare +} + src_configure() { local mycmakeargs=( - $(cmake-utils_use_with gsl) - $(cmake-utils_use_with qalculate) + $(cmake-utils_use_find_package gsl) + $(cmake-utils_use_find_package qalculate) ) - kde4-base_src_configure + kde5_src_configure }