Feedback welcome. Diff inline, and attached. Index: git-1.7.1.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild,v retrieving revision 1.1 diff -u -r1.1 git-1.7.1.1.ebuild --- git-1.7.1.1.ebuild 30 Jun 2010 00:15:58 -0000 1.1 +++ git-1.7.1.1.ebuild 21 Jul 2010 13:41:52 -0000 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild,v 1.1 2010/06/30 00:15:58 robbat2 Exp $ -EAPI=2 +EAPI=3 inherit toolchain-funcs eutils elisp-common perl-module bash-completion [ "$PV" == "9999" ] && inherit git @@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-$ {DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" else SRC_URI="" EGIT_BRANCH="master" @@ -113,6 +113,18 @@ myopts="${myopts} NO_CURL=YesPlease" fi + # broken assumptions, because of broken build system ... + myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts="${myopts} INSTALL=install TAR=tar" + myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/bash" + myopts="${myopts} SANE_TOOL_PATH=" + myopts="${myopts} OLD_ICONV=" + myopts="${myopts} NO_EXTERNAL_GREP=" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + use !elibc_glibc && use iconv && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + use iconv \ || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." # || myopts="${myopts} NO_ICONV=YesPlease" @@ -126,6 +138,29 @@ use subversion \ || myopts="${myopts} NO_SVN_TESTS=YesPlease" + if [[ ${CHOST} == *-mint* ]] ; then + myopts="${myopts} NO_MMAP=YesPlease" + myopts="${myopts} NO_IPV6=YesPlease" + myopts="${myopts} NO_STRLCPY=YesPlease" + myopts="${myopts} NO_MEMMEM=YesPlease" + myopts="${myopts} NO_MKDTEMP=YesPlease" + myopts="${myopts} NO_MKSTEMPS=YesPlease" + fi + if [[ ${CHOST} == *-interix* ]] ; then + myopts="${myopts} NO_IPV6=YesPlease" + myopts="${myopts} NO_MEMMEM=YesPlease" + myopts="${myopts} NO_MKDTEMP=YesPlease" + myopts="${myopts} NO_STRTOUMAX=YesPlease" + myopts="${myopts} NO_STRTOULL=YesPlease" + myopts="${myopts} NO_INET_NTOP=YesPlease" + myopts="${myopts} NO_INET_PTON=YesPlease" + myopts="${myopts} NO_NSEC=YesPlease" + myopts="${myopts} NO_MKSTEMPS=YesPlease" + fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi + has_version '>=app-text/asciidoc-8.0' \ && myopts="${myopts} ASCIIDOC8=YesPlease" myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" @@ -163,6 +198,8 @@ # Merged in 1.6.3 final 2009/05/07 #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + [[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch + # JS install fixup epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch @@ -175,6 +212,8 @@ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ -e 's:^\(CC = \).*$:\1$(OPTCC):' \ -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ Makefile || die "sed failed" # Never install the private copy of Error.pm (bug #296310) @@ -186,6 +225,9 @@ sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ Documentation/Makefile || die "sed failed" + # bug #318289 + epatch "${FILESDIR}"/${PN}-1.7.1-interix.patch + epatch "${FILESDIR}"/${PN}-1.6.6.1-interix6.patch } git_emake() { @@ -195,8 +237,9 @@ OPTLDFLAGS="${LDFLAGS}" \ OPTCC="$(tc-getCC)" \ OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ "$@" } @@ -260,7 +303,7 @@ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${D}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die fi @@ -284,7 +327,7 @@ workdir convert-objects blameview ; do cp -rf \ "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -306,13 +349,13 @@ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - find "${D}"/usr/lib64/perl5/ \ + find "${ED}"/usr/lib64/perl5/ \ -name .packlist \ -exec rm \{\} \; fi if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/usr/share/man/man1/git-svn.1* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then
Created attachment 239681 [details] git-1.7.1.1-prefix.patch same as above
1. This is going to be a revbump. 2. Please attach the rest of your patches for review: git-1.6.3.3-mint.patch git-1.7.1-interix.patch git-1.6.6.1-interix6.patch
(In reply to comment #2) > 1. This is going to be a revbump. maintainer's choice > 2. > Please attach the rest of your patches for review: > git-1.6.3.3-mint.patch > git-1.7.1-interix.patch > git-1.6.6.1-interix6.patch Oops, they are available on our webview. I'll attach them for completeness.
Created attachment 239803 [details, diff] git-1.6.6.1-interix6.patch
Created attachment 239805 [details, diff] git-1.6.3.3-mint.patch
Created attachment 239807 [details, diff] git-1.7.1-interix.patch
All patches ok EXCEPT for the mint one. When it was brought up before, I noted that changing the S_IFGITLINK constant seemed like a bad idea, as it might cause breakage in the packfile. Alan was going to take it to upstream for fixing, but I didn't follow what happened after that.
(In reply to comment #7) Alan, status update? I would like to push dev-vcs/git to gx86 so we can benefit from the updates in the main tree.
Basically the git team have been notified, but more extensive changes from those guys are needed and it's pending that. So just omit the mint patch for now.
then you won't have mint support for git, are you aware of that?
prefix: Ok, +1 for committing everything except the mint patch. Please apply as 1.7.2-r1 (notice the higher version too). alanh: - Can you poke upstream please? - Alternatively, is there a remotely accessible mint dev system that I can test the patch on? I'm away today till Sunday, so sometime next week if possible.
+*git-1.7.2-r1 (22 Jul 2010) + + 22 Jul 2010; Jeremy Olexa <darkside@gentoo.org> + +files/git-1.6.6.1-interix6.patch, +files/git-1.7.1-interix.patch, + +git-1.7.2-r1.ebuild: + Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches, + modify paths, etc. Approved by maintainer, reference bug 329273. Revbump + per request but no substantial changes for the end user Thanks again guys.
