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 088D9139083 for ; Mon, 18 Dec 2017 12:06:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 336A8E0F92; Mon, 18 Dec 2017 12:06:04 +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 016CBE0F92 for ; Mon, 18 Dec 2017 12:06:02 +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 0320333BEED for ; Mon, 18 Dec 2017 12:05:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D95BADCA for ; Mon, 18 Dec 2017 12:05:56 +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: <1513598737.f847d777f140a6e6c66d330f1061b068b25b947f.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: f847d777f140a6e6c66d330f1061b068b25b947f X-VCS-Branch: master Date: Mon, 18 Dec 2017 12:05:56 +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: 54d62e14-8477-4c0d-8a6f-0ba218e47516 X-Archives-Hash: 32f2fd56b854e0d6c9bde595cf9ce46d commit: f847d777f140a6e6c66d330f1061b068b25b947f Author: Michael Weber gentoo org> AuthorDate: Mon Dec 18 12:05:37 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Mon Dec 18 12:05:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f847d777 app-misc/anki: Fix dependencies. Thanks thanks Michael Mounteney and Dennis New. EAPI=6, remove unneeded overrides of src_configure and src_compile. Closes: https://bugs.gentoo.org/639354 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-misc/anki/anki-2.1.0_beta25.ebuild | 26 ++++++++++++---------- .../anki/files/anki-2.1.0_beta25-web-folder.patch | 11 +++++++++ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild index ac3413e622b..65fedfcbf81 100644 --- a/app-misc/anki/anki-2.1.0_beta25.ebuild +++ b/app-misc/anki/anki-2.1.0_beta25.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -PYTHON_COMPAT=( python3_4 python3_5 python3_6 ) +PYTHON_COMPAT=( python3_6 ) PYTHON_REQ_USE="sqlite" -inherit eutils python-single-r1 +inherit eutils python-single-r1 xdg DESCRIPTION="A spaced-repetition memory training program (flash cards)" HOMEPAGE="https://apps.ankiweb.net" @@ -25,6 +25,9 @@ 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/decorator[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] recording? ( media-sound/lame @@ -37,24 +40,18 @@ RDEPEND="${PYTHON_DEPS} )" DEPEND="" +PATCHES=( "${FILESDIR}"/${P}-web-folder.patch ) + pkg_setup() { python-single-r1_pkg_setup } src_prepare() { + default sed -i -e "s/updates=True/updates=False/" \ aqt/profiles.py || die } -# Nothing to configure or compile -src_configure() { - :; -} - -src_compile() { - :; -} - src_install() { cp tools/runanki.system tools/anki doicon ${PN}.png @@ -68,4 +65,9 @@ src_install() { # Localization files go into the anki directory: python_moduleinto anki python_domodule locale + + # not sure if this is correct, but + # site-packages/aqt/mediasrv.py wants the directory + python_moduleinto aqt + python_domodule 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 new file mode 100644 index 00000000000..521a2ed3bd8 --- /dev/null +++ b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch @@ -0,0 +1,11 @@ +--- anki-2.1.0beta25/aqt/mediasrv.py ++++ anki-2.1.0beta25/aqt/mediasrv.py +@@ -13,7 +13,7 @@ + # locate web folder in source/binary distribution + def _getExportFolder(): + # running from source? +- srcFolder = os.path.join(os.path.dirname(__file__), "..") ++ srcFolder = os.path.dirname(__file__) + webInSrcFolder = os.path.abspath(os.path.join(srcFolder, "web")) + if os.path.exists(webInSrcFolder): + return webInSrcFolder