mirror of
https://github.com/flatcar/scripts.git
synced 2026-02-26 18:11:45 +01:00
git: Upgrade to 1.7.8.6 so --reference works
Not sure how this was missed, but clone --reference doesn't work. Direct alternatives manipulation doesn't seem affected, but better to upgrade to a version of git that handles it (plus it's faster). BUG=chromium-os:34692 TEST=cbuildbot --remote chromiumos-sdk x86-generic-full \ x86-generic-incremental <patch args> daisy-full Change-Id: Ie281d5310eb6c2e778277477a91ad0c515833100 Reviewed-on: https://gerrit.chromium.org/gerrit/33874 Commit-Ready: Brian Harring <ferringb@chromium.org> Reviewed-by: Brian Harring <ferringb@chromium.org> Tested-by: Brian Harring <ferringb@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Brian Harring
Gerrit
parent
1805bbbf51
commit
a6396e8245
@ -1,3 +1,3 @@
|
||||
DIST git-1.7.3.4.tar.bz2 2635522 RMD160 37cdb8b50c802655643a243ef26fe3d50145d29c SHA1 8bda6668531fc41a72a680978798deb9ee048846 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171
|
||||
DIST git-htmldocs-1.7.3.4.tar.bz2 929858 RMD160 4183ff0e61885323371b11dfb119bcc718e46a34 SHA1 17cbfcb9b85352777ace4b787e8ff48b6aeee6ab SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba
|
||||
DIST git-manpages-1.7.3.4.tar.bz2 294381 RMD160 dfd4a4757077290a666ad974585677888f909890 SHA1 c4f93ed1d9892af1174d63743dc578835a6183f1 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75
|
||||
DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9 SHA512 84b0341d040a0f99a40d2d316498a964cf386818673ccf04aacb3b2a7e3c09b275f819a7cd9746dec67e1d0300e13fe5706a57c94ae2d26fd1b82e9b93f405ae WHIRLPOOL 804e70176a229123e09348b6585a461bc162edf9786d617926f42fdab6e615ffba9a9b2b6654562d9757e96bdb3603aaa2ee78ac8c0f124d413409b0fcc7cfa8
|
||||
DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf
|
||||
DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d SHA512 925c1775e0d57ee832c0794a8adaa5ebe332556358dbe75cedf9298d1f2e39b31e43693d8873667fdd1795e9e7dd71be83880d78d6ff6454959f325fc518bd88 WHIRLPOOL 2ef274e721013070440f8addbc4fd5cfb886db3b78f3a961bf7add2864e9ae609340ca26de88e3edcbd7513ebab1f46ef8d25d3e06bfe760233afdb1d7ccba4a
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.2.orig/Makefile git-1.7.2/Makefile
|
||||
--- git-1.7.2.orig/Makefile 2010-07-21 21:35:25.000000000 +0000
|
||||
+++ git-1.7.2/Makefile 2010-07-22 16:52:22.994872806 +0000
|
||||
@@ -1650,17 +1650,16 @@
|
||||
$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
|
||||
|
||||
ifdef JSMIN
|
||||
-GITWEB_PROGRAMS += gitweb/static/gitweb.min.js
|
||||
GITWEB_JS = gitweb/static/gitweb.min.js
|
||||
else
|
||||
GITWEB_JS = gitweb/static/gitweb.js
|
||||
endif
|
||||
ifdef CSSMIN
|
||||
-GITWEB_PROGRAMS += gitweb/static/gitweb.min.css
|
||||
GITWEB_CSS = gitweb/static/gitweb.min.css
|
||||
else
|
||||
GITWEB_CSS = gitweb/static/gitweb.css
|
||||
endif
|
||||
+GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS)
|
||||
OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)
|
||||
gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)
|
||||
$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
|
||||
@@ -1675,7 +1674,7 @@
|
||||
endif # CSSMIN
|
||||
|
||||
|
||||
-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js
|
||||
+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS)
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
||||
@ -1,90 +0,0 @@
|
||||
upstream report: http://marc.info/?l=git&m=128774216918941&w=2
|
||||
|
||||
diff -ru git-1.7.3.1.orig/Makefile git-1.7.3.1/Makefile
|
||||
--- git-1.7.3.1.orig/Makefile 2010-10-22 10:58:17 +0200
|
||||
+++ git-1.7.3.1/Makefile 2010-10-22 11:17:28 +0200
|
||||
@@ -1091,6 +1091,25 @@
|
||||
endif
|
||||
X = .exe
|
||||
endif
|
||||
+ifeq ($(uname_S),Interix)
|
||||
+ NO_SYS_POLL_H = YesPlease
|
||||
+ NO_INTTYPES_H = YesPlease
|
||||
+ NO_INITGROUPS = YesPlease
|
||||
+ NO_IPV6 = YesPlease
|
||||
+ NO_MEMMEM = YesPlease
|
||||
+ NO_MKDTEMP = YesPlease
|
||||
+ NO_STRTOUMAX = YesPlease
|
||||
+ NO_NSEC = YesPlease
|
||||
+ NO_MKSTEMPS = YesPlease
|
||||
+ ifeq ($(uname_R),3.5)
|
||||
+ NO_INET_NTOP = YesPlease
|
||||
+ NO_INET_PTON = YesPlease
|
||||
+ endif
|
||||
+ ifeq ($(uname_R),5.2)
|
||||
+ NO_INET_NTOP = YesPlease
|
||||
+ NO_INET_PTON = YesPlease
|
||||
+ endif
|
||||
+endif
|
||||
ifneq (,$(findstring MINGW,$(uname_S)))
|
||||
pathsep = ;
|
||||
NO_PREAD = YesPlease
|
||||
@@ -1354,6 +1373,15 @@
|
||||
ifdef NO_SYS_SELECT_H
|
||||
BASIC_CFLAGS += -DNO_SYS_SELECT_H
|
||||
endif
|
||||
+ifdef NO_SYS_POLL_H
|
||||
+ BASIC_CFLAGS += -DNO_SYS_POLL_H
|
||||
+endif
|
||||
+ifdef NO_INTTYPES_H
|
||||
+ BASIC_CFLAGS += -DNO_INTTYPES_H
|
||||
+endif
|
||||
+ifdef NO_INITGROUPS
|
||||
+ BASIC_CFLAGS += -DNO_INITGROUPS
|
||||
+endif
|
||||
ifdef NO_MMAP
|
||||
COMPAT_CFLAGS += -DNO_MMAP
|
||||
COMPAT_OBJS += compat/mmap.o
|
||||
diff -ru git-1.7.3.1.orig/daemon.c git-1.7.3.1/daemon.c
|
||||
--- git-1.7.3.1.orig/daemon.c 2010-10-22 10:58:11 +0200
|
||||
+++ git-1.7.3.1/daemon.c 2010-10-22 11:10:21 +0200
|
||||
@@ -956,7 +956,11 @@
|
||||
listen_addr, listen_port);
|
||||
|
||||
if (pass && gid &&
|
||||
- (initgroups(pass->pw_name, gid) || setgid (gid) ||
|
||||
+ (
|
||||
+#ifndef NO_INITGROUPS
|
||||
+ initgroups(pass->pw_name, gid) ||
|
||||
+#endif
|
||||
+ setgid (gid) ||
|
||||
setuid(pass->pw_uid)))
|
||||
die("cannot drop privileges");
|
||||
|
||||
diff -ru git-1.7.3.1.orig/git-compat-util.h git-1.7.3.1/git-compat-util.h
|
||||
--- git-1.7.3.1.orig/git-compat-util.h 2010-10-22 10:58:16 +0200
|
||||
+++ git-1.7.3.1/git-compat-util.h 2010-10-22 11:12:22 +0200
|
||||
@@ -94,7 +94,11 @@
|
||||
#include <utime.h>
|
||||
#ifndef __MINGW32__
|
||||
#include <sys/wait.h>
|
||||
+#ifndef NO_SYS_POLL_H
|
||||
#include <sys/poll.h>
|
||||
+#else
|
||||
+#include <poll.h>
|
||||
+#endif
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <termios.h>
|
||||
@@ -106,7 +110,11 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
#include <pwd.h>
|
||||
+#ifndef NO_INTTYPES_H
|
||||
#include <inttypes.h>
|
||||
+#else
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
#if defined(__CYGWIN__)
|
||||
#undef _XOPEN_SOURCE
|
||||
#include <grp.h>
|
||||
@ -1,26 +0,0 @@
|
||||
Fix false positives in t3404 due to SHELL=/bin/false
|
||||
|
||||
If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
|
||||
package building), the git-rebase exec tests will fail, because they call
|
||||
$SHELL around the command, and in the existing testcase, $SHELL was not being
|
||||
cleared sufficently.
|
||||
|
||||
This lead to false positive failures of t3404 on systems where the package
|
||||
build user was locked down as noted above.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
diff -Nuar git-1.7.3.4.orig/t/t3404-rebase-interactive.sh git-1.7.3.4/t/t3404-rebase-interactive.sh
|
||||
--- git-1.7.3.4.orig/t/t3404-rebase-interactive.sh 2010-12-16 02:52:11.000000000 +0000
|
||||
+++ git-1.7.3.4/t/t3404-rebase-interactive.sh 2010-12-26 22:30:47.826421313 +0000
|
||||
@@ -67,8 +67,8 @@
|
||||
# "exec" commands are ran with the user shell by default, but this may
|
||||
# be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
|
||||
# to create a file. Unseting SHELL avoids such non-portable behavior
|
||||
-# in tests.
|
||||
-SHELL=
|
||||
+# in tests. It must be exported for it to take effect where needed.
|
||||
+export SHELL=
|
||||
|
||||
test_expect_success 'rebase -i with the exec command' '
|
||||
git checkout master &&
|
||||
@ -1,37 +0,0 @@
|
||||
From e8725dd4b11c487c138ff0b68cd647265f24a105 Mon Sep 17 00:00:00 2001
|
||||
From: Robin H. Johnson <robbat2@gentoo.org>
|
||||
Date: Wed, 29 Dec 2010 20:59:22 +0000
|
||||
Subject: [PATCH] t9001: Fix test prerequisites
|
||||
|
||||
Add in missing Perl prerequisites for new tests of send-email.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
---
|
||||
t/t9001-send-email.sh | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
|
||||
index 1dc4a92..3271426 100755
|
||||
--- a/t/t9001-send-email.sh
|
||||
+++ b/t/t9001-send-email.sh
|
||||
@@ -1135,7 +1135,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
|
||||
# Note that the patches in this test are deliberately out of order; we
|
||||
# want to make sure it works even if the cover-letter is not in the
|
||||
# first mail.
|
||||
-test_expect_success 'refusing to send cover letter template' '
|
||||
+test_expect_success $PREREQ 'refusing to send cover letter template' '
|
||||
clean_fake_sendmail &&
|
||||
rm -fr outdir &&
|
||||
git format-patch --cover-letter -2 -o outdir &&
|
||||
@@ -1151,7 +1151,7 @@ test_expect_success 'refusing to send cover letter template' '
|
||||
test -z "$(ls msgtxt*)"
|
||||
'
|
||||
|
||||
-test_expect_success '--force sends cover letter template anyway' '
|
||||
+test_expect_success $PREREQ '--force sends cover letter template anyway' '
|
||||
clean_fake_sendmail &&
|
||||
rm -fr outdir &&
|
||||
git format-patch --cover-letter -2 -o outdir &&
|
||||
--
|
||||
1.7.3.2
|
||||
|
||||
@ -1,12 +1,17 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.17 2011/08/19 18:43:47 darkside Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.12 2012/08/19 16:58:25 armin76 Exp $
|
||||
|
||||
EAPI=3
|
||||
EAPI=4
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
inherit toolchain-funcs eutils elisp-common perl-module bash-completion
|
||||
[ "$PV" == "9999" ] && inherit git
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_DEPEND="python? 2"
|
||||
[[ ${PV} == *9999 ]] && SCM="git-2"
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
|
||||
inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
@ -15,28 +20,33 @@ DOC_VER=${MY_PV}
|
||||
|
||||
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
|
||||
HOMEPAGE="http://www.git-scm.com/"
|
||||
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 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"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="gz"
|
||||
SRC_URI_GOOG="http://git-core.googlecode.com/files"
|
||||
SRC_URI_KORG="mirror://kernel/software/scm/git"
|
||||
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~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=""
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
CDEPEND="
|
||||
!blksha1? ( dev-libs/openssl )
|
||||
sys-libs/zlib
|
||||
perl? ( dev-lang/perl[-build] )
|
||||
perl? ( dev-lang/perl[-build] dev-libs/libpcre )
|
||||
tk? ( dev-lang/tk )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
@ -52,11 +62,11 @@ RDEPEND="${CDEPEND}
|
||||
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
|
||||
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
|
||||
)
|
||||
gtk?
|
||||
python? ( gtk?
|
||||
(
|
||||
>=dev-python/pygtk-2.8
|
||||
dev-python/pygtksourceview:2
|
||||
)"
|
||||
) )"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
@ -71,7 +81,7 @@ DEPEND="${CDEPEND}
|
||||
)"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [ "$PV" == "9999" ]; then
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
DEPEND="${DEPEND}
|
||||
app-text/asciidoc
|
||||
app-text/xmlto"
|
||||
@ -80,20 +90,23 @@ fi
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
if ! use perl ; then
|
||||
use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
|
||||
use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
|
||||
use subversion && ewarn "git-svn needs USE=perl, it won't work"
|
||||
fi
|
||||
if use webdav && ! use curl ; then
|
||||
ewarn "USE=webdav needs USE=curl. Ignoring"
|
||||
fi
|
||||
if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
if use python ; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
@ -125,20 +138,18 @@ exportmakeopts() {
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
|
||||
|
||||
use iconv \
|
||||
|| 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"
|
||||
|
||||
|| myopts="${myopts} NO_ICONV=YesPlease"
|
||||
use tk \
|
||||
|| myopts="${myopts} NO_TCLTK=YesPlease"
|
||||
use perl \
|
||||
&& myopts="${myopts} INSTALLDIRS=vendor" \
|
||||
&& myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
|
||||
|| myopts="${myopts} NO_PERL=YesPlease"
|
||||
use threads \
|
||||
&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
|
||||
use python \
|
||||
|| myopts="${myopts} NO_PYTHON=YesPlease"
|
||||
use subversion \
|
||||
|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
|
||||
use threads \
|
||||
&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
|
||||
use cvs \
|
||||
|| myopts="${myopts} NO_CVS=YesPlease"
|
||||
# Disabled until ~m68k-mint can be keyworded again
|
||||
@ -153,6 +164,12 @@ exportmakeopts() {
|
||||
if [[ ${CHOST} == ia64-*-hpux* ]]; then
|
||||
myopts="${myopts} NO_NSEC=YesPlease"
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts="${myopts} NEEDS_LIBICONV=YesPlease"
|
||||
fi
|
||||
if [[ ${CHOST} == *-*-aix* ]]; then
|
||||
myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
|
||||
fi
|
||||
|
||||
has_version '>=app-text/asciidoc-8.0' \
|
||||
&& myopts="${myopts} ASCIIDOC8=YesPlease"
|
||||
@ -167,16 +184,16 @@ exportmakeopts() {
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [ "${PV}" != "9999" ]; then
|
||||
unpack ${MY_P}.tar.bz2
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}"
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.bz2
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
use doc && \
|
||||
cd "${S}"/Documentation && \
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}"
|
||||
else
|
||||
git_src_unpack
|
||||
git-2_src_unpack
|
||||
cd "${S}"
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
@ -192,18 +209,17 @@ src_prepare() {
|
||||
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
|
||||
|
||||
# JS install fixup
|
||||
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
|
||||
# Merged in 1.7.5.x
|
||||
#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
|
||||
|
||||
# Fix false positives with t3404 due to SHELL=/bin/false for the portage
|
||||
# user.
|
||||
epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
|
||||
# Merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
|
||||
|
||||
# bug #350075: t9001: fix missing prereq on some tests
|
||||
epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
|
||||
# Merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
|
||||
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
|
||||
@ -225,14 +241,13 @@ src_prepare() {
|
||||
# Fix docbook2texi command
|
||||
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() {
|
||||
# bug #326625: PERL_PATH, PERL_MM_OPT
|
||||
# bug #320647: PYTHON_PATH
|
||||
PYTHON_PATH=""
|
||||
use python && PYTHON_PATH="$(PYTHON -a)"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
DESTDIR="${D}" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
@ -242,11 +257,14 @@ git_emake() {
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
PYTHON_PATH="${EPREFIX}/usr/bin/python" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/env perl" \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/perl" \
|
||||
PERL_MM_OPT="" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
"$@"
|
||||
# This is the fix for bug #326625, but it also causes breakage, see bug
|
||||
# #352693.
|
||||
# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
@ -268,7 +286,7 @@ src_compile() {
|
||||
fi
|
||||
|
||||
cd "${S}"/Documentation
|
||||
if [[ "$PV" == "9999" ]] ; then
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
if use doc ; then
|
||||
@ -304,7 +322,7 @@ src_install() {
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
dobashcompletion contrib/completion/git-completion.bash ${PN}
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc} || die
|
||||
@ -316,8 +334,9 @@ src_install() {
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
|
||||
fi
|
||||
|
||||
if use gtk ; then
|
||||
if use python && use gtk ; then
|
||||
dobin "${S}"/contrib/gitview/gitview
|
||||
python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
|
||||
dodoc "${S}"/contrib/gitview/gitview.txt
|
||||
fi
|
||||
|
||||
@ -363,7 +382,7 @@ src_install() {
|
||||
-name .packlist \
|
||||
-exec rm \{\} \;
|
||||
else
|
||||
rm -rf "${D}"/usr/share/gitweb
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
@ -399,6 +418,7 @@ src_test() {
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot="t0001-init.sh \
|
||||
t0004-unwritable.sh \
|
||||
t0070-fundamental.sh \
|
||||
t1004-read-tree-m-u-wf.sh \
|
||||
t3700-add.sh \
|
||||
t7300-clean.sh"
|
||||
@ -477,6 +497,8 @@ showpkgdeps() {
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
use python && python_mod_optimize git_remote_helpers
|
||||
einfo "Please read /usr/share/bash-completion/git for Git bash completion"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
@ -487,4 +509,5 @@ pkg_postinst() {
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
use python && python_mod_cleanup git_remote_helpers
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user