revbump; convert -> distutils-r1, restrict test phase (see comments), rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 91 insertions, 79 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index acc001f052f3..44f2298d772e 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.34 2015/02/02 14:48:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.35 2015/02/15 09:19:53 idella4 Exp $
+
+*basemap-1.0.7-r1 (15 Feb 2015)
+
+  15 Feb 2015; Ian Delaney <idella4@gentoo.org> +basemap-1.0.7-r1.ebuild,
+  -basemap-1.0.7.ebuild:
+  revbump; convert -> distutils-r1, restrict test phase (see comments), rm old
 
   02 Feb 2015; Manuel Rüger <mrueg@gentoo.org> -basemap-1.0.6.ebuild:
   Remove old.
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index 53f8f48a311d..b4b237f76e89 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST basemap-1.0.7.tar.gz 129694711 SHA256 e07ec2e0d63b24c9aed25a09fe8aff2598f82a85da8db74190bac81cbf104531 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20 WHIRLPOOL 7da55c32cdcea897e71367ec7d2b916a66973a7a761b001c0be5a9a5d97347a51c51e57828fb46f8c70b3a6576c562377657d129dc6fb54333e76897aaf76f6e
-EBUILD basemap-1.0.7.ebuild 1998 SHA256 383e27d4a7cb5d31867e266899a79b1fdaa2a65d95dcdbb44a3825720f4f36d1 SHA512 c202014371e4b163d66536d4ef125861cabc848fbd3fa3f4c01858b2919f64e7b83d87bfce98c2f4e40907c8da83ee660575fd48198cc51a7a4a737212ad5257 WHIRLPOOL 8f740555a955956b476931259ca8b866be0a7a735893c2a8b64ed856c491737b58f4f34e7b796ff42f197bd56e41ab626e688573f276b241b4375eff79fe2232
-MISC ChangeLog 5898 SHA256 b09e582c1cafe2af89e107f73c8e5ac764bad8a47e83556daeb9b7432245d54f SHA512 6f3881b48b8e8492cc8a02304ca539d5b5cfc2a67f9c7491f6a465ca03997e147dcb481ede820d2637a6e745e13ab43b54891a13095ab90db8775656c3add9f6 WHIRLPOOL fc7dc978e59d09db5456d2e1f963e5ca813ffebe541e3fddb8b73fd2a81dd82bb9d50ff8aa75015c03d3c351a1a71b49aca9aa7484fba36931214bc3e29b05ee
+EBUILD basemap-1.0.7-r1.ebuild 2203 SHA256 215dd07d4086e894478886335742bf122a170efecf6ef945e7c7a3775977d791 SHA512 fdbb8fb440f55b76c8b357f6be768eeb5308d927b79dbd4205ab7927ccd27bdf75bb7735e4824dad0771a1cd4e6313261ad568936e44f3c6651e8dddacef152b WHIRLPOOL fb7f08c416829abffb695dd6c9c6a20c5b1d1e7461688a4f2afed7e737be4df6eb348cc4718f512b7d435359be8f37ca14c31d43025acf758cc7d44b65163906
+MISC ChangeLog 6112 SHA256 151dfaa766b44772befbc8924773d943741920a14c69b1bba783ff713568af9a SHA512 3500b9348c0d440cb2becb768ee3fe2fd5a12cdc54abaa0b44174ae8a1d114dba2754dfacf76cc9170b707a838c75afc191f5438497d7cece4a7b756f3da444b WHIRLPOOL a137826952990199092537e11b7521240c2cd8be561cd112465d59c9c0c86212d17f185bd532d8289eea356b7c72950d7b41068a68567f421239f04cf0e85f37
 MISC metadata.xml 349 SHA256 6d623559310d5abca79dc753b17a3ca5f5691fd0ff82a9fa074bad50c75db97d SHA512 e65e55b85105352a5ae5d124183c69347cfde61ae71251c7788f95093cd90dd719a69aa9771b642a7cc40844bc83c4253b14d55f731ec1b8bfadf2577271f8ce WHIRLPOOL ec19e8be56e03d9c3e99892a1dd36540d5367ed050fbb4a09a10159c21cc19a5e2114180a09ab9e7689280e06dd47438b5b9e3391f2d4810bd7ea4ff333dd582
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTgZMcACgkQso7CE7gHKw231gCgjk4u3Wfb/JFT/HcZOtCT+1At
+eZsAoLtYoGiijjiXigN8SMlOgazPeFzn
+=oxW4
+-----END PGP SIGNATURE-----
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..db3025040c92
--- /dev/null
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.7-r1.ebuild,v 1.1 2015/02/15 09:19:53 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/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"
+
+CDEPEND="sci-libs/shapelib
+	>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	>=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/dap[${PYTHON_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
+}
+
+#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.ebuild b/dev-python/basemap/basemap-1.0.7.ebuild
deleted file mode 100644
index 71fc5c87d007..000000000000
--- a/dev-python/basemap/basemap-1.0.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.7.ebuild,v 1.1 2013/08/26 04:55:43 patrick Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit eutils distutils virtualx
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/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"
-
-CDEPEND="sci-libs/shapelib
-	>=dev-python/matplotlib-0.98
-	>=sci-libs/geos-3.3.1[python]"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools"
-
-RDEPEND="${CDEPEND}
-	>=dev-python/pupynere-1.0.8
-	dev-python/httplib2
-	dev-python/dap"
-
-DOCS="FAQ API_CHANGES"
-
-REQUIRED_USE="test? ( examples )"
-
-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_src_prepare
-}
-
-# This one works. examples appear to be need be installed to run.
-src_test() {
-	testing() {
-		pushd "$(find build-${PYTHON_ABI} -name lib.\*)/mpl_toolkits/basemap/"
-		PYTHONPATH=.:../../ "$(PYTHON)" test.py
-		popd
-	}
-	VIRTUALX_COMMAND=python_execute_function virtualmake testing
-}
-
-src_install() {
-	distutils_src_install --install-data="${EPREFIX}/usr/share/${PN}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-
-	# respect FHS
-	mv "${ED}$(python_get_sitedir -f)/mpl_toolkits/basemap/data" "${ED}usr/share/basemap"
-
-	cleaning() {
-		# clean up collision with matplotlib
-		rm -f "${ED}$(python_get_sitedir)/mpl_toolkits/__init__.py"
-		# respect FHS
-		rm -fr "${ED}$(python_get_sitedir)/mpl_toolkits/basemap/data"
-	}
-	python_execute_function -q cleaning
-}