summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Bressler <ruben.bressler@cerpamid.co.cu>2010-06-30 13:03:07 -0400
committerRuben Bressler <ruben.bressler@cerpamid.co.cu>2010-06-30 13:03:07 -0400
commit93e5af57362deff698ebfecc4f7c791c69f49f90 (patch)
treede9d2ae8ed3210fb8613fb35db138adda5ec2b06 /dev-vcs/git
parentfixed (diff)
downloadrubenqba-93e5af57362deff698ebfecc4f7c791c69f49f90.tar.gz
rubenqba-93e5af57362deff698ebfecc4f7c791c69f49f90.tar.bz2
rubenqba-93e5af57362deff698ebfecc4f7c791c69f49f90.zip
20100630 - Cambio automático
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest13
-rw-r--r--dev-vcs/git/files/50git-gentoo.el13
-rw-r--r--dev-vcs/git/files/git-1.6.6-always-install-js.patch36
-rw-r--r--dev-vcs/git/files/git-1.7.0-always-install-js.patch36
-rw-r--r--dev-vcs/git/files/git-1.7.1-always-install-js.patch38
-rw-r--r--dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch84
-rw-r--r--dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch43
-rw-r--r--dev-vcs/git/files/git-daemon.confd19
-rw-r--r--dev-vcs/git/files/git-daemon.initd30
-rw-r--r--dev-vcs/git/files/git-daemon.xinetd13
-rw-r--r--dev-vcs/git/git-1.7.1-r2.ebuild425
11 files changed, 750 insertions, 0 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
new file mode 100644
index 0000000..25a53c9
--- /dev/null
+++ b/dev-vcs/git/Manifest
@@ -0,0 +1,13 @@
+AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2
+AUX git-1.6.6-always-install-js.patch 1300 RMD160 7a288526624acb0748e4c917a56d662439cc28db SHA1 8bac9d1ecafd14f0dc7cf3564a9b6c53e32726b1 SHA256 019e5dbf6d0c3e57056b038db2ac1d7e501258e02ae5dacb6360a1e639ed4b67
+AUX git-1.7.0-always-install-js.patch 1304 RMD160 e4d110d7bd86a50f928cdf5fa1e3513aebbb0dab SHA1 9324fe19cb85709b2a198ba853866a99d6088f64 SHA256 5cb12dd43e114d07ea4ab6cd04f386cdc0c6e9a998529943be2da3308e1d1509
+AUX git-1.7.1-always-install-js.patch 1255 RMD160 524f32437f042a7faecc58b48c19b18e40d6d66f SHA1 0705dc05aa5595950c51f5cb3ef575023c2eacd0 SHA256 698edf9471d877ffc5441b26bf77f75f672fbcaa89a75258c48cd8a8fd8b1ac9
+AUX git-1.7.1-digest-proxy-auth.patch 2563 RMD160 f04a5e9949338b21e4d68231ac473a0f7d0f7893 SHA1 9c39cca6949b04a2ee80e654bedc1879ce5e5770 SHA256 638397780d8e99e38a2065b125c9caa2be1f16efd46ba3fdfabd7b655826a7a7
+AUX git-1.7.1-noiconv-segfault-fix.patch 1786 RMD160 592f84005bccdfbc020ad79d66c8b17d401e1c51 SHA1 17108275dff771dc919a273540774749f3623875 SHA256 6f50165264078da499329be3b74176aacae85fc48934576ecd37f0fc2de4c2b4
+AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630
+AUX git-daemon.initd 738 RMD160 23de3f02cd33251ce0f66c1b6e1d6a20ee45ee5b SHA1 b6f8e80130ddddf8cbd70a553b31706d570f7d5a SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b
+AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67
+DIST git-1.7.1.tar.bz2 2475655 RMD160 b29995bac655e64d3c5d6911fe1235ba85ff58e6 SHA1 0b031d1ab63506f945ad3c6fb5f814c6a4fc3095 SHA256 bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2
+DIST git-htmldocs-1.7.1.tar.bz2 873917 RMD160 7d14a9767884180451359b899ec8741b42f6da5f SHA1 94d18dea549c52ae0c38b1568ace46bbbdb29b44 SHA256 fc4efd0ea040ea7684a0101f6614f9ee6398e77fdbed9338f61426b962a2270a
+DIST git-manpages-1.7.1.tar.bz2 276911 RMD160 8f32c0f06e9ff76751dff6849e6c3df7db4b77c7 SHA1 6b1e6738d30334f6e9071f983959644b4b3e9378 SHA256 f4898ba376cfb407ccf266e6fcee95c4cfc36387823629923f9e742cfdffda0c
+EBUILD git-1.7.1-r2.ebuild 11572 RMD160 a39f90216f80ba901017101d55182d03a2129218 SHA1 ee6012324d4a8e1e3c0f3409c898769c1c2a0fe2 SHA256 e21ee384d8d22492ae494bf852bbd538e7ab1b8db2c80d21edc8bff5e3269f5b
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
new file mode 100644
index 0000000..1646a39
--- /dev/null
+++ b/dev-vcs/git/files/50git-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; dev-vcs/git site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'git-status "git" "Entry point into git-status mode." t)
+;;(autoload 'git-blame-mode "git-blame"
+;; "Minor mode for incremental blame for Git." t)
+
+;; GNU Emacs >=22.2 already includes vc-git.el.
+;; Enable the following only if Emacs has no GIT support.
+(unless (fboundp 'vc-git-registered)
+ (add-to-list 'load-path "@SITELISP@/compat")
+ (add-to-list 'vc-handled-backends 'GIT))
diff --git a/dev-vcs/git/files/git-1.6.6-always-install-js.patch b/dev-vcs/git/files/git-1.6.6-always-install-js.patch
new file mode 100644
index 0000000..f4a3825
--- /dev/null
+++ b/dev-vcs/git/files/git-1.6.6-always-install-js.patch
@@ -0,0 +1,36 @@
+JS install cleanup fixes
+
+- Always install the JS for GitWeb, even if it is not being minified.
+- Also ensure the minified JS is built before instaweb as it is referenced in
+ the sed expression.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar git-1.6.6.orig/Makefile git-1.6.6/Makefile
+--- git-1.6.6.orig/Makefile 2009-12-24 00:00:22.000000000 +0000
++++ git-1.6.6/Makefile 2009-12-25 23:47:57.089719735 +0000
+@@ -1509,13 +1509,8 @@
+ chmod +x $@+ && \
+ mv $@+ $@
+
+-ifdef JSMIN
+-OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js
+-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js
+-else
+-OTHER_PROGRAMS += gitweb/gitweb.cgi
+-gitweb/gitweb.cgi: gitweb/gitweb.perl
+-endif
++OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS)
++gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS)
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+ -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
+@@ -1541,7 +1536,7 @@
+ chmod +x $@+ && \
+ mv $@+ $@
+
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js
++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS)
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-vcs/git/files/git-1.7.0-always-install-js.patch b/dev-vcs/git/files/git-1.7.0-always-install-js.patch
new file mode 100644
index 0000000..56f455e
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.0-always-install-js.patch
@@ -0,0 +1,36 @@
+JS install cleanup fixes
+
+- Always install the JS for GitWeb, even if it is not being minified.
+- Also ensure the minified JS is built before instaweb as it is referenced in
+ the sed expression.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.0.orig/Makefile git-1.7.0/Makefile
+--- git-1.7.0.orig/Makefile 2010-02-13 00:44:43.000000000 +0000
++++ git-1.7.0/Makefile 2010-02-13 18:11:52.923807675 +0000
+@@ -1500,13 +1500,8 @@
+ gitweb:
+ $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
+
+-ifdef JSMIN
+-OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js
+-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js
+-else
+-OTHER_PROGRAMS += gitweb/gitweb.cgi
+-gitweb/gitweb.cgi: gitweb/gitweb.perl
+-endif
++OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS)
++gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS)
+ $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
+
+ ifdef JSMIN
+@@ -1515,7 +1510,7 @@
+ endif # JSMIN
+
+
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js
++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS)
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-vcs/git/files/git-1.7.1-always-install-js.patch b/dev-vcs/git/files/git-1.7.1-always-install-js.patch
new file mode 100644
index 0000000..6205f93
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-always-install-js.patch
@@ -0,0 +1,38 @@
+JS install cleanup fixes
+
+- Also ensure the minified JS is built before instaweb as it is referenced in
+ the sed expression.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar git-1.7.1.orig/Makefile git-1.7.1/Makefile
+--- git-1.7.1.orig/Makefile 2010-04-24 02:38:35.000000000 +0000
++++ git-1.7.1/Makefile 2010-05-01 08:47:04.491916479 +0000
+@@ -1561,17 +1561,16 @@
+ $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
+
+ ifdef JSMIN
+-GITWEB_PROGRAMS += gitweb/gitweb.min.js
+ GITWEB_JS = gitweb/gitweb.min.js
+ else
+ GITWEB_JS = gitweb/gitweb.js
+ endif
+ ifdef CSSMIN
+-GITWEB_PROGRAMS += gitweb/gitweb.min.css
+ GITWEB_CSS = gitweb/gitweb.min.css
+ else
+ GITWEB_CSS = gitweb/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/%,%,$@)
+@@ -1586,7 +1585,7 @@
+ endif # CSSMIN
+
+
+-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/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' \
diff --git a/dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch b/dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch
new file mode 100644
index 0000000..39f50e9
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-digest-proxy-auth.patch
@@ -0,0 +1,84 @@
+--- git-1.7.1/http.c 2009-12-23 19:00:22.000000000 -0500
++++ git-1.7.1/http.c 2010-01-19 11:59:17.000000000 -0500
+@@ -33,6 +33,10 @@
+ static long curl_low_speed_time = -1;
+ static int curl_ftp_no_epsv;
+ static const char *curl_http_proxy;
++static const char *curl_http_proxy_auth;
++static const char *curl_http_proxy_user;
++static const char *curl_http_proxy_pass;
++
+ static char *user_name, *user_pass;
+
+ #if LIBCURL_VERSION_NUM >= 0x071700
+@@ -174,6 +178,15 @@
+ if (!strcmp("http.proxy", var))
+ return git_config_string(&curl_http_proxy, var, value);
+
++ if (!strcmp("http.proxy-auth", var))
++ return git_config_string(&curl_http_proxy_auth, var, value);
++
++ if (!strcmp("http.proxy-user", var))
++ return git_config_string(&curl_http_proxy_user, var, value);
++
++ if (!strcmp("http.proxy-pass", var))
++ return git_config_string(&curl_http_proxy_pass, var, value);
++
+ if (!strcmp("http.postbuffer", var)) {
+ http_post_buffer = git_config_int(var, value);
+ if (http_post_buffer < LARGE_PACKET_MAX)
+@@ -267,8 +280,32 @@
+ curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
+
+ if (curl_http_proxy)
++ {
+ curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
+
++ if(curl_http_proxy_user && curl_http_proxy_pass)
++ {
++ char* c;
++ c = xstrdup(curl_http_proxy_user);
++ strcpy(c, curl_http_proxy_user);
++ strcat(c, ":");
++ strcat(c, curl_http_proxy_pass);
++ c[strlen(curl_http_proxy_user) + strlen(curl_http_proxy_pass) + 1] = 0;
++ curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, c);
++ free(c);
++ }
++ if(curl_http_proxy_auth)
++ {
++ if(!strcmp(curl_http_proxy_auth, "digest"))
++ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
++ else if(!strcmp(curl_http_proxy_auth, "basic"))
++ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
++ else if(!strcmp(curl_http_proxy_auth, "ntlm"))
++ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_NTLM);
++ }
++
++ }
++
+ return result;
+ }
+
+@@ -430,6 +467,21 @@
+ curl_http_proxy = NULL;
+ }
+
++ if (curl_http_proxy_auth) {
++ free((void *)curl_http_proxy_auth);
++ curl_http_proxy_auth = NULL;
++ }
++
++ if (curl_http_proxy_user) {
++ free((void *)curl_http_proxy_user);
++ curl_http_proxy_user = NULL;
++ }
++
++ if (curl_http_proxy_pass) {
++ free((void *)curl_http_proxy_pass);
++ curl_http_proxy_pass = NULL;
++ }
++
+ if (ssl_cert_password != NULL) {
+ memset(ssl_cert_password, 0, strlen(ssl_cert_password));
+ free(ssl_cert_password);
diff --git a/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch b/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch
new file mode 100644
index 0000000..b338ee4
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch
@@ -0,0 +1,43 @@
+commit 43acff34b902c38808ac0f326090f2516250e1f0
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date: Sat May 8 18:17:29 2010 -0500
+
+ cherry-pick: do not dump core when iconv fails
+
+ When cherry-picking, usually the new and old commit encodings are both
+ UTF-8. Most old iconv implementations do not support this trivial
+ conversion, so on old platforms, out->message remains NULL, and later
+ attempts to read it segfault.
+
+ Fix this by noticing the input and output encodings match and skipping
+ the iconv step, like the other reencode_string() call sites already do.
+ Also stop segfaulting on other iconv failures: if iconv fails for some
+ other reason, the best we can do is to pass the old message through.
+
+ This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert:
+ clarify label on conflict hunks, 2010-03-20).
+
+ Reported-by: Andreas Krey <a.krey@gmx.de>
+ Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+ Signed-off-by: Junio C Hamano <gitster@pobox.com>
+
+diff --git a/builtin/revert.c b/builtin/revert.c
+index 778a56e..7d68ef7 100644
+--- a/builtin/revert.c
++++ b/builtin/revert.c
+@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out)
+ encoding = "UTF-8";
+ if (!git_commit_encoding)
+ git_commit_encoding = "UTF-8";
+- if ((out->reencoded_message = reencode_string(raw_message,
+- git_commit_encoding, encoding)))
++
++ out->reencoded_message = NULL;
++ out->message = raw_message;
++ if (strcmp(encoding, git_commit_encoding))
++ out->reencoded_message = reencode_string(raw_message,
++ git_commit_encoding, encoding);
++ if (out->reencoded_message)
+ out->message = out->reencoded_message;
+
+ abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
new file mode 100644
index 0000000..75b4216
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.confd
@@ -0,0 +1,19 @@
+# conf.d file for git-daemon
+#
+# Please check man 1 git-daemon for more information about the options
+# git-daemon accepts. You MUST edit this to include your repositories you wish
+# to serve.
+#
+# Some of the meaningful options are:
+# --syslog --- Enables syslog logging
+# --verbose --- Enables verbose logging
+# --export-all --- Exports all repositories
+# --port=XXXX --- Starts in port XXXX instead of 9418
+#
+GITDAEMON_OPTS="--syslog /var/git"
+
+# To run an anonymous git safely, the following user should be able to only
+# read your Git repositories. It should not able able to write to anywhere on
+# your system, esp. not the repositories.
+GIT_USER="nobody"
+GIT_GROUP="nobody"
diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd
new file mode 100644
index 0000000..c6ee19f
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
+
+PIDFILE=/var/run/git-daemon.pid
+
+depend() {
+ need net
+ use logger
+}
+
+start() {
+ [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon"
+ ebegin "Starting git-daemon"
+ start-stop-daemon --start --quiet --background \
+ --pidfile ${PIDFILE} ${BL1_COMPAT} \
+ --exec /usr/bin/git -- daemon \
+ --pid-file=${PIDFILE} \
+ --user=${GIT_USER} --group=${GIT_GROUP} \
+ ${GITDAEMON_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping git-daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
new file mode 100644
index 0000000..02c938d
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.xinetd
@@ -0,0 +1,13 @@
+service git-daemon
+{
+ disable = yes
+ socket_type = stream
+ wait = no
+ user = nobody
+ type = UNLISTED
+ protocol = tcp
+ log_on_failure += USERID
+ port = 9418
+ server = /usr/bin/git
+ server_args = daemon --inetd --syslog --export-all --base-path=/var/git
+}
diff --git a/dev-vcs/git/git-1.7.1-r2.ebuild b/dev-vcs/git/git-1.7.1-r2.ebuild
new file mode 100644
index 0000000..bae6c1e
--- /dev/null
+++ b/dev-vcs/git/git-1.7.1-r2.ebuild
@@ -0,0 +1,425 @@
+# 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-1.7.1-r1.ebuild,v 1.7 2010/06/22 18:47:46 arfrever Exp $
+
+EAPI=2
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+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 ~sparc-fbsd ~x86-fbsd"
+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"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ !blksha1? ( dev-libs/openssl )
+ sys-libs/zlib
+ perl? ( dev-lang/perl )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI )
+ 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?
+ (
+ >=dev-python/pygtk-2.8
+ || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python )
+ )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ )"
+
+# Live ebuild builds HTML docs, additionally
+if [ "$PV" == "9999" ]; then
+ DEPEND="${DEPEND}
+ doc? (
+ app-text/xmlto
+ )"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+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
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ use iconv \
+ || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
+ # || myopts="${myopts} NO_ICONV=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+ if [ "${PV}" != "9999" ]; then
+ unpack ${MY_P}.tar.bz2
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+ cd "${S}"
+ else
+ git_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # Noperl is being merged to upstream as of 2009/04/05
+ #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+ # GetOpt-Long v2.38 is strict
+ # Merged in 1.6.3 final 2009/05/07
+ #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+ # JS install fixup
+ epatch "${FILESDIR}"/git-1.7.1-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
+
+ # Solve digest proxy authentication
+ epatch "${FILESDIR}"/git-1.7.1-digest-proxy-auth.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC = \).*$:\1$(OPTCC):' \
+ -e 's:^\(AR = \).*$:\1$(OPTAR):' \
+ Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+}
+
+git_emake() {
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix=/usr \
+ htmldir=/usr/share/doc/${PF}/html \
+ "$@"
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el \
+ || die "emacs modules failed"
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ "$PV" == "9999" ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ doman man?/*.[157] Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+ #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"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+
+ if use gtk ; then
+ dobin "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ dobin contrib/fast-import/git-p4
+ dodoc contrib/fast-import/git-p4.txt
+ newbin contrib/fast-import/import-tars.perl import-tars
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # svnimport - use git-svn
+ # p4import - excluded because fast-import has a better one
+ # examples - these are stuff that is not used in Git anymore actually
+ # 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
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${D}"/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
+ 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
+
+ # 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/ \
+ -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*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh"
+ local tests_perl="t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ built_with_use dev-vcs/cvs server && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+ cd "${S}"
+ # Now run the tests
+ einfo "Start test run"
+ git_emake \
+ test || die "tests failed"
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
+ ewarn "You must build dev-vcs/subversion with USE=perl"
+ ewarn "to get the full functionality of git-svn!"
+ fi
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}