[gentoo-python] Re: [gentoo-commits] gentoo-x86 commit in dev-python/natgrid: natgrid-0.2.1-r1.ebuild ChangeLog natgrid-0.2.1.ebuild

[gentoo-python] Re: [gentoo-commits] gentoo-x86 commit in dev-python/natgrid: natgrid-0.2.1-r1.ebuild ChangeLog natgrid-0.2.1.ebuild

[Mike Gilbert]

On Sat, Jul 27, 2013 at 2:47 AM, Ian Delaney (idella4)
<idella4@gentoo.org> wrote:
> idella4     13/07/27 06:47:57
>
>   Modified:             ChangeLog
>   Added:                natgrid-0.2.1-r1.ebuild
>   Removed:              natgrid-0.2.1.ebuild
>   Log:
>   migrate -> distutils-r1, remove old
>
>   (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
>
> Revision  Changes    Path
> 1.7                  dev-python/natgrid/ChangeLog
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/natgrid/ChangeLog?rev=1.7&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/natgrid/ChangeLog?rev=1.7&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/natgrid/ChangeLog?r1=1.6&r2=1.7
>
> Index: ChangeLog
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/dev-python/natgrid/ChangeLog,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- ChangeLog   2 Aug 2012 18:21:56 -0000       1.6
> +++ ChangeLog   27 Jul 2013 06:47:57 -0000      1.7
> @@ -1,6 +1,12 @@
>  # ChangeLog for dev-python/natgrid
> -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
> -# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/ChangeLog,v 1.6 2012/08/02 18:21:56 bicatali Exp $
> +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
> +# $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/ChangeLog,v 1.7 2013/07/27 06:47:57 idella4 Exp $
> +
> +*natgrid-0.2.1-r1 (27 Jul 2013)
> +
> +  27 Jul 2013; Ian Delaney <idella4@gentoo.org> +natgrid-0.2.1-r1.ebuild,
> +  -natgrid-0.2.1.ebuild:
> +  migrate -> distutils-r1, remove old
>
>    02 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -natgrid-0.1.ebuild,
>    natgrid-0.2.1.ebuild:
>
>
>
> 1.1                  dev-python/natgrid/natgrid-0.2.1-r1.ebuild
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/natgrid/natgrid-0.2.1-r1.ebuild?rev=1.1&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/natgrid/natgrid-0.2.1-r1.ebuild?rev=1.1&content-type=text/plain
>
> Index: natgrid-0.2.1-r1.ebuild
> ===================================================================
> # Copyright 1999-2013 Gentoo Foundation
> # Distributed under the terms of the GNU General Public License v2
> # $Header: /var/cvsroot/gentoo-x86/dev-python/natgrid/natgrid-0.2.1-r1.ebuild,v 1.1 2013/07/27 06:47:57 idella4 Exp $
>
> EAPI=5
> PYTHON_COMPAT=( python{2_6,2_7} )
>
> inherit distutils-r1
>
> DESCRIPTION="Matplotlib toolkit for gridding irreguraly spaced data"
> HOMEPAGE="http://matplotlib.sourceforge.net/users/toolkits.html"
> SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
>
> LICENSE="BSD"
> SLOT="0"
> KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
> IUSE=""
>
> DEPEND=">=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]"
> RDEPEND="${DEPEND}"
>
> PYTHON_MODNAME="mpl_toolkits/natgrid"
>
> python_install_all() {
>         insinto /usr/share/doc/${PF}
>         doins test.py || die "doins failed"
>         distutils-r1_python_install_all
> }
>
> python_install() {
>         # Fix collision with dev-python/matplotlib.
>         rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py" || die
>         distutils-r1_python_install
> }
>

You are removing a file that does not exist in python_install. Please fix this.

Re: [gentoo-python] Re: [gentoo-commits] gentoo-x86 commit in dev-python/natgrid: natgrid-0.2.1-r1.ebuild ChangeLog natgrid-0.2.1.ebuild

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

Dnia 2013-07-27, o godz. 16:26:24
Mike Gilbert <floppym@gentoo.org> napisał(a):

> > python_install() {
> >         # Fix collision with dev-python/matplotlib.
> >         rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py" || die
> >         distutils-r1_python_install
> > }
> >
> 
> You are removing a file that does not exist in python_install. Please fix this.

We should probably ban 'rm -f'. Globally.

-- 
Best regards,
Michał Górny

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 966 bytes --]