Bump to 1.5.5.1 per bug 217593, noperl patch ported by dberkholz.

Package-Manager: portage-2.1.4.4

4 files changed, 609 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 679456fb6657..f539a474ce57 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.265 2008/03/29 07:59:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.266 2008/04/24 00:20:53 robbat2 Exp $
+
+*git-1.5.5.1 (24 Apr 2008)
+
+  24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/20080423-git-1.5.5.1-noperl.patch, +git-1.5.5.1.ebuild:
+  Bump to 1.5.5.1 per bug 217593, noperl patch ported by dberkholz.
 
 *git-1.5.4.5 (29 Mar 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index d73ab08d28cd..4782f623c8c5 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,4 +1,5 @@
 AUX 20080322-git-1.5.5.4-noperl.patch 11055 RMD160 a184a12108077bbb44ccce42da2b5f603fdc27d8 SHA1 1437ecf11405109d38fe63a4ab29fbed55eb0b60 SHA256 76c706775095987ca073bb0229c93d7a972d61ddebeed598fbba4bc15112a60f
+AUX 20080423-git-1.5.5.1-noperl.patch 11828 RMD160 1ed65870be9bae270947068061d29ad6b39132c9 SHA1 2f0cbd2c1f3a0ac046453570bed2207fda12a46b SHA256 2aab3d8410f63aa914ab14729ded976bb07a6fea70a729789ef2673ee1e838e1
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 AUX 71git-gentoo.el 265 RMD160 c7284b9b210e631c91c4d5a6849e7e43be16d3c9 SHA1 da4a1ea75804fff4d54d34f072478e5ad1a49088 SHA256 930a56df44a3fc9ceb16304b7b53d87bc736708c1a34f4b46f21a128314b5066
 AUX 72git-gentoo.el 337 RMD160 644e711f842f0947592fbc9e58f9f3ea2f085229 SHA1 33d594c19a5f5e7147719b61573505076a3c4984 SHA256 b022fdc82776c869c8e573c154fb0ff9ac748f0b6f4fbcd2f28618e3b946412f
@@ -18,6 +19,7 @@ DIST git-1.5.4.3.tar.bz2 1589678 RMD160 3b9660976dec3e355f0a93cd894d91f488771b63
 DIST git-1.5.4.4.tar.bz2 1591657 RMD160 61954a5c26a0c79a303e476aa46263e2089f3584 SHA1 fdf2dbf3a01a71deb329cac63f23163114bc40c3 SHA256 69b3269a6b1ca26357e1e72c6be7f0ed742cd88d2042243c0bb9ba76e4acac99
 DIST git-1.5.4.5.tar.bz2 1597118 RMD160 7aef5f5284bf04efb5f03a8525f39b2498a0a1ef SHA1 69c4b904f13b72f57405393d54f33831c9cfad8f SHA256 fb6c8745eb5f379ed36bcd7f216bb5294996a93801d30ec69521f2bdd51ead38
 DIST git-1.5.4.tar.bz2 1583166 RMD160 7d49a13b19a15f6acd57aa3e8d9e7ac82b105ffd SHA1 0bde73f3093fcd54ff62f34be9c59a48ceee01af SHA256 c6f1cc44a3960ffa787d1e5902be0f1f928e7ff882f206d9ba554753d1bd8e5c
+DIST git-1.5.5.1.tar.bz2 1675032 RMD160 943d6fe0e7d3e45893dde3c7b16880d56f76cd7e SHA1 a450cd02cbfe8e18311816a9568bcd6d10d6cf52 SHA256 c95156a12cd86a20420e037304c255c847d44353af8e0dc77ee074fc59248707
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.5.tar.bz2 505906 RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a SHA1 974a1317078dc5159ef1eafb3937d3c651b4efbc SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532
 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
@@ -27,6 +29,7 @@ DIST git-htmldocs-1.5.4.3.tar.bz2 611814 RMD160 06261d4304a13debd3727e5233538148
 DIST git-htmldocs-1.5.4.4.tar.bz2 613201 RMD160 b3741aa29e2a8023b728c85ab3c806e90a206e5f SHA1 812850b20b67a2d8bf7aac8c3668b6086e9e1972 SHA256 3beea407b822d402e023d1f300ed9598b181ad4faa923926c163e32ab3436c48
 DIST git-htmldocs-1.5.4.5.tar.bz2 613736 RMD160 fe901c0a8da70e9066a944d36118b1ff21416284 SHA1 7087b54af84b8d91fec8d9a48c8f746047d3cd6a SHA256 13b1fd78a7b7205668acf0dd81f1b5df37bd19172a0cbb41efe9320f87985a22
 DIST git-htmldocs-1.5.4.tar.bz2 609896 RMD160 f55380837e99cd70a5a266f9e44bc5cf62809129 SHA1 14943152482d5ed454002c879460cd9ccdcf258c SHA256 4d3b633aab0de30da6126537b84ab1bd06dd45e963aaeb5590cc6e6414ec4c96
+DIST git-htmldocs-1.5.5.1.tar.bz2 640216 RMD160 076b765a9da50977365ad3fdcba8ab6140b5121e SHA1 56ae3fa2e5a7c64177af5122876f5fe063800b40 SHA256 a1951c9417661795ab05c6d2838d466055733d9133586f6be1876222eb0a8f3c
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.5.tar.bz2 139885 RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 SHA1 47a2f330581c9e4dcb5e8c25d7508c5e8d7d7997 SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4
 DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
@@ -36,6 +39,7 @@ DIST git-manpages-1.5.4.3.tar.bz2 156741 RMD160 d2a8be59bf0c9b1c2b6da102cb146e93
 DIST git-manpages-1.5.4.4.tar.bz2 156980 RMD160 e423ce70b54767c804a473ada9d7fdbb546ba360 SHA1 6aeac3116d1dc4966fb469060331969eb24f3266 SHA256 709dad8f41e27bed1715ab162280aa49de126756bd15f3870558908baafde67a
 DIST git-manpages-1.5.4.5.tar.bz2 157308 RMD160 75db043cca546bf73a1930816c6a13b08a44d713 SHA1 659b5217b342b757a01603f61bd90a4d60f7e681 SHA256 b694d8ccfc25c0da5ee2578491b17340539dd4ba273928e1aa65faefd5f339ce
 DIST git-manpages-1.5.4.tar.bz2 156304 RMD160 be7e3158924a254ebac7b161af7d27bacfe1079e SHA1 a34a846092ae9b3d23f0015ba86ecc4d52e096c8 SHA256 e86e4909b56cd56f79bb12c088c95f32df80e836c1fac7be800ddb6fbcb2aa8f
+DIST git-manpages-1.5.5.1.tar.bz2 163214 RMD160 c87559ed8823dd98fb68f5821f97e434a4089451 SHA1 e062f2eb9e46546616e9cc62ecc4bcd485d30d9a SHA256 d9a253c30a12ccd3b0e0a69d48c7fe61b16dbfc119da855febaf6e599cecf689
 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734
 EBUILD git-1.5.2.5.ebuild 4438 RMD160 914a23cd6611788be58938a41c6dce4592667bb9 SHA1 3f2c69b60ebf05426660150a61773b2019af7989 SHA256 86867bf441ada7577c1d852a22ffe89f5d3f2969dc24bd9291ae0eac66acb09b
 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
@@ -46,5 +50,6 @@ EBUILD git-1.5.4.4-r1.ebuild 7852 RMD160 93d7f13a06385e2480969bfe761413a608fe05f
 EBUILD git-1.5.4.4.ebuild 6565 RMD160 60bcf79bd993f95d038921fd8e83dc1289f5c958 SHA1 1197a2cbdce0658199407f07292c8b15689dbdb5 SHA256 b8d304b4c09311ea7fc2adc86fb352a69a7c37d83f98c573015fb8c979074817
 EBUILD git-1.5.4.5.ebuild 7849 RMD160 3bfae5d23c43cbd66221afbc5217c8a5babcd5ee SHA1 5bf00d81827a908d6349d4fdfba7bdb2926b191f SHA256 e4dbebf95303502da7fb800604a3f379afd06f873b1bf1d4123e6db0bd8c3a1c
 EBUILD git-1.5.4.ebuild 6565 RMD160 17d6172114dcbbc24d390b93fc9598318e0b4906 SHA1 3a7b86bacacb291fccdde45b7cd1832bc7cdda35 SHA256 8ba59eba4f2377e33302bf9830657c68f3c6fec3b600e234a5b1a4b36e0bee15
-MISC ChangeLog 39171 RMD160 7ac391ec08a6e8bc6f0e1d529fa486d92edff543 SHA1 674816b556de2f2902ae50182307a28f4147621d SHA256 17b6a59a2206924426074acd1475af2f599fb2f71eb7a8828a5268b4503243f5
+EBUILD git-1.5.5.1.ebuild 7889 RMD160 8388e149d1a5ef9502e9ad2f653a544664f8e8c9 SHA1 0713f497e5ed9d210578bd51c8f04297aef57247 SHA256 9a4d3fa8cb2ba9ab10fe6a6932e4cced2deb6eeef9b60254efb1bd925b9aee18
+MISC ChangeLog 39386 RMD160 27e842b5d396593bc99c9fcea2d01cdaab70e8b0 SHA1 9d368725b848ce011a85ccdf1df0ced94fdf05ea SHA256 c2b8e5e79be520dc424112ae6f0a4c854a66f8af64b0de937e83943cafca6f84
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
diff --git a/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch b/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch
new file mode 100644
index 000000000000..1fec6a704703
--- /dev/null
+++ b/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch
@@ -0,0 +1,325 @@
+diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-add.c /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-add.c
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-add.c	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-add.c	2008-04-23 16:58:51.708575899 -0700
+@@ -135,6 +135,7 @@
+         free(seen);
+ }
+ 
++#ifndef NO_PERL
+ static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
+ {
+ 	const char **pathspec = get_pathspec(prefix, argv);
+@@ -170,6 +171,7 @@
+ 	free(args);
+ 	return status;
+ }
++#endif
+ 
+ static struct lock_file lock_file;
+ 
+@@ -182,8 +184,10 @@
+ 	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', NULL, &ignored_too, "allow adding otherwise ignored files"),
+ 	OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
+ 	OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
+@@ -198,10 +202,12 @@
+ 
+ 	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(git_default_config);
+ 
+diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-commit.c /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-commit.c
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-commit.c	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-commit.c	2008-04-23 17:00:04.672207334 -0700
+@@ -97,7 +97,9 @@
+ 	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"),
+@@ -217,11 +219,13 @@
+ 	struct path_list partial;
+ 	const char **pathspec = NULL;
+ 
++#ifndef NO_PERL
+ 	if (interactive) {
+ 		interactive_add(argc, argv, prefix);
+ 		commit_style = COMMIT_AS_IS;
+ 		return get_index_file();
+ 	}
++#endif
+ 
+ 	if (read_cache() < 0)
+ 		die("index file corrupt");
+diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/Makefile
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile	2008-04-23 16:58:19.622327000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/Makefile	2008-04-23 16:58:51.712091375 -0700
+@@ -130,6 +130,8 @@
+ #
+ # 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.
+ #
+@@ -255,6 +257,8 @@
+ 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
+@@ -263,10 +267,11 @@
+ 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 =
+@@ -315,7 +320,10 @@
+ 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
+@@ -716,6 +724,10 @@
+ 	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)
+@@ -896,6 +908,11 @@
+ 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  =
+@@ -968,7 +985,9 @@
+ 	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) 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)
+ 
+ strip: $(PROGRAMS) git$X
+@@ -1007,6 +1026,7 @@
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ 
++ifndef NO_PERL
+ $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
+ 
+ perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
+@@ -1065,6 +1085,7 @@
+ 	    $@.sh > $@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
++endif # NO_PERL
+ 
+ configure: configure.ac
+ 	$(QUIET_GEN)$(RM) $@ $<+ && \
+@@ -1218,7 +1239,9 @@
+ 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ 	$(INSTALL) git$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
++endif
+ ifndef NO_TCLTK
+ 	$(MAKE) -C gitk-git install
+ 	$(MAKE) -C git-gui install
+@@ -1307,9 +1330,11 @@
+ 	$(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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git-svn.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/lib-git-svn.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git-svn.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/lib-git-svn.sh	2008-04-23 16:58:51.712091375 -0700
+@@ -6,6 +6,12 @@
+ 	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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-remote.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t5505-remote.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-remote.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t5505-remote.sh	2008-04-23 16:58:51.712091375 -0700
+@@ -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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-commit.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t7501-commit.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-commit.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t7501-commit.sh	2008-04-23 16:58:51.712091375 -0700
+@@ -38,7 +38,7 @@
+ 	"echo King of the bongo >file &&
+ 	! 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 @@
+ 	"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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-send-email.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9001-send-email.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-send-email.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9001-send-email.sh	2008-04-23 16:58:51.712091375 -0700
+@@ -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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9200-git-cvsexportcommit.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9200-git-cvsexportcommit.sh	2008-04-23 16:58:51.715484206 -0700
+@@ -13,6 +13,12 @@
+     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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9400-git-cvsserver-server.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9400-git-cvsserver-server.sh	2008-04-23 16:58:51.715484206 -0700
+@@ -17,6 +17,12 @@
+     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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh	2008-04-23 16:58:51.715484206 -0700
+@@ -67,6 +67,13 @@
+ }
+ 
+ . ./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 -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9600-cvsimport.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9600-cvsimport.sh
+--- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9600-cvsimport.sh	2008-04-20 15:17:13.000000000 -0700
++++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9600-cvsimport.sh	2008-04-23 16:58:51.715484206 -0700
+@@ -15,6 +15,12 @@
+ 	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.5.5.1.ebuild b/dev-util/git/git-1.5.5.1.ebuild
new file mode 100644
index 000000000000..85a8f174b4a9
--- /dev/null
+++ b/dev-util/git/git-1.5.5.1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.1.ebuild,v 1.1 2008/04/24 00:20: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"
+
+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 )"
+# dev-perl/{Authen-SASL,Net-SMTP-SSL} are used by git-send-email
+
+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=72${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use perl ; then
+		if use cgi || use cvs || use subversion ; then
+			eerror "You must built dev-util/git with USE=perl and the"
+			eerror "applicable USE flag to use any of the following:"
+			eerror "gitweb, git-cvs*, git-svn, git-archimport, git-quiltimport"
+			die "You need USE=perl to satisfy your other USE= requests!"
+		fi
+	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"
+		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
+	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}"/${PN}-1.5.3-symlinks.patch
+	epatch "${FILESDIR}"/20080423-${PN}-1.5.5.1-noperl.patch
+
+	sed -i \
+		-e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \
+		-e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \
+		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
+		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
+		-e 's:ln :ln -s :g' \
+		Makefile || die "sed failed"
+
+	exportmakeopts
+}
+
+src_compile() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+	fi
+	if use perl && use cgi ; then
+		emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr 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/{,vc-}git.el* || \
+			die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
+	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 vim 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
+		newins "${S}"/gitweb/gitweb.perl gitweb.cgi
+		doins "${S}"/gitweb/gitweb.css
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+		docinto /
+		# INSTALL discusses configuration issues, not just installation
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+	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.
+	has_version app-arch/unzip || \
+		einfo "Disabling tar-tree tests" && \
+		disabled="${disabled} \
+					t5000-tar-tree.sh"
+
+	if ! has userpriv "${FEATURES}"; then
+		ewarn "Skipping CVS tests because CVS does not work as root!"
+		ewarn "You should retest with FEATURES=userpriv!"
+		disabled="${disabled} \
+					${tests_cvs}"
+	fi
+
+	use cvs && \
+		has_version dev-util/cvs && \
+		built_with_use dev-util/cvs server || \
+		einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \
+		disabled="${disabled} \
+					${tests_cvs}"
+
+	use perl || \
+		einfo "Disabling tests that need Perl" && \
+		disabled="${disabled} \
+					${tests_perl}"
+
+	# 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"
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elisp-site-regen
+		elog "GNU Emacs has built-in Git support in versions greater 22.1."
+		elog "You can disable the emacs USE flag for dev-util/git"
+		elog "if you are using such a version."
+	fi
+	if use subversion && ! built_with_use 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-archimport "dev-util/tla"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}