From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9BCC138359 for ; Thu, 30 Jul 2020 11:18:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2937E0A03; Thu, 30 Jul 2020 11:18:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7B8EE0A03 for ; Thu, 30 Jul 2020 11:18:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEC8534F3B3 for ; Thu, 30 Jul 2020 11:18:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 477042F1 for ; Thu, 30 Jul 2020 11:18:41 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1596107887.b5cdfafae9a40d9dc0c7fc8f40e71f87b8bdf4f3.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/bibletime/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/bibletime/bibletime-2.11.2.ebuild X-VCS-Directories: app-text/bibletime/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: b5cdfafae9a40d9dc0c7fc8f40e71f87b8bdf4f3 X-VCS-Branch: master Date: Thu, 30 Jul 2020 11:18:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d153b41-8325-482a-9bc2-b062ae33413e X-Archives-Hash: e5870f8fd35141ba323dc1da8c698040 commit: b5cdfafae9a40d9dc0c7fc8f40e71f87b8bdf4f3 Author: Marek Szuba gentoo org> AuthorDate: Thu Jul 30 11:02:27 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Thu Jul 30 11:18:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cdfafa app-text/bibletime: EAPI-7, cmake.eclass, fix dependencies Have also added a test phase which actually manages to launch the test suite, unfortunately it doesn't run properly yet so continue to restrict tests. Signed-off-by: Marek Szuba gentoo.org> app-text/bibletime/bibletime-2.11.2.ebuild | 33 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild index ebbcd684ed6..4323fdebe25 100644 --- a/app-text/bibletime/bibletime-2.11.2.ebuild +++ b/app-text/bibletime/bibletime-2.11.2.ebuild @@ -1,20 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +VIRTUALX_REQUIRED=test -DESCRIPTION="Qt Bible study application using the SWORD library" -HOMEPAGE="http://www.bibletime.info/" +inherit cmake virtualx + +DESCRIPTION="Qt Bible-study application using the SWORD library" +HOMEPAGE="http://bibletime.info/" SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug" +IUSE="test" -# bug 313657 +# Some tests fail due to being unable to find an icon directory relative +# to ${WORKDIR}, some others segfault. Needs work. RESTRICT="test" RDEPEND=" @@ -23,6 +26,7 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 @@ -36,12 +40,23 @@ DEPEND="${RDEPEND} net-misc/curl sys-libs/zlib " +BDEPEND="test? ( + app-dicts/sword-Josephus + app-dicts/sword-KJV + app-dicts/sword-KJVA + app-dicts/sword-Scofield + app-dicts/sword-StrongsGreek +)" DOCS=( ChangeLog README.md ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \ - -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed" + -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed" +} + +src_test() { + virtx cmake_src_test || die "Test run has failed" }