From c18f9bf03c972ba701c6e859dd076423999dcdcc Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Mon, 6 Apr 2020 03:05:14 +0200 Subject: [PATCH 1/4] dev-python/geopy: bump masked package Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Alessandro Barbieri --- dev-python/geopy/Manifest | 1 + dev-python/geopy/geopy-1.21.0.ebuild | 43 ++++++++++++++++++++++++++++ dev-python/geopy/metadata.xml | 16 +++++++++++ 3 files changed, 60 insertions(+) create mode 100644 dev-python/geopy/Manifest create mode 100644 dev-python/geopy/geopy-1.21.0.ebuild create mode 100644 dev-python/geopy/metadata.xml diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest new file mode 100644 index 0000000000..d4f7b1ce1c --- /dev/null +++ b/dev-python/geopy/Manifest @@ -0,0 +1 @@ +DIST geopy-1.21.0.tar.gz 254831 BLAKE2B 2b8aa46277ea65cde2e037ee71d42ef42451d1ee3bc38b7a6f89e15293074f80cf52b53bad6a483769fe8ce6d267db27bd1878e6248c0c4b18a92a86df4a2ae9 SHA512 8dc148795251e5bf74948859430856569e7aef38ac09432f86498ec3f5939277d2d548f3c35c6f14e6ef1645fdfa48bf70ab998888ba395f199c08aa8dbe6ed2 diff --git a/dev-python/geopy/geopy-1.21.0.ebuild b/dev-python/geopy/geopy-1.21.0.ebuild new file mode 100644 index 0000000000..fa0f5ce926 --- /dev/null +++ b/dev-python/geopy/geopy-1.21.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit distutils-r1 + +DESCRIPTION="A Geocoding Toolbox for Python" +HOMEPAGE=" + http://www.geopy.org + https://github.com/geopy/geopy + https://pypi.org/project/geopy +" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +IUSE="timezone" +REQUIRED_USE="test? ( timezone )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + =sci-geosciences/geographiclib-1.49[${PYTHON_USEDEP}] + + timezone? ( + dev-python/pytz[${PYTHON_USEDEP}] + ) +" +DEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest +distutils_enable_sphinx \ + ">=dev-python/sphinx_rtd_theme-0.4.0" \ + dev-python/readme_renderer diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml new file mode 100644 index 0000000000..01d58c2064 --- /dev/null +++ b/dev-python/geopy/metadata.xml @@ -0,0 +1,16 @@ + + + + + python@gentoo.org + Python + + + geopy + geopy + geopy/geopy + + + Enables localized date support + + From ae2581bc50c1b570091c341f570d0df859d2dddb Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 6 Apr 2020 19:42:20 +0200 Subject: [PATCH 2/4] sci-geosciences: do not die is use doc doing this: use x && do_thing || die makes the build die is use -x so don't do that Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan --- .../geographiclib/geographiclib-1.50.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild index 7f8a351c58..64a438f467 100644 --- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild +++ b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild @@ -110,6 +110,8 @@ DEPEND=" S="${WORKDIR}/${MY_P}" distutils_enable_tests setup.py +# there are additional docs in the python dir +distutils_enable_sphinx python/doc src_prepare() { #TODO: strip cflags @@ -152,6 +154,7 @@ src_compile() { cd "python" || die python_foreach_impl distutils-r1_python_compile cd ".." || die + use doc && build_sphinx python/doc fi } @@ -176,6 +179,10 @@ src_install() { cmake_src_install + # remove python things added by the cmake_src_install function + # these are installed in the wrong python dir + rm -rf "${D}/usr/$(get_libdir)/python" || die + # if use python we re-add these python files correctly if use python; then cd "python" || die python_foreach_impl distutils-r1_python_install @@ -184,8 +191,7 @@ src_install() { #TODO: find out if java stuff need something - rm -rf "${D}/usr/$(get_libdir)/python" || die - - use doc && mkdir -p "${D}/usr/share/${P}" || die - use doc && mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/${P}/doc" || die + # Installs to wrong doc dir for some reason + # Also happens with USE="-doc" + mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/doc/${P}" || die } From 08af635f3d1eb0d94b173660d50b0bcfc9962232 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 6 Apr 2020 20:00:06 +0200 Subject: [PATCH 3/4] sci-geosciences/geographiclib: add ~x86 for dep geopy Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan --- sci-geosciences/geographiclib/geographiclib-1.50.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild index 64a438f467..749b3a9bc1 100644 --- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild +++ b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="C++ library for converting geographic coordinate systems" HOMEPAGE="https://sourceforge.net/projects/geographiclib/" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE_GEOIDS_DATASET=" geoids_dataset_egm84-30 geoids_dataset_egm84-15 From c99d254cdc153c1263c54b5bfb53afc695dd1dc8 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 6 Apr 2020 20:00:58 +0200 Subject: [PATCH 4/4] dev-python/geopy: fix tests and doc Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan --- dev-python/geopy/geopy-1.21.0.ebuild | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dev-python/geopy/geopy-1.21.0.ebuild b/dev-python/geopy/geopy-1.21.0.ebuild index fa0f5ce926..cb9c8146f5 100644 --- a/dev-python/geopy/geopy-1.21.0.ebuild +++ b/dev-python/geopy/geopy-1.21.0.ebuild @@ -38,6 +38,24 @@ DEPEND=" " distutils_enable_tests pytest -distutils_enable_sphinx \ +distutils_enable_sphinx docs \ ">=dev-python/sphinx_rtd_theme-0.4.0" \ dev-python/readme_renderer + +python_prepare_all() { + # [Errno -3] Temporary failure in name resolution + rm test/geocoders/nominatim.py || die + rm test/geocoders/geocodefarm.py || die + rm test/geocoders/databc.py || die + rm test/geocoders/banfrance.py || die + rm test/geocoders/arcgis.py || die + rm test/test_proxy.py || die + rm test/geocoders/geonames.py || die + rm test/geocoders/photon.py || die + + # depend on the above and now fail to import + rm test/geocoders/openmapquest.py || die + rm test/geocoders/pickpoint.py || die + + distutils-r1_python_prepare_all +}