Hey, a few hours ago the new feature release git 1.6.3 was released [1,2]. I modified the git 1.6.3_rc4 ebuild and wrote a patch which adds the Makefile parameter NO_CVS. In older versions of the Gentoo git ebuild the git-cvsserver was not installed when setting use=-perl. But since the NO_PERL patch was merged upstream and is included into this new release, the git ebuild installs git-cvsserver even if you set use=-cvs. This new NO_CVS patch prevents building and installing the git-cvsserver but still installs all cvs-related documentations and man-pages: $ equery files git | grep 'cvs' /usr/share/doc/git-1.6.3/git-cvsexportcommit.txt.bz2 /usr/share/doc/git-1.6.3/git-cvsimport.txt.bz2 /usr/share/doc/git-1.6.3/git-cvsserver.txt.bz2 /usr/share/doc/git-1.6.3/gitcvs-migration.txt.bz2 /usr/share/man/man1/git-cvsexportcommit.1.bz2 /usr/share/man/man1/git-cvsimport.1.bz2 /usr/share/man/man1/git-cvsserver.1.bz2 /usr/share/man/man7/gitcvs-migration.7.bz2 I will attach a patch of the new git-1.6.3.ebuild (applies on git-1.6.3_rc4.ebuild) and the git-1.6.3-nocvs.patch. I hope that this new patch works for everyone. Have a nice day. PS: The 20090505-git-1.6.2.5-getopt-fixes.patch was merged upstream and is not needed anymore. [1] http://git.kernel.org/?p=git/git.git;a=commit;h=f01f1099f40f24fe6f7802185340a6fa3a3d4f35 [2] http://article.gmane.org/gmane.comp.version-control.git/118433 Reproducible: Always Steps to Reproduce:
Created attachment 190631 [details, diff] git 1.6.3 ebuild patch (on git-1.6.3_rc4.ebuild)
Created attachment 190632 [details, diff] git 1.6.3 nocvs patch
I'm sorry. Both patches had mistakes. I will attach both patches in a new version and I hope that they are now working without problems. By the way they are solving the following problem: If you are using "cvs -perl" in one of the current ebuilds the ebuild says that it will ignore the "cvs" flag but the cvs scripts are installed into the system. When executing them they just raise a error that git was compiled with NO_PERL (with "-perl"). Now the "cvs" flag is getting really ignored and no cvs scripts are installed. I hope the new patches are working for everyone. Have a nice day.
Created attachment 190635 [details, diff] git 1.6.3 ebuild patch (on git-1.6.3_rc4.ebuild)
Created attachment 190636 [details, diff] git 1.6.3 nocvs patch
I had my commit in the tree before I saw this bug (my email is running slow today) I'm not sure that adding a nocvs patch like this is correctly, I'd rather just get upstream to update the noperl stuff to exclude CVS as well.
oops, forgot to assign
I think this should be seperated. Maybe a user want to install git with the perl stuff, but without the cvs scripts and server. I guess it was an upstream design decision to install these cvs shell scripts saying that the cvs server is not available because git was build with NO_PERL instead of just not installing these shell scripts. But why should the cvs use-flag just be used in src_test and not by the rest of the ebuild? And why does the ebuild says that the +cvs flag is ignored when using "-perl" (which generally means that the ebuild is building the programm without this support) but installs these cvs shell scripts anyway? I think the ebuild should not install these cvs shell scripts when using "-cvs" or "-perl". If we want these cvs shell scripts when using "+cvs -perl" my ebuild patch can be changed from > if ! use cvs || ! use perl ; then > myopts="${myopts} NO_CVS=YesPlease" > fi > to > use cvs || myopts="${myopts} NO_CVS=YesPlease" What do you think?
And by the way: You removed the "files/50git-gentoo.el" file out of the portage which is still used in line 69 and 213 of the current git-1.6.3.ebuild.
I restored that other file already. I'm strongly in favour of upstream's decision to install the wrapper saying the command is not available rather than not installing it at all. We could install those wrappers for USE=-cvs as well, would that be suitable?
In that case it might be better to leave the ebuild like it is now. If the ebuild installs these cvs files in any case it can directly install the original files from the git release. That should be better than installing some custom shell scripts when using "-cvs perl" which are raising an error that git was built without cvs support and that the user should remerge git with the +cvs use-flag in order to use these scripts.
It wasn't clear in your last message. - Can we close this bug, with acceptance of the upstream state? OR - Override/modify their "CVS is not available" message with one telling the user to emerge with USE=cvs?
You can close this ticket. I think that the upstream message is clear and does not need to be modified. Thanks. Best regards.
Thanks.
