Version bump. Also bug #254029 - fix noperl patch.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-05718-g0556e82 x86_64

4 files changed, 687 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index ae4112d00f81..0c9159c560d7 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.317 2009/01/08 19:00:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.318 2009/01/26 12:16:53 robbat2 Exp $
+
+*git-1.6.1.1 (26 Jan 2009)
+
+  26 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +files/20090126-git-1.6.1.1-noperl.patch, +git-1.6.1.1.ebuild:
+  Version bump. Also bug #254029 - fix noperl patch.
 
   08 Jan 2009; Brent Baude <ranger@gentoo.org> git-1.6.0.6.ebuild:
   Marking git-1.6.0.6 ppc64 for bug 251343
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 39dcae82202c..1d003a807c8a 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -3,6 +3,7 @@ AUX 20080423-git-1.5.5.1-noperl.patch 10399 RMD160 dbe5bcfb2e6a6b924807cc2f9458c
 AUX 20080528-git-1.5.5.3-noperl.patch 10902 RMD160 9a0b7c5a11828c0e0cff3486b0318225b6a9b49c SHA1 1792d05d37d91ccb2531c84938846d4cbcab415c SHA256 d5b1eac4c06c26dbc0f751865c356eaf3a2bb5cf34558f46c1533d71c0b51307
 AUX 20080626-git-1.5.6.1-noperl.patch 10962 RMD160 d5b71452273dacfff9359a404f800ec9bd5c5b62 SHA1 147782b4e013451c776be54e619ebc8755366667 SHA256 4be119db2b71423d700c1b579ff2f2feb5b132ef24a202cc2e4da4a93fadb3ba
 AUX 20081123-git-1.6.0.4-noperl-cvsserver.patch 880 RMD160 7e42034154ccb951c09426e64810df5be02d98b7 SHA1 9372646c8765662907b3e63b6ddb46f97797af60 SHA256 b597ae1c3efde22e52cc7a37aecab9ae041ecfbe0be29d917635c6df083d1249
+AUX 20090126-git-1.6.1.1-noperl.patch 11351 RMD160 e634e0ef8a0219181cb0cd4eb9ea728f4ae887e2 SHA1 d64526128ecbe1007d115d6bd05d815a42c00155 SHA256 55304324bc02384983fcd1804b3829addd6a20d7a3c6f84165b34685a928a405
 AUX 50git-gentoo.el 473 RMD160 3ae4696cc90d35bf2a1dca17cfe2fda78c0025e4 SHA1 7b67b759e6c3fc27552b211a6a48f3e4e2018c24 SHA256 c32f14d036e5ccb5c4583621dc10903346ab810ee838457e2de6e53d883348c0
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 AUX 72git-gentoo.el 429 RMD160 43797e6aaa00415b1b2394d148a67871ef0a7dd2 SHA1 b8530bdb685f7fb80d9ebdf380fdd08c23a6dc1d SHA256 a152c82e7056c81d80dfe2a3b75effe755235fc97651eabd14aa81bc10941e73
@@ -31,6 +32,7 @@ DIST git-1.6.0.3.tar.bz2 1874309 RMD160 0109ac07d0a6ea911526be8e40edb797c032a1bf
 DIST git-1.6.0.4.tar.bz2 1876842 RMD160 c4ca52d92993955b551ed26e6ef01529b716aa6d SHA1 6e9471519d482894ffd7ecc10cf2c09506971e3d SHA256 f8ccac357f2c721e735ae16bbb02a420d2aaaed483f5d46043c5fe627ab4b260
 DIST git-1.6.0.6.tar.bz2 1882225 RMD160 897a02479c527dad0ba821e599a5cff94d933ce9 SHA1 80ad0c2a450e182322c6e006f9345b784dfc66e3 SHA256 e1d65bece5e8da1b72db22d3f6f2cbcefd28360c7f5bba141af436f43f887d0c
 DIST git-1.6.0.tar.bz2 1860591 RMD160 ae3a0d3a39592f7ca2c9908917eb433860b71c38 SHA1 873fbe7141042ed96e5aa3178cb159b5636f60ed SHA256 b8d71cd080c059f4e5d949b1fd6a5c42ca648562326b7dcc04d9f06a777142f0
+DIST git-1.6.1.1.tar.bz2 1972491 RMD160 ac7b553339ae2f2ca52de1cc351da64e1bebca4c SHA1 ec0c6f941945cb356db3f5c61fb2e2d046e2f08a SHA256 ebc170c0e932ff74d8f99d705f88babe0e2691bb262a2f7ad3d91f116b9eb3e2
 DIST git-1.6.1.tar.bz2 1971286 RMD160 41798548551362611499fd2a525a42f5182b1d20 SHA1 4caeafd06a5482337052f142073be66f2a39134a SHA256 09d64bd88f6f432ddcb0f051a3ead2579f895a7f0dece702bc933ba21a434fe4
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
@@ -49,6 +51,7 @@ DIST git-htmldocs-1.6.0.3.tar.bz2 710365 RMD160 69b59fa8dc81d6faeffc93ce8fb02e2c
 DIST git-htmldocs-1.6.0.4.tar.bz2 685868 RMD160 3a3bb7d52623efb46c71b751b32cb39b0785f87c SHA1 2ce03c496bc6d332cfaed4bd58ddb0a0bce3adea SHA256 207b91956a9451a42c5e2488fe4310c3455756d10180bc1aae2003976f45a4f0
 DIST git-htmldocs-1.6.0.6.tar.bz2 691282 RMD160 9b268ac521da2bf03995533d53dc3f7d43897ef1 SHA1 9eecc27e26e88c8f7ed0eea658c2c2d71ec9b9a6 SHA256 1738845dfe336dee5bd736a37823876e32cf633dc2a9bf7047bd35a0c3b64e58
 DIST git-htmldocs-1.6.0.tar.bz2 704837 RMD160 7acb9b23946221a4d86e4f66fa3bf09b100ec603 SHA1 779f5145a66275444a67968c208cccb2296f739d SHA256 31fdd420327d39b6fe0ef8298b72b3b6cbdb4f35a3657abbe279f3c042dcc988
+DIST git-htmldocs-1.6.1.1.tar.bz2 714757 RMD160 1931b5df8ff338f9d343a8bc23d7093e1a258829 SHA1 7a95c18b3a30d23ce9c191a1c6fd92d009e28410 SHA256 c2e06539987c7dcccc078a5226c1b3276a6cbed03e33e891b8fd764331358a63
 DIST git-htmldocs-1.6.1.tar.bz2 713909 RMD160 d592885906d0d7fa6283e9a40226f191a4052346 SHA1 c6cd28959ed6e2fbd892fe16adda1d31a3301ae8 SHA256 1e182bc5c4a5b6ab49d1db0690c9275a3e14e7b145b5a4badbeb374678c62f22
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
@@ -67,6 +70,7 @@ DIST git-manpages-1.6.0.3.tar.bz2 224091 RMD160 abd6cfa847122e5096413b255231b5fa
 DIST git-manpages-1.6.0.4.tar.bz2 216926 RMD160 567e901113de12c91e8b698981da585496c82573 SHA1 26e713ef11449187f9762fb603cca43b2b5b80b8 SHA256 9f1a9f70918e06c475b6d5b3fac8f2c631b254087166cd1655a5be3d9da682d4
 DIST git-manpages-1.6.0.6.tar.bz2 217074 RMD160 81bdf5ac9662a7790682cb110640b32ca0f00756 SHA1 6a27a20f05cf0ac980915d5577d241a4836134de SHA256 80dc6a8a05bccdb49de261c32c9c22ab8c2e957edd618c0315fdf49e46f89bc8
 DIST git-manpages-1.6.0.tar.bz2 221399 RMD160 9e8cbb5d6ebda82407df325ed19f1ced12860f65 SHA1 c7b4204cdf941681a09084641c8aea3c6ef34dec SHA256 d8092a55dfaf31e78aecd802129af4b51b86dedf4ad12a397f487d89b822ef81
+DIST git-manpages-1.6.1.1.tar.bz2 231331 RMD160 3a641502738104bb3c5322643ab4c293384e1d03 SHA1 8aba1fd66c6832880db6ecf961c1733bb3889e43 SHA256 004fda1ac720d6f0a5c93370f5b5a69f91c26929cf95fe9d760c79be5e369cfc
 DIST git-manpages-1.6.1.tar.bz2 231011 RMD160 98f8af44e2b10898df0c4b599e0f88c0d57bda2c SHA1 fa2d94dc966484b14ae11d39d0d8336946a93001 SHA256 877b9648508cb57adc2f9059f8c72d05db2cc1a0286b225d1d18ab11f5c81242
 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734
 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
@@ -88,6 +92,7 @@ EBUILD git-1.6.0.4-r2.ebuild 8948 RMD160 6da6d8ad23d1f4666044098149409130b33b1cc
 EBUILD git-1.6.0.4.ebuild 8416 RMD160 d4d959465b22fa6747e187547d9e7c5c86dad177 SHA1 ca3eec4154653011f6b68d4d4cae5fa1c0ad31d6 SHA256 78bbe545b099da0c431f0b19da417c8c125f267005791721683961e9093c5b7b
 EBUILD git-1.6.0.6.ebuild 8659 RMD160 cbe8dad707605a31994ea493790f6afcdb4f0227 SHA1 7e01b2ff590a30fb9f4df406045f79270c9fbe87 SHA256 5dbf47cfe75164020e72497a19078fdaabbb63fb13685965c1e7c6ab3c319e3d
 EBUILD git-1.6.0.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c
+EBUILD git-1.6.1.1.ebuild 8605 RMD160 5ba0aacd6084de03f87f5bcb49e53bfd1e3b522c SHA1 53427f6845e34d9b1738eb746263a880bcea1596 SHA256 3ab687c1f71ece1a743c4cf141a7300359d9b78e400e80bcd610ea98f898bfe2
 EBUILD git-1.6.1.ebuild 8669 RMD160 260375314513971c695787b4da9c2b172419bdf2 SHA1 848d8e40359b93dd596e243899b675b6d8b82a16 SHA256 4f56c7055b75064ea7ea7248d0da213e2fe6a6e08cfb2c3e63ca6139238da5f1
-MISC ChangeLog 47656 RMD160 6b0cd5c97d29761d2ba3768d1618d51282d3e146 SHA1 94e1bc14cb75559bb9e86f7002367a6af8f70044 SHA256 3c7fdd45e2849e1bdb4acfc1ece43a5fb8f0308b4adf67d3c591a6d2ec46aad2
+MISC ChangeLog 47857 RMD160 b34ef616517a0da539df53aa82118c4f268f0862 SHA1 2248f4f4a0d24ebe707451d7d613581ebfb33067 SHA256 3a7e11ab76c9ea8c5edb1f482a5526f766b32a4150594ace30a483558533f30b
 MISC metadata.xml 1539 RMD160 b8c0182e6c64bf0399c979942ec403c309a95019 SHA1 e3fbe7df1c4a5209d10ae82d7aa368df6bbf8a9e SHA256 9b0b2c3e7607e1e280edd997169c72799f37c7cac547bce3e294584eaabbb3e5
diff --git a/dev-util/git/files/20090126-git-1.6.1.1-noperl.patch b/dev-util/git/files/20090126-git-1.6.1.1-noperl.patch
new file mode 100644
index 000000000000..d55d2b487d4e
--- /dev/null
+++ b/dev-util/git/files/20090126-git-1.6.1.1-noperl.patch
@@ -0,0 +1,369 @@
+Implement 95% of the NO_PERL functionality, to build Git without any Perl
+support, because some Gentoo users want a Git without any Perl whatesoever
+(Gentoo bug #214168).
+
+Remaining bits are doing configure.ac as well as git-remote usage in:
+t5502-quickfetch.sh
+t5512-ls-remote.sh
+t5520-pull.sh
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Updated-by: <Bernd Lommerzheim> bernd@lommerzheim.com
+Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=214168
+Notes: Ported from 20080423-git-1.5.5.1-noperl.patch
+Notes: Ported from 20080322-git-1.5.4.5-noperl.patch
+Notes: Ported from 20080528-git-1.5.6.1-noperl.patch
+Notes: Ported from 20080626-git-1.5.6.1-noperl.patch and 20081123-git-1.6.0.4-noperl-cvsserver.patch
+
+diff --git a/Makefile b/Makefile
+index aabf013..de91c91 100644
+--- a/Makefile
++++ b/Makefile
+@@ -136,6 +136,8 @@ all::
+ # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
+ # MakeMaker (e.g. using ActiveState under Cygwin).
+ #
++# Define NO_PERL if you do not want Perl scripts at all.
++#
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+@@ -270,6 +272,8 @@ SCRIPT_SH += git-stash.sh
+ SCRIPT_SH += git-submodule.sh
+ SCRIPT_SH += git-web--browse.sh
+ 
++SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
++ifndef NO_PERL
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-archimport.perl
+ SCRIPT_PERL += git-cvsexportcommit.perl
+@@ -278,10 +282,11 @@ SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-relink.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+-
+-SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
+-	  git-instaweb
++SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \
++			git-instaweb
++else
++SCRIPT_PERL =
++endif
+ 
+ # Empty...
+ EXTRA_PROGRAMS =
+@@ -328,7 +333,10 @@ BUILT_INS += git-whatchanged$X
+ ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
+ 
+ # what 'all' will build but not install in gitexecdir
+-OTHER_PROGRAMS = git$X gitweb/gitweb.cgi
++OTHER_PROGRAMS = git$X
++ifndef NO_PERL
++OTHER_PROGRAMS += gitweb/gitweb.cgi
++endif
+ 
+ # Set paths to tools early so that they can be used for version tests.
+ ifndef SHELL_PATH
+@@ -853,6 +861,10 @@ else
+ 	endif
+ endif
+ 
++ifdef NO_PERL
++	BASIC_CFLAGS += -DNO_PERL
++endif
++
+ ifdef ZLIB_PATH
+ 	BASIC_CFLAGS += -I$(ZLIB_PATH)/include
+ 	EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)
+@@ -1049,6 +1061,11 @@ endif
+ ifeq ($(TCLTK_PATH),)
+ NO_TCLTK=NoThanks
+ endif
++ifeq ($(PERL_PATH),)
++NO_PERL=NoThanks
++export NO_PERL
++export NO_PERL_MAKEMAKER
++endif
+ 
+ QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
+ QUIET_SUBDIR1  =
+@@ -1123,7 +1140,9 @@ ifndef NO_TCLTK
+ 	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) gitexecdir='$(gitexec_instdir_SQ)' all
+ 	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
+ endif
++ifndef NO_PERL
+ 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
++endif
+ 	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
+ 
+ please_set_SHELL_PATH_to_a_more_modern_shell:
+@@ -1170,6 +1189,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ 
++ifndef NO_PERL
+ $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
+ 
+ perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
+@@ -1229,6 +1249,7 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
+ 	    $@.sh > $@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
++endif # NO_PERL
+ 
+ configure: configure.ac
+ 	$(QUIET_GEN)$(RM) $@ $<+ && \
+@@ -1416,9 +1437,12 @@ install: all
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
++	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
+ 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
++ifndef NO_PERL
+ 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
++	$(INSTALL) git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
++endif
+ ifndef NO_TCLTK
+ 	$(MAKE) -C gitk-git install
+ 	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
+@@ -1521,9 +1545,11 @@ clean:
+ 	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
+ 	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
+ 	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
+-	$(RM) gitweb/gitweb.cgi
+ 	$(MAKE) -C Documentation/ clean
++ifndef NO_PERL
++	$(RM) gitweb/gitweb.cgi
+ 	$(MAKE) -C perl clean
++endif
+ 	$(MAKE) -C templates/ clean
+ 	$(MAKE) -C t/ clean
+ ifndef NO_TCLTK
+diff --git a/builtin-add.c b/builtin-add.c
+index ac98c83..ce01700 100644
+--- a/builtin-add.c
++++ b/builtin-add.c
+@@ -15,7 +15,9 @@ static const char * const builtin_add_usage[] = {
+ 	"git add [options] [--] <filepattern>...",
+ 	NULL
+ };
++#ifndef NO_PERL
+ static int patch_interactive = 0, add_interactive = 0;
++#endif
+ static int take_worktree_changes;
+ 
+ static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
+@@ -158,6 +160,7 @@ static const char **validate_pathspec(int argc, const char **argv, const char *p
+ 	return pathspec;
+ }
+ 
++#ifndef NO_PERL
+ int interactive_add(int argc, const char **argv, const char *prefix)
+ {
+ 	int status, ac;
+@@ -186,6 +189,7 @@ int interactive_add(int argc, const char **argv, const char *prefix)
+ 	free(args);
+ 	return status;
+ }
++#endif
+ 
+ static struct lock_file lock_file;
+ 
+@@ -199,8 +203,10 @@ static struct option builtin_add_options[] = {
+ 	OPT__DRY_RUN(&show_only),
+ 	OPT__VERBOSE(&verbose),
+ 	OPT_GROUP(""),
++#ifndef NO_PERL
+ 	OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
+ 	OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
++#endif
+ 	OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
+ 	OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
+ 	OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
+@@ -252,10 +258,12 @@ int cmd_add(int argc, const char **argv, const char *prefix)
+ 
+ 	argc = parse_options(argc, argv, builtin_add_options,
+ 			  builtin_add_usage, 0);
++#ifndef NO_PERL
+ 	if (patch_interactive)
+ 		add_interactive = 1;
+ 	if (add_interactive)
+ 		exit(interactive_add(argc, argv, prefix));
++#endif
+ 
+ 	git_config(add_config, NULL);
+ 
+diff --git a/builtin-commit.c b/builtin-commit.c
+index 977ea09..3158d3e 100644
+--- a/builtin-commit.c
++++ b/builtin-commit.c
+@@ -100,7 +100,9 @@ static struct option builtin_commit_options[] = {
+ 	OPT_GROUP("Commit contents options"),
+ 	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
+ 	OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
++#ifndef NO_PERL
+ 	OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
++#endif
+ 	OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
+ 	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
+ 	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
+@@ -223,6 +225,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
+ 	struct string_list partial;
+ 	const char **pathspec = NULL;
+ 
++#ifndef NO_PERL
+ 	if (interactive) {
+ 		interactive_add(argc, argv, prefix);
+ 		if (read_cache_preload(NULL) < 0)
+@@ -230,6 +233,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
+ 		commit_style = COMMIT_AS_IS;
+ 		return get_index_file();
+ 	}
++#endif
+ 
+ 	if (*argv)
+ 		pathspec = get_pathspec(prefix, argv);
+diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
+index 67c431d..83a5535 100644
+--- a/t/lib-git-svn.sh
++++ b/t/lib-git-svn.sh
+@@ -9,6 +9,12 @@ then
+ 	test_done
+ 	exit
+ fi
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping git-svn tests, NO_PERL defined' :
++	test_done
++	exit
++fi
+ 
+ GIT_DIR=$PWD/.git
+ GIT_SVN_DIR=$GIT_DIR/svn/git-svn
+diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
+index 1f59960..954be21 100755
+--- a/t/t5505-remote.sh
++++ b/t/t5505-remote.sh
+@@ -3,6 +3,12 @@
+ test_description='git remote porcelain-ish'
+ 
+ . ./test-lib.sh
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' :
++	test_done
++	exit
++fi
+ 
+ setup_repository () {
+ 	mkdir "$1" && (
+diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
+index 63bfc6d..2abe42c 100755
+--- a/t/t7501-commit.sh
++++ b/t/t7501-commit.sh
+@@ -38,7 +38,7 @@ test_expect_success \
+ 	"echo King of the bongo >file &&
+ 	test_must_fail git commit -m foo -a file"
+ 
+-test_expect_success \
++[ -z "$NO_PERL" ] && test_expect_success \
+ 	"using paths with --interactive" \
+ 	"echo bong-o-bong >file &&
+ 	! (echo 7 | git commit -m foo --interactive file)"
+@@ -119,7 +119,7 @@ test_expect_success \
+ 	"echo 'gak' >file && \
+ 	 git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
+ 
+-test_expect_success \
++[ -z "$NO_PERL" ] && test_expect_success \
+ 	"interactive add" \
+ 	"echo 7 | git commit --interactive | grep 'What now'"
+ 
+diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
+index cb3d183..1d5355d 100755
+--- a/t/t9001-send-email.sh
++++ b/t/t9001-send-email.sh
+@@ -2,6 +2,12 @@
+ 
+ test_description='git send-email'
+ . ./test-lib.sh
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping git-send-email tests, NO_PERL defined' :
++	test_done
++	exit
++fi
+ 
+ PROG='git send-email'
+ test_expect_success \
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index 245a7c3..6cd779a 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -13,6 +13,12 @@ then
+     test_done
+     exit
+ fi
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' :
++	test_done
++	exit
++fi
+ 
+ CVSROOT=$(pwd)/cvsroot
+ CVSWORK=$(pwd)/cvswork
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 6a37f71..84a0d31 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -17,6 +17,12 @@ then
+     test_done
+     exit
+ fi
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' :
++	test_done
++	exit
++fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+     test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
+     test_done
+diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
+index 43cd6ee..08e0409 100755
+--- a/t/t9500-gitweb-standalone-no-errors.sh
++++ b/t/t9500-gitweb-standalone-no-errors.sh
+@@ -70,6 +70,13 @@ safe_chmod () {
+ }
+ 
+ . ./test-lib.sh
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' :
++	test_done
++	exit
++fi
++
+ 
+ perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
+     test_expect_success 'skipping gitweb tests, perl version is too old' :
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index d2379e7..75bf178 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -16,6 +16,12 @@ then
+ 	test_done
+ 	exit
+ fi
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' :
++	test_done
++	exit
++fi
+ 
+ cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
+ case "$cvsps_version" in
diff --git a/dev-util/git/git-1.6.1.1.ebuild b/dev-util/git/git-1.6.1.1.ebuild
new file mode 100644
index 000000000000..16a958e2b4a9
--- /dev/null
+++ b/dev-util/git/git-1.6.1.1.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.1.1.ebuild,v 1.1 2009/01/26 12:16:53 robbat2 Exp $
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+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://git.or.cz/"
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax"
+
+DEPEND="
+	!app-misc/git
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/cpio
+	perl?   ( dev-lang/perl )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${DEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?  ( >=dev-python/pygtk-2.8 )"
+
+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-util/subversion && built_with_use --missing false dev-util/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 mozsha1 ; then
+		myopts="${myopts} MOZILLA_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 || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl || myopts="${myopts} NO_PERL=YesPlease"
+	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	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}"
+
+	epatch "${FILESDIR}"/20090126-git-1.6.1.1-noperl.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
+		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
+		Makefile || die "sed failed"
+
+	exportmakeopts
+}
+
+git_emake() {
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		prefix=/usr \
+		htmldir=/usr/share/doc/${PF}/html \
+		"$@"
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+	fi
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi || die "emake gitweb/gitweb.cgi failed"
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	doman man?/*
+
+	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 /
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{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
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins contrib/vim/syntax/gitcommit.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim
+	fi
+
+	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
+		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
+	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 \
+					t9600-cvsimport.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.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 ! has userpriv "${FEATURES}"; 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
+		# Bug #225601 - t0004 is not suitable for root perm
+		# Bug #219839 - t1004 is not suitable for root perm
+		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-util/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 0 ]] && \
+			built_with_use dev-util/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-util/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-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+		ewarn "You must build dev-util/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
+}