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 59BBF138C9D 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 35786E08AB; Sun, 26 Apr 2015 22:32:31 +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 D8E45E08AB 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 2493E340F79 for ; Sun, 26 Apr 2015 22:32:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AFB80997 for ; Sun, 26 Apr 2015 22:32:26 +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: <1429914448.652eb502986b0b2fa72db850c13874b3d1af97ad.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/rocs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/rocs/rocs-9999.ebuild X-VCS-Directories: kde-apps/rocs/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 652eb502986b0b2fa72db850c13874b3d1af97ad X-VCS-Branch: master Date: Sun, 26 Apr 2015 22:32:26 +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: 0053f0d4-75c1-45b5-a7c8-eed17d481014 X-Archives-Hash: 2a2f489f6f3c6991bef141f98f147c56 commit: 652eb502986b0b2fa72db850c13874b3d1af97ad Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Apr 23 23:22:05 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Fri Apr 24 22:27:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=652eb502 [kde-apps/rocs] Frameworks merged to master Package-Manager: portage-2.2.18 kde-apps/rocs/rocs-9999.ebuild | 52 +++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/kde-apps/rocs/rocs-9999.ebuild b/kde-apps/rocs/rocs-9999.ebuild index 8084db3..c54cbf0 100644 --- a/kde-apps/rocs/rocs-9999.ebuild +++ b/kde-apps/rocs/rocs-9999.ebuild @@ -4,35 +4,49 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="true" +KDE_TEST="true" +inherit kde5 -DESCRIPTION="KDE4 interface to work with Graph Theory" +DESCRIPTION="Interface to work with Graph Theory" HOMEPAGE="http://www.kde.org/applications/education/rocs http://edu.kde.org/applications/mathematics/rocs" KEYWORDS="" -IUSE="debug" +IUSE="" RDEPEND=" - dev-libs/grantlee:0 - dev-qt/qtxmlpatterns:4 + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kxmlgui) + dev-libs/grantlee:5 + dev-qt/qtconcurrent:5 + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtgui:5 + dev-qt/qtscript:5[scripttools] + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} >=dev-libs/boost-1.49 " -RESTRICT=test -# bug 443752 +RESTRICT=test # 1/10 tests currently fails -src_test() { - local mycmakeargs=(-DKDE4_BUILD_TESTS=ON) - cmake-utils_src_configure - kde4-base_src_compile +src_prepare() { + # Duplicate + sed -e '/^find_package.*KF5DocTools/ s/^/#/' -i CMakeLists.txt || die - cd "${BUILD_DIR}" - emake DESTDIR="${T}/tests" install - export KDEDIRS="${KDEDIRS}:${T}/tests/${PREFIX}" - kbuildsycoca4 - ctest || die "tests failed" + kde5_src_prepare }