Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in profiles/eapi-5-files: ChangeLog package.use.stable.mask

[IAN DELANEY]

On Thu, 26 Sep 2013 11:05:54 -0400
Mike Gilbert <floppym@g.o> wrote:

> On Thu, Sep 26, 2013 at 5:52 AM, Ian Delaney (idella4)
> <idella4@g.o> wrote:
> > idella4     13/09/26 09:52:25
> >
> >   Modified:             ChangeLog package.use.stable.mask
> >   Log:
> >   Delete temp. entry of =app-emulation/xen-tools-4.2.1-r3 wrt Bug
> > #484524
> >
> > Revision  Changes    Path
> > 1.23                 profiles/eapi-5-files/ChangeLog
> >
> > file :
> > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/eapi-5-files/ChangeLog?rev=1.23&view=markup
> > plain:
> > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/eapi-5-files/ChangeLog?rev=1.23&content-type=text/plain
> > diff :
> > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/eapi-5-files/ChangeLog?r1=1.22&r2=1.23
> >
> > Index: ChangeLog
> > ===================================================================
> > RCS file: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/ChangeLog,v
> > retrieving revision 1.22
> > retrieving revision 1.23
> > diff -u -r1.22 -r1.23
> > --- ChangeLog   21 Sep 2013 17:25:23 -0000      1.22
> > +++ ChangeLog   26 Sep 2013 09:52:25 -0000      1.23
> > @@ -1,6 +1,11 @@
> >  # ChangeLog for Gentoo eapi-5-files profile directory
> >  # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL
> > v2 -#
> > $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/ChangeLog,v
> > 1.22 2013/09/21 17:25:23 floppym Exp $ +#
> > $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/ChangeLog,v
> > 1.23 2013/09/26 09:52:25 idella4 Exp $ +
> > +  26 Sep 2013 Ian Delaney <idella4@g.o> use.stable.mask:
> > +  Remove invalid entry for xen-tools-4.2.1-r3 which was removed
> > +  04 Jul 2013 on stabilising xen-tools-4.2.2-r3.ebuild; see
> > +  Bug #484524
> >
> >    21 Sep 2013; Mike Gilbert <floppym@g.o>
> > package.use.stable.mask: Stable-mask sys-boot/grub[libzfs]
> >
> >
> >
> > 1.25                 profiles/eapi-5-files/package.use.stable.mask
> >
> > file :
> > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask?rev=1.25&view=markup
> > plain:
> > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask?rev=1.25&content-type=text/plain
> > diff :
> > http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask?r1=1.24&r2=1.25
> >
> > Index: package.use.stable.mask
> > ===================================================================
> > RCS
> > file: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask,v
> > retrieving revision 1.24 retrieving revision 1.25
> > diff -u -r1.24 -r1.25
> > --- package.use.stable.mask     21 Sep 2013 17:25:23 -0000      1.24
> > +++ package.use.stable.mask     26 Sep 2013 09:52:25 -0000      1.25
> > @@ -1,6 +1,6 @@
> >  # Copyright 1999-2013 Gentoo Foundation
> >  # Distributed under the terms of the GNU General Public License v2
> > -#
> > $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask,v
> > 1.24 2013/09/21 17:25:23 floppym Exp $ +#
> > $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask,v
> > 1.25 2013/09/26 09:52:25 idella4 Exp $
> >
> >  # This file requires eapi 5 or later. New entries go on top.
> >  # Please use the same syntax as in package.use.mask
> > @@ -29,11 +29,9 @@
> >  # The dependencies for these flags are still in ~arch.
> >  sys-fs/lvm2 clvm cman
> >
> > -# Agostino Sarubbo <ago@g.o> (24 May 2013)
> > -# Justin Lecher <jlec@g.o> (30 May 2313)
> > -# Temporary mask because it needs texinfo-5
> > -# hvm needs qemu #471122
> > ->=app-emulation/xen-tools-4.2.1-r3 qemu hvm ocaml
> > +# Mike Gilbert <floppym@g.o> (09 Jun 2013)
> > +# Requires dev-python/pillow to be stable.
> > +virtual/python-imaging python_targets_python3_2
> > python_targets_python3_3
> >
> >  # Chris Reffett <creffett@g.o> (23 Nov 2012)
> >  # CMake's PHP module can't find our install location, so
> >
>
> Ian: Why did you add an entry to package.use.stable.mask with my name
> attached to it? An entry that I removed several weeks ago, no less.
>
> Also, your ChangeLog entry is auto-merged an old versionadly
> formatted (missing semicolon after the date).
>

ok it auto-merged an old version which I wrongly deduced as valid.
Between your re-removal and touching up the format all is fixed.

-- 
kind regards

Ian Delaney