Ignore nonexistent files (bug #327875).

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

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index ed57e1d4eda9f1796c39e97e562a4b848c7d30a2..3de55c0d2d5a746dc3a90a9c840078f57936802e 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.18 2010/07/09 13:15:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.19 2010/07/12 10:17:17 arfrever Exp $
+
+  12 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  basemap-1.0.ebuild:
+  Ignore nonexistent files (bug #327875).
 
   09 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   basemap-1.0.ebuild:

diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index ef6e6f19c44c986b267fa5c6929fa6e8106f1cf6..5df9e567537d2634e72013fd40cf1f03c1c8863d 100644 (file)
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -3,6 +3,6 @@ AUX basemap-0.99.3-syslib.patch 2128 RMD160 d0243d3fdcbd208095039b24d5da4b35077b
 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 1495 RMD160 beb8d5c27be7d421570ec33ed35b59c34f330a64 SHA1 53aad55d646ee62bad8d3309927bc3583062c801 SHA256 9081c1a42b819fdc17514afe0e7dcce3a9f53ee3f9ce4bc9e86c732cec6d2e11
-MISC ChangeLog 3613 RMD160 3693d110497fd50e6565a816fc87e9b3116fe42d SHA1 26c3bd6ac6c2ca652c76ef739643d07a7e86c4ec SHA256 85098220dc24a9e83633a46b55ea0e574ee0d46ecc1ae25cf5a0e3c9d327171c
+EBUILD basemap-1.0.ebuild 1487 RMD160 71935fc10638993f3b27fd0df16f825dc7b4a9d9 SHA1 c9627a46c234b8e3db9b2ec30221a90cfdba7dfa SHA256 c50596a74385ecf3c14e19f1b5e7a1b8add39ce3c72d421c3b95317dcf805211
+MISC ChangeLog 3751 RMD160 3d9ab3e28da2577672f4f717ff180ae512bebfcd SHA1 d7e956b6555f5621c8a6e781663511f65ebaeab7 SHA256 40ed0f02257ba8dd05c136483208ceb7fae0c563a3e1b12f19d377afd6d7926a
 MISC metadata.xml 349 RMD160 a67153a56272b17f0c69173613b9bc7f533e25c5 SHA1 bc4e8104d58c19aedcf4a26f200fa2ffccd6a582 SHA256 6d623559310d5abca79dc753b17a3ca5f5691fd0ff82a9fa074bad50c75db97d

diff --git a/dev-python/basemap/basemap-1.0.ebuild b/dev-python/basemap/basemap-1.0.ebuild
index 17ff2fa523423108644c415eeb0c639d762e5637..328fd6b7ec85bef6dab47dbac7dc25b8f26364d5 100644 (file)
--- a/dev-python/basemap/basemap-1.0.ebuild
+++ b/dev-python/basemap/basemap-1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2010/07/09 13:15:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.ebuild,v 1.3 2010/07/12 10:17:17 arfrever Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -51,9 +51,9 @@ src_install() {
 
        cleaning() {
                # clean up collision with matplotlib
-               rm "${ED}$(python_get_sitedir)/mpl_toolkits/__init__.py" || return 1
+               rm -f "${ED}$(python_get_sitedir)/mpl_toolkits/__init__.py"
                # respect FHS
-               rm -r "${ED}$(python_get_sitedir)/mpl_toolkits/basemap/data"
+               rm -fr "${ED}$(python_get_sitedir)/mpl_toolkits/basemap/data"
        }
        python_execute_function -q cleaning
 }