diff options
| -rw-r--r-- | dev-vcs/git/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-vcs/git/Manifest | 4 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 101 |
3 files changed, 78 insertions, 32 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 4ef7772c8ecb..0709da643195 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.42 2010/10/27 07:42:07 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.43 2010/10/27 07:44:41 robbat2 Exp $ + + 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild: + Bump live build. 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2-r1.ebuild: Bug #342845: fix contrib install and doman warning. diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index a176d021a81c..2eb84539a1d1 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -51,6 +51,6 @@ EBUILD git-1.7.3.1.ebuild 13370 RMD160 9d73585d0bc90eba370bd67594f52bc157c69210 EBUILD git-1.7.3.2-r1.ebuild 13384 RMD160 6cf1b23fdadf91e7ff302b5a6e3d593d5fa923b4 SHA1 f104d8e0ebe228e27b5011142ef87ed3004b46c0 SHA256 2ae1b62afacb787ba78536b6fc6aec253b1be5c298a513af68bf91a47437a990 EBUILD git-1.7.3.2.ebuild 12898 RMD160 9b2843892449f4be9ee70344395dfbb5475cb295 SHA1 b4f5b192bf86879124e1feb94d3d933819bcbfdd SHA256 ddd94e13359010ef6c5aaf1a03d2f99fb174a6dbe7f230ec55360321c551fa15 EBUILD git-1.7.3.ebuild 13368 RMD160 62b50fd606cda218805b236083c5c826420eb9a2 SHA1 f9096b5a7aa7e64927c642e673f914e80316e120 SHA256 e6595b040a14b93a683f0cf2444f7a05a9f9042a524556eb1696ac1d21297831 -EBUILD git-9999.ebuild 11299 RMD160 9d2b7b795c198a8dd1563fc4ee20b9302b8f899d SHA1 f748425d15ef0338f55309538fb4cd15077eb662 SHA256 5bb9372b428fcbfd7573e232d835aca4bb23d1f8dfc21e6b94fb0bf6ef992be2 -MISC ChangeLog 71416 RMD160 1e49a6ff512038097102c05bf97b5ff1af9be4a2 SHA1 6368ffd6f91f8d3131e3441e4842413296e7897d SHA256 316ae0d9611340a36d7cd8cba14734150b724b6462caa7b6a09fdea03e225e52 +EBUILD git-9999.ebuild 13378 RMD160 eb48f122a730875acbaea78930d4010c9557ec70 SHA1 432467d5e651cf81029dfd981655dac8f45b7b48 SHA256 7a66a44c4554b416ef370835caa74b02abbe91ba42177c0d2112da64345a5df4 +MISC ChangeLog 71506 RMD160 e930ca7481b58c88426cb657b53a989a7c91d4c8 SHA1 cad2aafe06e7a4dcb1a456c5b8ab5b7bae02ca75 SHA256 a50817a118ab5e569a1f3614b391d22f922ac6abd3b21eb96055095f697ee6de MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 35f16c2bc523..35cb9c2efe64 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.5 2010/08/16 05:47:29 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.6 2010/10/27 07:44:41 robbat2 Exp $ -EAPI=2 +EAPI=3 GENTOO_DEPEND_ON_PERL=no inherit toolchain-funcs eutils elisp-common perl-module bash-completion @@ -19,13 +19,13 @@ if [ "$PV" != "9999" ]; then 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 ~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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" else SRC_URI="" EGIT_BRANCH="master" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" + KEYWORDS="~ppc ~ppc64" fi LICENSE="GPL-2" @@ -114,8 +114,23 @@ exportmakeopts() { 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/sh" + 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 iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." + # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use perl \ @@ -125,6 +140,18 @@ exportmakeopts() { && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" use subversion \ || myopts="${myopts} NO_SVN_TESTS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# 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} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi has_version '>=app-text/asciidoc-8.0' \ && myopts="${myopts} ASCIIDOC8=YesPlease" @@ -164,13 +191,19 @@ src_prepare() { #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch # JS install fixup - epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch + epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch + + # USE=-iconv causes segfaults, fixed post 1.7.1 + # Gentoo bug #321895 + #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch sed -i \ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ -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) @@ -182,6 +215,8 @@ src_prepare() { sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ Documentation/Makefile || die "sed failed" + # bug #318289 + epatch "${FILESDIR}"/git-1.7.3.2-interix.patch } git_emake() { @@ -191,8 +226,9 @@ git_emake() { 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 \ "$@" } @@ -235,7 +271,10 @@ src_install() { install || \ die "make install failed" - doman man?/*.[157] Documentation/*.[157] + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html @@ -256,7 +295,7 @@ src_install() { #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 @@ -268,47 +307,51 @@ src_install() { dobin contrib/fast-import/git-p4 dodoc contrib/fast-import/git-p4.txt newbin contrib/fast-import/import-tars.perl import-tars + newbin contrib/git-resurrect.sh git-resurrect dodir /usr/share/${PN}/contrib # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one + # completion - installed above + # emacs - installed above # examples - these are stuff that is not used in Git anymore actually + # gitview - installed above + # p4import - excluded because fast-import has a better one # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + blameview buildsystems ciabot continuous convert-objects fast-import \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ + ; do cp -rf \ "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.cgi - doins "${S}"/gitweb/gitweb.css + exeinto /usr/share/${PN}/gitweb + doexe "${S}"/gitweb/gitweb.cgi + insinto /usr/share/${PN}/gitweb/static + doins "${S}"/gitweb/static/gitweb.css js=gitweb.js - [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/${js} - doins "${S}"/gitweb/git-{favicon,logo}.png - - # Make sure it can run - fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi + [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js + doins "${S}"/gitweb/static/${js} + doins "${S}"/gitweb/static/git-{favicon,logo}.png # INSTALL discusses configuration issues, not just installation docinto / 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 |