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

(Portage version: 2.2.00.15754-prefix/cvs/Interix x86)

5 files changed, 122 insertions, 154 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/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() {