Re: [Libreoffice] [PORTERS HEADS-UP] feature/kill-set_soenv

Dne 19. září 2011 20:32 Norbert Thiebaud <nthiebaud@gmail.com> napsal(a):
> 2011/9/19 Tomáš Chvátal <scarabeus@gentoo.org>:
> > 2011/9/19 Bjoern Michaelsen <bjoern.michaelsen@canonical.com>:
> > *snip*
> >
> > > So what I am asking is:
> > >
> > >  Can porters help me get "their" platform buildable on that branch?
> > >
> > > I would integrate that branch on master in about 2 weeks and would love
> > > it to be tested on all major platforms by then. I ported linux for now
> > > and can test the ppc, armel, i386 and amd64 target, but elsewhere any
> > > help (porting and testing) is appreciated.
> > *snip*
> >
> > If anyone is interested in testing this on his Gentoo then he can
> > simply do this:
> >
> > # echo 'libreoffice_LIVE_BRANCH="kill-set_soenv"' > /etc/make.conf
> > # emerge -1 =libreoffice-9999-r1
>
> Is it really going to work ? that branch exist only in the core
> repository but not in help, binfilter, dictionnary or translation....
>
> Norbert

Damn,
I wrote the former code in git eclass to be non-fatal (eg just keep
master if it is not there),
but in git-2.eclass i stop the execution if the branch is not found.


    debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}"
    git checkout -b ${branchname} ${src} \
        || die "${FUNCNAME}: changing the branch failed"

In that case the patch I attached here should make it do the magic :)

Cheers

Tom

PS: good catch, I completely forgot that I made that branching fatal.

Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.17
diff -u -b -B -r1.17 libreoffice-9999-r1.ebuild
--- libreoffice-9999-r1.ebuild  18 Sep 2011 09:45:10 -0000      1.17
+++ libreoffice-9999-r1.ebuild  19 Sep 2011 18:43:06 -0000
@@ -282,6 +282,7 @@
                for mod in ${MODULES}; do
                        mypv=${PV/.9999}
                        [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+                       [[ ${mod} == core ]] && EGIT_BRANCH="kill-set_soenv"
                        EGIT_PROJECT="${PN}/${mod}"
                        EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
                        EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"