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 D1623139083 for ; Mon, 18 Dec 2017 12:37:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41726E0F97; Mon, 18 Dec 2017 12:37:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 13FBFE0F97 for ; Mon, 18 Dec 2017 12:37:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 193EB33BEF4 for ; Mon, 18 Dec 2017 12:37:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C31BAE74 for ; Mon, 18 Dec 2017 12:37:51 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1513600407.d37027cb86c73ba98658e5e6142a1e044692cd2d.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/, app-misc/anki/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/anki/anki-2.1.0_beta25.ebuild app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch X-VCS-Directories: app-misc/anki/files/ app-misc/anki/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: d37027cb86c73ba98658e5e6142a1e044692cd2d X-VCS-Branch: master Date: Mon, 18 Dec 2017 12:37:51 +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: c3a7115c-ba28-4730-940b-de04a69de6b0 X-Archives-Hash: 33ae45a8aaa46df0fc01d61b2a9ef51e commit: d37027cb86c73ba98658e5e6142a1e044692cd2d Author: Michael Weber gentoo org> AuthorDate: Mon Dec 18 12:33:27 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Mon Dec 18 12:33:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37027cb app-misc/anki: Enable tests. Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-misc/anki/anki-2.1.0_beta25.ebuild | 25 ++++++++++++++++------ .../anki/files/anki-2.1.0_beta25-web-folder.patch | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild index 65fedfcbf81..71268203040 100644 --- a/app-misc/anki/anki-2.1.0_beta25.ebuild +++ b/app-misc/anki/anki-2.1.0_beta25.ebuild @@ -18,13 +18,13 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="latex +recording +sound" +IUSE="latex +recording +sound test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}] >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] - dev-python/beautifulsoup[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/decorator[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] @@ -37,8 +37,11 @@ RDEPEND="${PYTHON_DEPS} latex? ( app-text/texlive app-text/dvipng - )" -DEPEND="" + ) +" +DEPEND="${RDEPEND} + test? ( dev-python/nose[${PYTHON_USEDEP}] ) +" PATCHES=( "${FILESDIR}"/${P}-web-folder.patch ) @@ -52,6 +55,16 @@ src_prepare() { aqt/profiles.py || die } +src_compile() { + :; +} + +src_test() { + sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \ + -i tools/tests.sh || die + ./tools/tests.sh || die +} + src_install() { cp tools/runanki.system tools/anki doicon ${PN}.png @@ -68,6 +81,6 @@ src_install() { # not sure if this is correct, but # site-packages/aqt/mediasrv.py wants the directory - python_moduleinto aqt - python_domodule web + insinto /usr/share/anki + doins -r web } diff --git a/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch index 521a2ed3bd8..19b196c4ace 100644 --- a/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch +++ b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch @@ -5,7 +5,7 @@ def _getExportFolder(): # running from source? - srcFolder = os.path.join(os.path.dirname(__file__), "..") -+ srcFolder = os.path.dirname(__file__) ++ srcFolder = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share", "anki") webInSrcFolder = os.path.abspath(os.path.join(srcFolder, "web")) if os.path.exists(webInSrcFolder): return webInSrcFolder