added new (better :)) patch, removed obsolete ones.

Package-Manager: portage-2.2.00.15754-prefix/cvs/Interix x86

6 files changed, 125 insertions, 158 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 9bfb76b3a14d..31de5ae9b226 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.37 2010/10/22 05:39:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.38 2010/10/22 11:38:12 mduft Exp $
 
 *git-1.7.3.2 (22 Oct 2010)
 
+  22 Oct 2010; Markus Duft <mduft@gentoo.org> git-1.7.3.2.ebuild,
+  +files/git-1.7.3.2-interix.patch,
+  -files/git-1.6.6.1-interix6.patch,
+  -files/git-1.7.1-interix.patch:
+  removed obsolete patches, added a new one instead. the new patch matches
+  more the spirit of upstream, and has been submitted there.
+
   22 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.2.ebuild:
   Version bump.
 
@@ -22,7 +29,7 @@
   13 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.3.ebuild:
   Bug #337104: verbump.
 
-  11 Sep 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.2.2.ebuild:
+  11 Sep 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.2.2.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #335891
 
   10 Sep 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.2.ebuild:
@@ -100,7 +107,7 @@
   +files/git-1.7.2-always-install-js.patch:
   Version bump.
 
-  18 Jul 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.1-r1.ebuild:
+  18 Jul 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.1-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #321899
 
   18 Jul 2010; <nixnut@gentoo.org> git-1.7.0.ebuild:
@@ -296,7 +303,7 @@
   03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.4.ebuild:
   Version bump.
 
-  18 Nov 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.5.1-r1.ebuild,
+  18 Nov 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.5.1-r1.ebuild,
   git-1.6.5.2.ebuild, git-1.6.5.3.ebuild:
   Add ~alpha/~ia64 wrt #290163
 
@@ -352,7 +359,7 @@
   18 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.1.ebuild:
   Version bump
 
-  12 Oct 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.4.4.ebuild:
+  12 Oct 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.4.4.ebuild:
   ia64/s390/sh/sparc stable wrt #287031
 
 *git-1.6.5 (11 Oct 2009)
@@ -382,7 +389,7 @@
   01 Oct 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.4.4.ebuild:
   Stable for HPPA (bug #287031).
 
-  30 Sep 2009; Dawid Węgliński <cla@gentoo.org> git-1.6.4.4.ebuild:
+  30 Sep 2009; Dawid Węgliński <cla@gentoo.org> git-1.6.4.4.ebuild:
   Stable on amd64 (bu #287031)
 
   30 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5_rc2.ebuild:
@@ -458,7 +465,7 @@
   +git-1.6.4.ebuild:
   New upstream releases.
 
-  30 Jun 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.3.3.ebuild:
+  30 Jun 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.3.3.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #273905
 
   27 Jun 2009; Brent Baude <ranger@gentoo.org> git-1.6.3.3.ebuild:
@@ -624,7 +631,7 @@
   06 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.ebuild:
   Version bump, bug 250321.
 
-  01 Jan 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
+  01 Jan 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
   s390/sh stable wrt #251343
 
   29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.6.0.6.ebuild:
@@ -633,7 +640,7 @@
   25 Dec 2008; Jeroen Roovers <jer@gentoo.org> git-1.6.0.6.ebuild:
   Stable for HPPA (bug #251343).
 
-  23 Dec 2008; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
+  23 Dec 2008; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
   alpha/arm/ia64 stable wrt #251343
 
   23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.6.ebuild:
@@ -751,7 +758,7 @@
   08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.6.4.ebuild:
   ppc stable, bug #234075
 
-  08 Aug 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.6.4.ebuild:
+  08 Aug 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.6.4.ebuild:
   alpha/ia64 stable wrt #234075
 
   07 Aug 2008; Markus Meier <maekke@gentoo.org> git-1.5.6.4.ebuild:
@@ -801,7 +808,7 @@
   11 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.4.ebuild:
   Version bump.
 
-  10 Jun 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.5.ebuild:
+  10 Jun 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.5.ebuild:
   alpha/ia64/sparc/x86 stable wrt #225231
 
   09 Jun 2008; Brent Baude <ranger@gentoo.org> git-1.5.4.5.ebuild:
@@ -855,7 +862,7 @@
   29 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.5.ebuild:
   Version bump.
 
-  24 Mar 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.4-r1.ebuild:
+  24 Mar 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.4-r1.ebuild:
   Re-add ~ia64 wrt #214464
 
 *git-1.5.4.4-r1 (24 Mar 2008)
@@ -895,7 +902,7 @@
   17 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.4.2.ebuild:
   New upstream version
 
-  11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> git-1.5.4.ebuild:
+  11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> git-1.5.4.ebuild:
   Fix sed for LDFLAGS, and make CFLAGS sed as robust as that.
 
   03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.4.ebuild:
@@ -952,7 +959,7 @@
   27 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild:
   Stable on amd64. Tested by myself and gentoofan23.
 
-  25 Dec 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.3.7-r1.ebuild:
+  25 Dec 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.3.7-r1.ebuild:
   alpha/ia64/sparc/x86 stable wrt #202383
 
   25 Dec 2007; Brent Baude <ranger@gentoo.org> git-1.5.3.7-r1.ebuild:
@@ -1053,7 +1060,7 @@
   20 Sep 2007; Christoph Mende <angelos@gentoo.org> git-1.5.2.5.ebuild:
   Stable on amd64 wrt bug #193113
 
-  20 Sep 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.2.5.ebuild:
+  20 Sep 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.2.5.ebuild:
   alpha/ia64 stable wrt #193113
 
   20 Sep 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.2.5.ebuild:
@@ -1158,7 +1165,7 @@
   28 May 2007; Brent Baude <ranger@gentoo.org> git-1.5.1.6.ebuild:
   Marking git-1.5.1.6 ppc64 stable for bug 179245
 
-  24 May 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.1.6.ebuild:
+  24 May 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.1.6.ebuild:
   ia64 + x86 stable wrt #179245
 
   23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.2.ebuild:
@@ -1204,7 +1211,7 @@
   -git-1.4.4.4.ebuild, -git-1.5.1.1.ebuild:
   Remove unused stuff
 
-  23 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.5.0.7.ebuild:
+  23 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.5.0.7.ebuild:
   Stable on Mips, bug 173327.
 
 *git-1.5.1.2 (23 Apr 2007)
@@ -1236,7 +1243,7 @@
   04 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.0.7.ebuild:
   Stable on sparc wrt #173327
 
-  04 Apr 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.0.7.ebuild:
+  04 Apr 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.0.7.ebuild:
   ia64 + x86 stable wrt bug 173327
 
   04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.4.ebuild,
@@ -1341,7 +1348,7 @@
   git-1.4.4.3.ebuild:
   einfo -> elog
 
-  04 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.4.4.3.ebuild:
+  04 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.4.4.3.ebuild:
   Stable on IA64.
 
   04 Jan 2007; Torsten Veller <tove@gentoo.org> git-1.4.4.3.ebuild:
@@ -1549,7 +1556,7 @@
 
 *git-1.4.1.1 (25 Jul 2006)
 
-  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.1.ebuild:
+  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.1.ebuild:
   Version bump.
 
   11 Jul 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.0-r1.ebuild,
@@ -1558,7 +1565,7 @@
 
 *git-1.4.1 (02 Jul 2006)
 
-  02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.ebuild:
+  02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.ebuild:
   Version bump to version 1.4.1. No gitweb installed as of yet.
 
   28 Jun 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild:
@@ -1588,7 +1595,7 @@
   17 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.3.ebuild:
   New upstream version.
 
-  14 May 2006; Diego Pettenò <flameeyes@gentoo.org> git-1.3.2.ebuild:
+  14 May 2006; Diego Pettenò <flameeyes@gentoo.org> git-1.3.2.ebuild:
   Add ~x86-fbsd keyword.
 
 *git-1.3.2 (04 May 2006)
@@ -2013,7 +2020,7 @@
 
 *git-0.99.3 (09 Aug 2005)
 
-  09 Aug 2005; Michał Januszewski <spock@gentoo.org> +git-0.99.3.ebuild:
+  09 Aug 2005; Michał Januszewski <spock@gentoo.org> +git-0.99.3.ebuild:
   Version bump.
 
   15 Jul 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 2ce7b865aa54..5a842bf7d9fb 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,10 +1,9 @@
 AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2
-AUX git-1.6.6.1-interix6.patch 457 RMD160 27bdfe9ab248791f628420cc45751fae2643b3d5 SHA1 6c80a5cb63cbcf89b61b8f5e2c16736cb0be09bc SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849
 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-interix.patch 2192 RMD160 725c43e056bbaa82e4af1f2aef9dd152214f9d65 SHA1 de6062aaa8bd177c77c124696d4253c299bba1fb SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495
 AUX git-1.7.1-noiconv-segfault-fix.patch 1786 RMD160 592f84005bccdfbc020ad79d66c8b17d401e1c51 SHA1 17108275dff771dc919a273540774749f3623875 SHA256 6f50165264078da499329be3b74176aacae85fc48934576ecd37f0fc2de4c2b4
 AUX git-1.7.2-always-install-js.patch 1167 RMD160 36cae52a1dbcb2450a521b60ce66dbd48e58b3a9 SHA1 45f652281e36627f80b2d559a6861e784b8afa75 SHA256 2988513c5a81f446818b850414b4bf7dc8a3177eb1dc32f29e530a80479baa9e
+AUX git-1.7.3.2-interix.patch 2283 RMD160 2c448d5a8bfb9696cbc55a52328e04617de9fcf1 SHA1 b35a35d6b6729c3868482c689a7c629b35c7e414 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9c2270e113afe5ac3962d78e8b6
 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
@@ -47,8 +46,8 @@ EBUILD git-1.7.2.2.ebuild 13349 RMD160 8fe7b57a926639b7ac6363fd07c0ccf13c585bbb
 EBUILD git-1.7.2.3.ebuild 13370 RMD160 3855903ad44eb43608eb5d153ce52ca380fcc4b0 SHA1 a019f5d6de0a538a68a8085fe1a94aeacb068080 SHA256 7de0a88fb6e69083db6d5cc5c42d6d162471872a52f3930548dd8b51317284ef
 EBUILD git-1.7.2.ebuild 11473 RMD160 4a1bdd7d0ffbc8f677fe41216fb7b5e87f70ea3b SHA1 f5c98b2bb8e2240d9dbb43d6f6c4592916dcf5bd SHA256 7748e46b9b8cc17dd4028a4414f9fc578c4e479d85b07a957fff3ddf508bbb0f
 EBUILD git-1.7.3.1.ebuild 13370 RMD160 9d73585d0bc90eba370bd67594f52bc157c69210 SHA1 5fe8b7b5378cea6fb41b33e6bcaedbdda6a84dc3 SHA256 1c2c0328edfe57977ecacc01bfa59835231cb4e9eb5e83d78c739ae95030da72
-EBUILD git-1.7.3.2.ebuild 13370 RMD160 6fd306416567a22efe58764934bd0df0c47e8ba7 SHA1 08cd611cdec2e5d4d25521127f7823b2662e862c SHA256 69e28822cd737139e3c293532fcaddac8379c3107a9cb6c3018f2d131ca98373
+EBUILD git-1.7.3.2.ebuild 12898 RMD160 9b2843892449f4be9ee70344395dfbb5475cb295 SHA1 b4f5b192bf86879124e1feb94d3d933819bcbfdd SHA256 ddd94e13359010ef6c5aaf1a03d2f99fb174a6dbe7f230ec55360321c551fa15
 EBUILD git-1.7.3.ebuild 13368 RMD160 62b50fd606cda218805b236083c5c826420eb9a2 SHA1 f9096b5a7aa7e64927c642e673f914e80316e120 SHA256 e6595b040a14b93a683f0cf2444f7a05a9f9042a524556eb1696ac1d21297831
 EBUILD git-9999.ebuild 11299 RMD160 9d2b7b795c198a8dd1563fc4ee20b9302b8f899d SHA1 f748425d15ef0338f55309538fb4cd15077eb662 SHA256 5bb9372b428fcbfd7573e232d835aca4bb23d1f8dfc21e6b94fb0bf6ef992be2
-MISC ChangeLog 70635 RMD160 a7360bb7b55cdc414596134855144d70f44e870a SHA1 6d78225bd67242e7ff382cfe40bbe35892f4bf70 SHA256 9e3a1a3ab4d01614edb4b0defbc0e3437d2fc96a11ceab06ee9e66565b65fe05
+MISC ChangeLog 70989 RMD160 38281c9898387a7b082fb01d2a9752e05d13be3c SHA1 8e030446bbb9e5a576dcd12863ab805371b6f2e0 SHA256 76a08650bfa019bf241b9fe05547ce528fb67424d73fda4bc9be31426ec4d976
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/files/git-1.6.6.1-interix6.patch b/dev-vcs/git/files/git-1.6.6.1-interix6.patch
deleted file mode 100644
index 0a8db374744d..000000000000
--- a/dev-vcs/git/files/git-1.6.6.1-interix6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru git-1.6.6.1.orig/compat/inet_ntop.c git-1.6.6.1/compat/inet_ntop.c
---- git-1.6.6.1.orig/compat/inet_ntop.c	2010-03-09 04:39:03 -0800
-+++ git-1.6.6.1/compat/inet_ntop.c	2010-03-09 04:40:50 -0800
-@@ -169,6 +169,8 @@
- }
- #endif
- 
-+/* conflicts with interix' headers... */
-+#ifndef __INTERIX
- /* char *
-  * inet_ntop(af, src, dst, size)
-  *	convert a network format address to presentation format.
-@@ -197,3 +199,4 @@
- 	}
- 	/* NOTREACHED */
- }
-+#endif
diff --git a/dev-vcs/git/files/git-1.7.1-interix.patch b/dev-vcs/git/files/git-1.7.1-interix.patch
deleted file mode 100644
index 130d808791f7..000000000000
--- a/dev-vcs/git/files/git-1.7.1-interix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-patch reported upstream at the mailing list.
-mail reference is: http://marc.info/?l=git&m=126813299716136&w=2
-
---- builtin/upload-archive.c
-+++ builtin/upload-archive.c
-@@ -132,8 +132,9 @@
- 	packet_flush(1);
- 
- 	while (1) {
--		struct pollfd pfd[2];
- 		int status;
-+#ifndef __INTERIX
-+		struct pollfd pfd[2];
- 
- 		pfd[0].fd = fd1[0];
- 		pfd[0].events = POLLIN;
-@@ -156,6 +157,8 @@
- 			if (process_input(pfd[0].fd, 1))
- 				continue;
- 
-+#endif
-+
- 		if (waitpid(writer, &status, 0) < 0)
- 			error_clnt("%s", lostchild);
- 		else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
---- daemon.c
-+++ daemon.c
-@@ -14,6 +14,8 @@
- #define NI_MAXSERV 32
- #endif
- 
-+#ifndef __INTERIX /* not available on interix! */
-+
- static int log_syslog;
- static int verbose;
- static int reuseaddr;
-@@ -922,8 +924,13 @@
- 	return service_loop(socknum, socklist);
- }
- 
-+#endif /* __INTERIX */
-+
- int main(int argc, char **argv)
- {
-+#ifdef __INTERIX
-+	die("not implemented on interix!");
-+#else /* !__INTERIX */
- 	int listen_port = 0;
- 	char *listen_addr = NULL;
- 	int inetd_mode = 0;
-@@ -1121,4 +1128,5 @@
- 		store_pid(pid_file);
- 
- 	return serve(listen_addr, listen_port, pass, gid);
-+#endif /* __INTERIX */
- }
---- git-compat-util.h
-+++ git-compat-util.h
-@@ -93,7 +93,9 @@
- #include <utime.h>
- #ifndef __MINGW32__
- #include <sys/wait.h>
-+#ifndef __INTERIX
- #include <sys/poll.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #ifndef NO_SYS_SELECT_H
-@@ -104,7 +106,11 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <pwd.h>
-+#ifndef __INTERIX
- #include <inttypes.h>
-+#else
-+#include <stdint.h>
-+#endif
- #if defined(__CYGWIN__)
- #undef _XOPEN_SOURCE
- #include <grp.h>
---- upload-pack.c
-+++ upload-pack.c
-@@ -150,6 +150,7 @@
- 
- static void create_pack_file(void)
- {
-+#ifndef __INTERIX
- 	struct async rev_list;
- 	struct child_process pack_objects;
- 	int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
-@@ -328,6 +329,9 @@
-  fail:
- 	send_client_data(3, abort_msg, sizeof(abort_msg));
- 	die("git upload-pack: %s", abort_msg);
-+#else /* __INTERIX */
-+	die("git upload-pack: not implemented on interix!");
-+#endif /* __INTERIX */
- }
- 
- static int got_sha1(char *hex, unsigned char *sha1)
diff --git a/dev-vcs/git/files/git-1.7.3.2-interix.patch b/dev-vcs/git/files/git-1.7.3.2-interix.patch
new file mode 100644
index 000000000000..2e333b507978
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.2-interix.patch
@@ -0,0 +1,90 @@
+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>
diff --git a/dev-vcs/git/git-1.7.3.2.ebuild b/dev-vcs/git/git-1.7.3.2.ebuild
index d05fed79e651..17aafbbdc38b 100644
--- a/dev-vcs/git/git-1.7.3.2.ebuild
+++ b/dev-vcs/git/git-1.7.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2.ebuild,v 1.1 2010/10/22 05:39:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2.ebuild,v 1.2 2010/10/22 11:38:12 mduft Exp $
 
 EAPI=3
 
@@ -149,17 +149,6 @@ exportmakeopts() {
 #		myopts="${myopts} NO_MKDTEMP=YesPlease"
 #		myopts="${myopts} NO_MKSTEMPS=YesPlease"
 #	fi
-	if [[ ${CHOST} == *-interix* ]] ; then
-		myopts="${myopts} NO_IPV6=YesPlease"
-		myopts="${myopts} NO_MEMMEM=YesPlease"
-		myopts="${myopts} NO_MKDTEMP=YesPlease"
-		myopts="${myopts} NO_STRTOUMAX=YesPlease"
-		myopts="${myopts} NO_STRTOULL=YesPlease"
-		myopts="${myopts} NO_INET_NTOP=YesPlease"
-		myopts="${myopts} NO_INET_PTON=YesPlease"
-		myopts="${myopts} NO_NSEC=YesPlease"
-		myopts="${myopts} NO_MKSTEMPS=YesPlease"
-	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts="${myopts} NO_NSEC=YesPlease"
 	fi
@@ -227,8 +216,7 @@ src_prepare() {
 		Documentation/Makefile || die "sed failed"
 
 	# bug #318289
-	epatch "${FILESDIR}"/git-1.7.1-interix.patch
-	epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch
+	epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
 }
 
 git_emake() {