Set PYTHON_DEPEND. Fix src_install().

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 97387f4bc736399a174cb35bf96b1d1612e3427a..ed57e1d4eda9f1796c39e97e562a4b848c7d30a2 100644 (file)
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.17 2010/07/08 20:38:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.18 2010/07/09 13:15:47 arfrever Exp $
+
+  09 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  basemap-1.0.ebuild:
+  Set PYTHON_DEPEND. Fix src_install().
 
 *basemap-1.0 (08 Jul 2010)
 

diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index a4f6e37cd71db33adf63ec39a93f09539824b97a..ef6e6f19c44c986b267fa5c6929fa6e8106f1cf6 100644 (file)
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX basemap-0.99.3-datadir.patch 451 RMD160 70683722b172491773c32021f13cc2fe835d7e7d SHA1 087eb8e7f426cb670620787d51e1ee511aa4aca4 SHA256 f41386b79e8f25001128ecde02b1dffc48842e16492f314586ff75483fcab83f
 AUX basemap-0.99.3-syslib.patch 2128 RMD160 d0243d3fdcbd208095039b24d5da4b35077bcb35 SHA1 fc7539938b2e9d65372e8c4100a96367073e3085 SHA256 709d5b49de0b1793d3b45ed4f5fe65f2aaea1b9659c3d0a94f959c7998faaeb4
 DIST basemap-0.99.4.tar.gz 101845634 RMD160 6741f41c2f933a0e0530f65e49b090f884d25e1e SHA1 e6eb626e3de3dbc1f17922c836ef431d6242dd9c SHA256 d436250339f029e2fe1500c1133ebcb71bfc4f1f93d4dde6ce53f8940927d605
 DIST basemap-1.0.tar.gz 103417791 RMD160 5fe2499e67fa317347588ba350bbe100d64fb19c SHA1 c1e2a9e76fdc6582dd951b86b4479cc439e8b372 SHA256 9fcf6e14bf978ab860955aa403ffcaa52e5b05586ea7bfbd634a2ca69d4e6869
 EBUILD basemap-0.99.4.ebuild 1418 RMD160 f3e4932c143475ad2bfd995d718e06177b04806d SHA1 80dfd9729236bb685be4f58c2f201d11446565fa SHA256 e8a5cf2cb2055f9f2f2f5755d3e5cfd0966a7373aef86a1ed723ae272b6bee62
-EBUILD basemap-1.0.ebuild 1396 RMD160 939a383db5e6554b4d5a19c178e8efb6f7174bf8 SHA1 45b25d8c70f467b01294f8bbb95998743691e8e0 SHA256 9357305f5653ab38421607a6dc93c00666ccd7a0d9077285f7bcdd28dae841df
-MISC ChangeLog 3477 RMD160 fd45243f88f564b5b3fa0475416d725414b50704 SHA1 ad3fbfb8a6b4667a023fdc4896d0c3970c098bb4 SHA256 066966bbdd01de669aed7ec2e9d5c9d3c74ebe4af62d8f5c259f538294254909
+EBUILD basemap-1.0.ebuild 1495 RMD160 beb8d5c27be7d421570ec33ed35b59c34f330a64 SHA1 53aad55d646ee62bad8d3309927bc3583062c801 SHA256 9081c1a42b819fdc17514afe0e7dcce3a9f53ee3f9ce4bc9e86c732cec6d2e11
+MISC ChangeLog 3613 RMD160 3693d110497fd50e6565a816fc87e9b3116fe42d SHA1 26c3bd6ac6c2ca652c76ef739643d07a7e86c4ec SHA256 85098220dc24a9e83633a46b55ea0e574ee0d46ecc1ae25cf5a0e3c9d327171c
 MISC metadata.xml 349 RMD160 a67153a56272b17f0c69173613b9bc7f533e25c5 SHA1 bc4e8104d58c19aedcf4a26f200fa2ffccd6a582 SHA256 6d623559310d5abca79dc753b17a3ca5f5691fd0ff82a9fa074bad50c75db97d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw2NzEACgkQ1ycZbhPLE2CSagCcDJ5KoZ2XR4AVH8tIKf3625ta
-NiQAn3OXoeff+3t+fM5tPJxfyO7ZGkwp
-=2Y8S
------END PGP SIGNATURE-----

diff --git a/dev-python/basemap/basemap-1.0.ebuild b/dev-python/basemap/basemap-1.0.ebuild
index 02e8500ac52ed9bbb36b30c18d6964aa48d08263..17ff2fa523423108644c415eeb0c639d762e5637 100644 (file)
--- a/dev-python/basemap/basemap-1.0.ebuild
+++ b/dev-python/basemap/basemap-1.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.ebuild,v 1.1 2010/07/08 20:38:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.ebuild,v 1.2 2010/07/09 13:15:47 arfrever Exp $
 
 EAPI=3
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
@@ -39,13 +40,20 @@ src_prepare() {
 
 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
-       # clean up collision with matplotlib
-       rm "${D%/}${EPREFIX}"/usr/lib*/python*/site-packages/mpl_toolkits/__init__.py || die
+
        # respect FHS
-       mv "${D%/}${EPREFIX}"/usr/lib*/python*/site-packages/mpl_toolkits/basemap/data \
-               "${D%/}${EPREFIX}"/usr/share/basemap || die
+       mv "${ED}$(python_get_sitedir -f)/mpl_toolkits/basemap/data" "${ED}usr/share/basemap"
+
+       cleaning() {
+               # clean up collision with matplotlib
+               rm "${ED}$(python_get_sitedir)/mpl_toolkits/__init__.py" || return 1
+               # respect FHS
+               rm -r "${ED}$(python_get_sitedir)/mpl_toolkits/basemap/data"
+       }
+       python_execute_function -q cleaning
 }