From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- app-misc/anki/Manifest | 6 +-- app-misc/anki/anki-2.1.0_beta25.ebuild | 32 ++++++----- app-misc/anki/anki-2.1.0_beta27.ebuild | 42 ++++++++------- app-misc/anki/anki-2.1.13-r1.ebuild | 98 ++++++++++++++++++++++++++++++++++ app-misc/anki/anki-2.1.13.ebuild | 92 ------------------------------- 5 files changed, 144 insertions(+), 126 deletions(-) create mode 100644 app-misc/anki/anki-2.1.13-r1.ebuild delete mode 100644 app-misc/anki/anki-2.1.13.ebuild (limited to 'app-misc/anki') diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest index f424a9d18d51..d1b3c5a8a952 100644 --- a/app-misc/anki/Manifest +++ b/app-misc/anki/Manifest @@ -2,7 +2,7 @@ AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428 DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1 DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3 -EBUILD anki-2.1.0_beta25.ebuild 1905 BLAKE2B 829fae8c282bf4e1cd4fbce8f316b08f038da25f88563b07844c689d195483bc8639d7ed52901e7fae9414dad6d8ec97a1c07c235b22bc074a2bd6f987394265 SHA512 e32db8ebf71b6179a243a47c914be8ee0c2c5fbd3b7fc1f11edd0e59ab89b232160239bf51e5680028568e45337e786e73013ace994c82344dbe5ed6d599e7eb -EBUILD anki-2.1.0_beta27.ebuild 2072 BLAKE2B e75ad518d27e1214490522445fa0e77aa446816a84c393fecfa3900b98b33ae46043daaa2bbc3f5d94df504307bd49dded57a97bbda1b7eb054d9eb67dffa015 SHA512 7601927a486cd07af40881c9f4763dde1b6752ee161705bf1adf3fab9ccb01423e69b975cae6e7f97f08fbb9ff00a3e22418c02f30d48ea9661b46778867a1b9 -EBUILD anki-2.1.13.ebuild 2180 BLAKE2B 66911e134bf317bf589c3a470d380a2dc1d9df543942a8e1c618658de59b22c10747deee8fa335cdf77d8f81d04d7431b364c80a5272373771762daa1c19c7db SHA512 dc2c6c7374c56c9961c44de9842e3a468e08f540cb06591de5cb77090bff6ad68a93bd7bda3c74e502518dae470b87b66d3641e7d31ee6310cb275ceec7c3968 +EBUILD anki-2.1.0_beta25.ebuild 2034 BLAKE2B 92f9982dae6bf17a571ffca9dbbe9562fc13747d9d21452744b5bddcef5b038507218f914b5932f93b69833f25344a1631c15cd3d1625a09ab7310bec89ffb2b SHA512 6b8fa96df089ec57332f1bd5acafacca6ea1d16c6b3efb56a62aa0f93389bf3923bd00b1eda5df95dedc41cec17bd9856c868288262120c68e30b3df0771a97d +EBUILD anki-2.1.0_beta27.ebuild 2219 BLAKE2B 76dcaf2ceb91906c74149db1559499628b86ce8a3491109da81d02a8c3eff1ecc94a4eb5cf06ce01e10aca4a6b2cc53bf71c962e3d607d7062face38f1dec2c6 SHA512 4261913d808ec9dae0f26b799f0a96fc8d225202626d9ee590fe3634b2d10f74514ba1a00401cf055a153251b243698c8463a05204e8baf0d528aae07da637b5 +EBUILD anki-2.1.13-r1.ebuild 2317 BLAKE2B d14f2116c5f2358160e80dcdfcd109dc0dd3c968cac8e5e5ed5ccf0047b87ebae804f7e68e0368a1f0504e590631b37e9590c1bd92bf7d66493b2bc44ad23075 SHA512 22cc7c60afeb37590c74bb7710e418a8cccf7efee418788cc4de06483ff053c2b50ce461229e1577834d47ee4099647da1212ad3e31d8dd76c64986782c98150 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351 diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild index 7a709e1e39e3..7e5c0bc5b290 100644 --- a/app-misc/anki/anki-2.1.0_beta25.ebuild +++ b/app-misc/anki/anki-2.1.0_beta25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,17 +23,19 @@ RESTRICT="!test? ( 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:4[${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 - >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + dev-python/PyQt5[gui,svg,webkit,${PYTHON_MULTI_USEDEP}] + >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + dev-python/decorator[${PYTHON_MULTI_USEDEP}] + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + recording? ( + media-sound/lame + >=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}] + ) + ') sound? ( media-video/mplayer ) latex? ( app-text/texlive @@ -41,7 +43,11 @@ RDEPEND="${PYTHON_DEPS} ) " DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] ) + test? ( + $(python_gen_cond_dep ' + dev-python/nose[${PYTHON_MULTI_USEDEP}] + ') + ) " PATCHES=( "${FILESDIR}"/${P}-web-folder.patch ) diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild index 341c641fe86e..9b0a46164d62 100644 --- a/app-misc/anki/anki-2.1.0_beta27.ebuild +++ b/app-misc/anki/anki-2.1.0_beta27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,23 +23,25 @@ RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - || ( - ( - >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + || ( + ( + >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}] + dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}] + ) + =dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${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 - >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}] - ) + >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + dev-python/decorator[${PYTHON_MULTI_USEDEP}] + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + recording? ( + media-sound/lame + >=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}] + ) + ') sound? ( media-video/mplayer ) latex? ( app-text/texlive @@ -47,7 +49,11 @@ RDEPEND="${PYTHON_DEPS} ) " DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] ) + test? ( + $(python_gen_cond_dep ' + dev-python/nose[${PYTHON_MULTI_USEDEP}] + ') + ) " PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch ) diff --git a/app-misc/anki/anki-2.1.13-r1.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild new file mode 100644 index 000000000000..9c1a33eea458 --- /dev/null +++ b/app-misc/anki/anki-2.1.13-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_6 ) +PYTHON_REQ_USE="sqlite" + +inherit eutils python-single-r1 xdg + +DESCRIPTION="A spaced-repetition memory training program (flash cards)" +HOMEPAGE="https://apps.ankiweb.net" +SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz" + +S="${WORKDIR}/${P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="latex +recording +sound test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + || ( + ( + >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}] + dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}] + ) + =dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + dev-python/decorator[${PYTHON_MULTI_USEDEP}] + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + ') + recording? ( media-sound/lame ) + sound? ( media-video/mpv ) + latex? ( + app-text/texlive + app-text/dvipng + ) +" +DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/nose[${PYTHON_MULTI_USEDEP}] + ') + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-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 +} + +src_compile() { + :; +} + +src_test() { + sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests\":" \ + -i tools/tests.sh || die + sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests3\":" \ + -i tools/tests.sh || die + sed -e "s:which nosetests3:which ${EROOT}usr/bin/nosetests3:" \ + -i tools/tests.sh || die + ./tools/tests.sh || die +} + +src_install() { + doicon ${PN}.png + domenu ${PN}.desktop + doman ${PN}.1 + + dodoc README.md README.development + python_domodule aqt anki + python_newscript runanki anki + + # 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 + insinto /usr/share/anki + doins -r web +} diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13.ebuild deleted file mode 100644 index 15c2f2cdf075..000000000000 --- a/app-misc/anki/anki-2.1.13.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils python-single-r1 xdg - -DESCRIPTION="A spaced-repetition memory training program (flash cards)" -HOMEPAGE="https://apps.ankiweb.net" -SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz" - -S="${WORKDIR}/${P}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="latex +recording +sound test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - || ( - ( - >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] - ) - =dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${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 ) - sound? ( media-video/mpv ) - latex? ( - app-text/texlive - app-text/dvipng - ) -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" - -PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-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 -} - -src_compile() { - :; -} - -src_test() { - sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests\":" \ - -i tools/tests.sh || die - sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests3\":" \ - -i tools/tests.sh || die - sed -e "s:which nosetests3:which ${EROOT}usr/bin/nosetests3:" \ - -i tools/tests.sh || die - ./tools/tests.sh || die -} - -src_install() { - doicon ${PN}.png - domenu ${PN}.desktop - doman ${PN}.1 - - dodoc README.md README.development - python_domodule aqt anki - python_newscript runanki anki - - # 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 - insinto /usr/share/anki - doins -r web -} -- cgit v1.2.3