From 9bf60a3154d7baea1ede591f4b2822157fb058f7 Mon Sep 17 00:00:00 2001 From: Tomas Fabrizio Orsi Date: Thu, 6 Jun 2024 10:08:23 -0300 Subject: [PATCH] dev-python/basemap: Added @ksunden 's patches from https://github.com/matplotlib/basemap/pull/576 The package seems to be working :D Signed-off-by: Tomas Fabrizio Orsi --- README.md | 2 + dev-python/basemap-data-hires/Manifest | 1 + .../basemap-data-hires-1.4.1.ebuild | 29 ++++++++++ .../files/namespace-change.patch | 57 +++++++++++++++++++ dev-python/basemap-data/Manifest | 1 + .../basemap-data/basemap-data-1.4.1.ebuild | 29 ++++++++++ .../basemap-data/files/namespace-change.patch | 57 +++++++++++++++++++ dev-python/basemap/Manifest | 1 + dev-python/basemap/basemap-1.4.1.ebuild | 36 ++++++++++++ .../basemap/files/namespace-change.patch | 55 ++++++++++++++++++ 10 files changed, 268 insertions(+) create mode 100644 dev-python/basemap-data-hires/Manifest create mode 100644 dev-python/basemap-data-hires/basemap-data-hires-1.4.1.ebuild create mode 100644 dev-python/basemap-data-hires/files/namespace-change.patch create mode 100644 dev-python/basemap-data/Manifest create mode 100644 dev-python/basemap-data/basemap-data-1.4.1.ebuild create mode 100644 dev-python/basemap-data/files/namespace-change.patch create mode 100644 dev-python/basemap/Manifest create mode 100644 dev-python/basemap/basemap-1.4.1.ebuild create mode 100644 dev-python/basemap/files/namespace-change.patch diff --git a/README.md b/README.md index 3b54ce5..375577b 100644 --- a/README.md +++ b/README.md @@ -28,3 +28,5 @@ emaint sync -r lemon-lime - sdl2cpp: https://github.com/libSDL2pp/libSDL2pp - mininet: https://github.com/mininet/mininet + +- Matplotlib's basemap: https://github.com/matplotlib/basemap diff --git a/dev-python/basemap-data-hires/Manifest b/dev-python/basemap-data-hires/Manifest new file mode 100644 index 0000000..1683be2 --- /dev/null +++ b/dev-python/basemap-data-hires/Manifest @@ -0,0 +1 @@ +DIST basemap-data-hires-1.4.1.gh.tar.gz 129993453 BLAKE2B b6ce839550026b562425f7fb856571e1ce42afeb4cf83a1c096012ddf900f9e8c80a845789d3ac62eb31bc325e8690351b12497e5d1b07f6c0f1c280c64991b0 SHA512 b92171305e423c1a36025150f96358ef89676f36ffd651f00b9a607bb606d01d10539e0a7160b12d8ec6c29c6be191390c98f4228daf02f790e08705c4ee52a4 diff --git a/dev-python/basemap-data-hires/basemap-data-hires-1.4.1.ebuild b/dev-python/basemap-data-hires/basemap-data-hires-1.4.1.ebuild new file mode 100644 index 0000000..cb5d69c --- /dev/null +++ b/dev-python/basemap-data-hires/basemap-data-hires-1.4.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_EXT=1 +inherit distutils-r1 + +DESCRIPTION="Plot on map projections " +HOMEPAGE="https://matplotlib.org/basemap/stable/" +SRC_URI="https://github.com/matplotlib/basemap/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/basemap-${PV}/packages/basemap_data_hires" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" +" + +PATCHES=( + "${FILESDIR}/namespace-change.patch" +) + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/cython +" diff --git a/dev-python/basemap-data-hires/files/namespace-change.patch b/dev-python/basemap-data-hires/files/namespace-change.patch new file mode 100644 index 0000000..605ea45 --- /dev/null +++ b/dev-python/basemap-data-hires/files/namespace-change.patch @@ -0,0 +1,57 @@ +From cbe0cb6fc45b34e30675bad65a770ac292cb155d Mon Sep 17 00:00:00 2001 +From: Kyle Sunden +Date: Thu, 8 Jun 2023 16:42:59 -0500 +Subject: [PATCH 1/3] Convert to new style namespace packages + +--- + +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ + import os + import itertools + from setuptools import setup +-from setuptools import find_packages ++from setuptools import find_namespace_packages + + + def get_content(name, splitlines=False): +@@ -92,7 +92,7 @@ def get_content(name, splitlines=False): + "package_dir": + {"": "src"}, + "packages": +- find_packages(where="src"), ++ find_namespace_packages(where="src"), + "package_data": { + "mpl_toolkits.basemap_data": + data_files, + + +--- a/src/mpl_toolkits/__init__.py ++++ /dev/null +@@ -1,4 +0,0 @@ +-try: +- __import__('pkg_resources').declare_namespace(__name__) +-except ImportError: +- pass # must not have setuptools + +--- a/src/mpl_toolkits/basemap_data/__init__.py ++++ /dev/null +@@ -1,4 +0,0 @@ +-try: +- __import__('pkg_resources').declare_namespace(__name__) +-except ImportError: +- pass # must not have setuptools + +--- a/setup.py ++++ b/setup.py +@@ -86,9 +86,6 @@ def get_content(name, splitlines=False): + "maps", + "plots", + ], +- "namespace_packages": [ +- "mpl_toolkits.basemap_data", +- ], + "package_dir": + {"": "src"}, + "packages": diff --git a/dev-python/basemap-data/Manifest b/dev-python/basemap-data/Manifest new file mode 100644 index 0000000..fc4d6b2 --- /dev/null +++ b/dev-python/basemap-data/Manifest @@ -0,0 +1 @@ +DIST basemap-data-1.4.1.gh.tar.gz 129993453 BLAKE2B b6ce839550026b562425f7fb856571e1ce42afeb4cf83a1c096012ddf900f9e8c80a845789d3ac62eb31bc325e8690351b12497e5d1b07f6c0f1c280c64991b0 SHA512 b92171305e423c1a36025150f96358ef89676f36ffd651f00b9a607bb606d01d10539e0a7160b12d8ec6c29c6be191390c98f4228daf02f790e08705c4ee52a4 diff --git a/dev-python/basemap-data/basemap-data-1.4.1.ebuild b/dev-python/basemap-data/basemap-data-1.4.1.ebuild new file mode 100644 index 0000000..8feaf23 --- /dev/null +++ b/dev-python/basemap-data/basemap-data-1.4.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_EXT=1 +inherit distutils-r1 + +DESCRIPTION="Plot on map projections " +HOMEPAGE="https://matplotlib.org/basemap/stable/" +SRC_URI="https://github.com/matplotlib/basemap/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/basemap-${PV}/packages/basemap_data" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" +" + +PATCHES=( + "${FILESDIR}/namespace-change.patch" +) + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/cython +" diff --git a/dev-python/basemap-data/files/namespace-change.patch b/dev-python/basemap-data/files/namespace-change.patch new file mode 100644 index 0000000..cc81fbc --- /dev/null +++ b/dev-python/basemap-data/files/namespace-change.patch @@ -0,0 +1,57 @@ +From cbe0cb6fc45b34e30675bad65a770ac292cb155d Mon Sep 17 00:00:00 2001 +From: Kyle Sunden +Date: Thu, 8 Jun 2023 16:42:59 -0500 +Subject: [PATCH 1/3] Convert to new style namespace packages + +--- + +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ + import os + import itertools + from setuptools import setup +-from setuptools import find_packages ++from setuptools import find_namespace_packages + + + def get_content(name, splitlines=False): +@@ -114,7 +114,7 @@ def get_content(name, splitlines=False): + "package_dir": + {"": "src"}, + "packages": +- find_packages(where="src"), ++ find_namespace_packages(where="src"), + "package_data": { + "mpl_toolkits.basemap_data": + data_files, + + +--- a/src/mpl_toolkits/__init__.py ++++ /dev/null +@@ -1,4 +0,0 @@ +-try: +- __import__('pkg_resources').declare_namespace(__name__) +-except ImportError: +- pass # must not have setuptools + +--- a/src/mpl_toolkits/basemap_data/__init__.py ++++ /dev/null +@@ -1,4 +0,0 @@ +-try: +- __import__('pkg_resources').declare_namespace(__name__) +-except ImportError: +- pass # must not have setuptools + +--- a/setup.py ++++ b/setup.py +@@ -108,9 +108,6 @@ def get_content(name, splitlines=false): + "maps", + "plots", + ], +- "namespace_packages": [ +- "mpl_toolkits.basemap_data", +- ], + "package_dir": + {"": "src"}, + "packages": \ No newline at end of file diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest new file mode 100644 index 0000000..561a78b --- /dev/null +++ b/dev-python/basemap/Manifest @@ -0,0 +1 @@ +DIST basemap-1.4.1.gh.tar.gz 129993453 BLAKE2B b6ce839550026b562425f7fb856571e1ce42afeb4cf83a1c096012ddf900f9e8c80a845789d3ac62eb31bc325e8690351b12497e5d1b07f6c0f1c280c64991b0 SHA512 b92171305e423c1a36025150f96358ef89676f36ffd651f00b9a607bb606d01d10539e0a7160b12d8ec6c29c6be191390c98f4228daf02f790e08705c4ee52a4 diff --git a/dev-python/basemap/basemap-1.4.1.ebuild b/dev-python/basemap/basemap-1.4.1.ebuild new file mode 100644 index 0000000..4e0b4ff --- /dev/null +++ b/dev-python/basemap/basemap-1.4.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_EXT=1 +inherit distutils-r1 + +DESCRIPTION="Plot on map projections " +HOMEPAGE="https://matplotlib.org/basemap/stable/" +SRC_URI="https://github.com/matplotlib/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${P}/packages/${PN}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + sci-libs/geos + dev-python/matplotlib + dev-python/numpy + dev-python/pyproj + sci-libs/pyshp + dev-python/basemap-data + dev-python/basemap-data-hires +" + +PATCHES=( + "${FILESDIR}/namespace-change.patch" +) + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/cython +" diff --git a/dev-python/basemap/files/namespace-change.patch b/dev-python/basemap/files/namespace-change.patch new file mode 100644 index 0000000..c8d1b39 --- /dev/null +++ b/dev-python/basemap/files/namespace-change.patch @@ -0,0 +1,55 @@ +From cbe0cb6fc45b34e30675bad65a770ac292cb155d Mon Sep 17 00:00:00 2001 +From: Kyle Sunden +Date: Thu, 8 Jun 2023 16:42:59 -0500 +Subject: [PATCH 1/3] Convert to new style namespace packages + +--- + +--- a/setup.py ++++ b/setup.py +@@ -10,6 +10,6 @@ + import glob + import warnings + from setuptools import setup +-from setuptools import find_packages ++from setuptools import find_namespace_packages + from setuptools.command.sdist import sdist + from setuptools.extension import Extension + + +--- a/setup.py ++++ b/setup.py +@@ -230,7 +230,7 @@ def run(self): + "package_dir": + {"": "src"}, + "packages": +- find_packages(where="src"), ++ find_namespace_packages(where="src"), + "ext_modules": + ext_modules, + "data_files": + + +--- a/src/mpl_toolkits/__init__.py ++++ /dev/null +@@ -1,6 +0,0 @@ +-from __future__ import (absolute_import, division, print_function) +- +-try: +- __import__('pkg_resources').declare_namespace(__name__) +-except ImportError: +- pass # must not have setuptools + + +--- a/setup.py ++++ b/setup.py +@@ -224,9 +224,6 @@ def run(self): + "maps", + "plots", + ], +- "namespace_packages": [ +- "mpl_toolkits", +- ], + "package_dir": + {"": "src"}, + "packages":