gentoo Easter resync : 12.04.2020

3 files changed, 7 insertions, 81 deletions

diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index 3317b6d15d4e..a150eaf218c4 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,4 +1,3 @@
 DIST basemap-1.0.7.tar.gz 129694711 BLAKE2B ec2159b01711584384d472205f8d3cadd06cfca07202421be534d7778f94000ccc9ae4b8e07a9fd595b7c06c335ec7af7ac2e9d84f7418bb0db1aeab67125559 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20
-EBUILD basemap-1.0.7-r2.ebuild 2238 BLAKE2B d0dcd4e6bd14377ff0f99297597859cdeb01d288fe3c9c54c53003f7af5af868092dc9a71e81da1fffa2106e7ca6f21ebc4d8243efa76c50ad089f9229306ddc SHA512 e4116a8bf9bb88ebdef68be187b7339fadec9ebda3f130a834b147083ce64ce2f4a03184d7d9ad8a3d2e94548749f95a60a328e72e831733aed76e41289c39c5
-EBUILD basemap-1.0.7-r4.ebuild 2277 BLAKE2B 2e9217616ab07867a4e533bc01d58c3ae45f1a408c10f1433a76cba8c69d3bdc7e992ff04bcc55449d647a34e9ec52e4e469b2ad926a7336bb9162ef7a0431bd SHA512 254d75e375e006f061ff646efcadf015b35651597ebf0fd326f118563325cb7cbefef0d6a7c9819a7ae519e437f1b9258f4e1ba7672f7d9ee4b41d6744ec9c80
+EBUILD basemap-1.0.7-r4.ebuild 2322 BLAKE2B 515f33c04c802f64582d6913f004fedc923409c84791cb3a3809ddef069a67a12fed1a472aaf67f8a0f2fd635a4cf3fd151479403db93acad3c904fdefeb5603 SHA512 fb8a83a2de6d9f1dba98bacc56e273383fdae05e6652e137df18e40c9858ba147fc0c1d3416f3997c4b6c5bb996d7282dcaeff568eb4f698ffd96095d3a9bb2b
 MISC metadata.xml 613 BLAKE2B 899d7032acf24b4d5a03efe56d537172d6b10105a71636afbaa63762f4669afb7116cceec9e1be1ef7c8ed23f03d9066b2ace57876770bc49450020e57121cae SHA512 f00ec05a0bf306703627b8a4846a20dcc4503646df4c38ae75f360c452e4e824db537cde0f93d037840583f3c245453387a665ca9ebf5356be45be84588893ee
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
deleted file mode 100644
index f6f476179223..000000000000
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-IUSE="examples test"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT GPL-2"
-
-DEPEND="sci-libs/shapelib
-	$(python_gen_cond_dep '
-		|| (
-			>=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	>=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/dap[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS="FAQ API_CHANGES"
-#REQUIRED_USE="test? ( examples )"
-# The test phase ought never have been onvoked according to the above.
-# The test phase appears to require the package to fist be emerged, which ...
-# Until the distutils_install_for_testing func refrains from failing with
-# mkdir: cannot create directory ‘/test’: Permission denied
-# reluctantly this phase is assigned
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		setup.py || die
-	# use /usr/share/data
-	sed -i \
-		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
-		"${S}"/lib/mpl_toolkits/basemap/*.py || die
-	distutils-r1_src_prepare
-	append-flags -fno-strict-aliasing
-}
-
-#src_test() {
-#	distutils_install_for_testing
-#}
-
-python_install() {
-	distutils-r1_python_install
-	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
-	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
-	insinto usr/share/basemap/
-	doins  lib/mpl_toolkits/basemap/data/*
-
-	# clean up collision with matplotlib
-	rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py"
-	# respect FHS
-	rm -fr "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/basemap/basemap-1.0.7-r4.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild
index 38c0bfb4645e..0d90a1bf6333 100644
--- a/dev-python/basemap/basemap-1.0.7-r4.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples test"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 DEPEND="sci-libs/shapelib
@@ -72,6 +72,10 @@ python_install() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }