1
0
Эх сурвалжийг харах

Anki updated to 2.1.0_beta29. 9999 version is removed as broken

Sergey Ilinykh 7 жил өмнө
parent
commit
edb0d28982

+ 1 - 1
app-misc/anki/Manifest

@@ -1 +1 @@
-DIST anki-2.1.0_beta20.tgz 4091041 SHA256 7107a69ebcb02546c9c86104ac25c164b2119736341f61d7c772cf14ced69211 SHA512 dbc34114a958bef6a07c7fd5c06ff7d764c8ecb1cd790317b0f5d6b1fbe276db5c33ab431cb5e00b992f53e1f5730a44b25e147475e3b7d9ab8917dde1f87fab WHIRLPOOL 45302b0864979b46bd9644ac1439227a7462a3504bf187b03d65dd5e73505cd6cf1a4b6b6d38652ed30c1a4a9eccda1e2478e145ba392406b8bb8eee0e62e011
+DIST anki-2.1.0_beta29.tgz 4123355 SHA256 7b412ff40a7fc347a85a5ca6c234c5aa4d3919d1ca9dc1729095abdc4e8ca6dd SHA512 7c54276f1002f070b51c819da12663ec025e8d2b9f733572aeafbabde658e98f9e7d9dc7c1db5dd6bcfad631b979415bd10ee2cd4676f47b680be964f42dbc22 WHIRLPOOL b0b6446a55e3370f006f32eddf29dfe28852ab724c5bbb6af827bf8bbebd42f233a1ab1c17834474c369e09b4558f27bad0c3c19fa8d2107580ec2f79b96c8b5

+ 20 - 14
app-misc/anki/anki-2.1.0_beta20.ebuild → app-misc/anki/anki-2.1.0_beta29.ebuild

@@ -1,32 +1,33 @@
 # 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 xdg-utils
 
 DESCRIPTION="A spaced-repetition memory training program (flash cards)"
 HOMEPAGE="https://apps.ankiweb.net"
-MY_P=${P/_/}
+
+MY_P="${P/_/}"
 SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
+IUSE="latex +recording +sound test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[svg,webengine,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	recording? (
 		media-sound/lame
@@ -36,26 +37,31 @@ RDEPEND="${PYTHON_DEPS}
 	latex? (
 		app-text/texlive
 		app-text/dvipng
-	)"
-DEPEND=""
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	eapply_user
 	sed -i -e "s/updates=True/updates=False/" \
 		aqt/profiles.py || die
 	sed -i -e 's,"web","anki/web",' aqt/mediasrv.py || die
 }
 
-# Nothing to configure or compile
-src_configure() {
-	true
+src_compile() {
+	:;
 }
 
-src_compile() {
-	true
+src_test() {
+	sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
+		-i tools/tests.sh || die
+	./tools/tests.sh || die
 }
 
 src_install() {
@@ -65,7 +71,7 @@ src_install() {
 
 	dodoc README.contributing README.md README.development
 	python_domodule aqt anki
-	python_doscript runanki
+	python_newscript runanki anki
 
 	# Localization files go into the anki directory:
 	python_moduleinto anki

+ 0 - 63
app-misc/anki/anki-9999.ebuild

@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 git-r3
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net/"
-EGIT_REPO_URI="https://github.com/dae/anki.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="latex +sound +recording"
-
-RDEPEND="${PYTHON_DEPS}
-	 dev-python/PyQt5[svg,webengine]
-	 >=dev-python/httplib2-0.7.4
-	 dev-python/beautifulsoup:4
-	 dev-python/send2trash
-	 >=dev-python/pyaudio-0.2.4
-	 recording? ( media-sound/lame )
-	 sound? ( media-video/mplayer )
-	 latex? ( app-text/texlive
-			  app-text/dvipng )"
-DEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-	default
-}
-
-# Nothing to configure
-src_configure() {
-	true
-}
-
-src_compile() {
-	./tools/build_ui.sh || die "./tools/build_ui.sh failed"
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README.md README.development
-	python_domodule aqt anki
-	newbin runanki anki
-
-	# XXX: install localization files (from bzr repo)
-	# XXX: check sound & recording
-	# XXX: install mime xml (see Makefile)
-}