commit: da75589ecb1d68ed05fd86e4ce859343f0c3081a Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Sat Oct 16 19:26:46 2021 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Sun Oct 17 05:22:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=da75589e
www-client/woob: use geopy from ::gentoo Closes: https://bugs.gentoo.org/817950 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> www-client/woob/metadata.xml | 2 +- www-client/woob/woob-3.0-r1.ebuild | 12 ++++-------- www-client/woob/woob-9999.ebuild | 12 ++++-------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/www-client/woob/metadata.xml b/www-client/woob/metadata.xml index c698af234..2092bcc33 100644 --- a/www-client/woob/metadata.xml +++ b/www-client/woob/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> <email>[email protected]</email> diff --git a/www-client/woob/woob-3.0-r1.ebuild b/www-client/woob/woob-3.0-r1.ebuild index b00e3f9ba..24d0a16c3 100644 --- a/www-client/woob/woob-3.0-r1.ebuild +++ b/www-client/woob/woob-3.0-r1.ebuild @@ -1,15 +1,12 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - inherit distutils-r1 -if [[ "${PV}" == "9999" ]] -then +if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://gitlab.com/${PN}/${PN}.git"; inherit git-r3 else @@ -35,20 +32,19 @@ RDEPEND=" dev-python/Babel[${PYTHON_USEDEP}] dev-python/feedparser[${PYTHON_USEDEP}] - dev-python/geopy[${PYTHON_USEDEP}] dev-python/prettytable[${PYTHON_USEDEP}] dev-python/python-jose[${PYTHON_USEDEP}] dev-python/selenium[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] + sci-geosciences/geopy[${PYTHON_USEDEP}] " -BDEPEND="test? ( ${RDEPEND} )" distutils_enable_tests nose distutils_enable_sphinx docs/source python_prepare_all() { + # disable failing tests sed -i \ -e '/woob.browser.browsers,/d' \ -e '/woob.browser.pages,/d' \ diff --git a/www-client/woob/woob-9999.ebuild b/www-client/woob/woob-9999.ebuild index b00e3f9ba..24d0a16c3 100644 --- a/www-client/woob/woob-9999.ebuild +++ b/www-client/woob/woob-9999.ebuild @@ -1,15 +1,12 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - inherit distutils-r1 -if [[ "${PV}" == "9999" ]] -then +if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://gitlab.com/${PN}/${PN}.git"; inherit git-r3 else @@ -35,20 +32,19 @@ RDEPEND=" dev-python/Babel[${PYTHON_USEDEP}] dev-python/feedparser[${PYTHON_USEDEP}] - dev-python/geopy[${PYTHON_USEDEP}] dev-python/prettytable[${PYTHON_USEDEP}] dev-python/python-jose[${PYTHON_USEDEP}] dev-python/selenium[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] + sci-geosciences/geopy[${PYTHON_USEDEP}] " -BDEPEND="test? ( ${RDEPEND} )" distutils_enable_tests nose distutils_enable_sphinx docs/source python_prepare_all() { + # disable failing tests sed -i \ -e '/woob.browser.browsers,/d' \ -e '/woob.browser.pages,/d' \
