diff options
| author |   Markus Duft <mduft@gentoo.org> | 2011-07-13 07:03:15 +0000 |
|---|---|---|
| committer | Markus Duft <mduft@gentoo.org> | 2011-07-13 07:03:15 +0000 |
| commit | 5d1da80f405fcaf26be1ed84e2beb7de92675d12 (patch) | |
| tree | f38d69bcbe4bcc8e7789155d049c61ce80bb2b4d /dev-vcs | |
| parent | Add mysql v2 eclass ready for newer mysql 5.1, and supporting mysql/mariadb 5... (diff) | |
| download | historical-5d1da80f405fcaf26be1ed84e2beb7de92675d12.tar.gz historical-5d1da80f405fcaf26be1ed84e2beb7de92675d12.tar.bz2 historical-5d1da80f405fcaf26be1ed84e2beb7de92675d12.zip | |
re-added interix prefix specific patch, as some things didnt make it into the current release.
Package-Manager: portage-2.1.10.3/cvs/Linux i686
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-vcs/git/Manifest | 5 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-1.7.6-interix.patch | 29 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.6.ebuild | 4 |
4 files changed, 41 insertions, 4 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index adcd94a6ed6f..4ce698696f3c 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.96 2011/06/27 19:56:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.97 2011/07/13 07:03:15 mduft Exp $ + + 13 Jul 2011; Markus Duft <mduft@gentoo.org> git-1.7.6.ebuild, + +files/git-1.7.6-interix.patch: + re-added interix prefix specific patch, as some things didnt make it into the + current release. *git-1.7.6 (27 Jun 2011) diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 64b674efaef0..520a493fcdfd 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -7,6 +7,7 @@ AUX git-1.7.3.4-avoid-shell-issues.patch 1165 RMD160 674c080efe0e9b99fecf4bf1910 AUX git-1.7.3.4-fix-perl-test-prereq.patch 1396 RMD160 d340a46fbb490f4b6ce09c4021a8d498c2ee87e3 SHA1 81a5acb7ac1079d440d740a2c16a995656da16f1 SHA256 a339767c3d3b8eb6b06adc54a68eb978884a114947ff04c56e6dcad920c0b75a AUX git-1.7.3.5-optional-cvs.patch 11606 RMD160 d84780628a71a44eac6150e9c7acafc9591089dd SHA1 58832c8141a0fd3681c6e9c98600526d290aa637 SHA256 e6d10a52783333839b12dd0574bd43ccca7bc4c5991d371fc464c4a352bab9f0 AUX git-1.7.5-interix.patch 1286 RMD160 8207e13dc0b2dd878438875ce8a961574b9c5dc0 SHA1 bd37c83cd948bba3134988152173378910e8ed0f SHA256 393c61cb38a714444853d2532b01d772d687d47c10f58ba69513fa9286cbca6c +AUX git-1.7.6-interix.patch 851 RMD160 6f103b3cee205c8d29f22b2f9f62cc801fb5f42e SHA1 8f453694aa0c0ac086ed661bb12b05879f5556b2 SHA256 8f704ae06dd6f004dc49a9d9dc8b215ba7f21be15983b023d3fe0924f283d064 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 @@ -59,7 +60,7 @@ EBUILD git-1.7.4.ebuild 14902 RMD160 4957dc78057f58bffab9307f9997f43a56356bd4 SH EBUILD git-1.7.5.3.ebuild 14965 RMD160 3e34380905a1d1fd2ae30eb0a9cf29b3ca0d2773 SHA1 77c011fe8edd0be1d4572662fb8e75287767bd63 SHA256 97a20c591f8df7213c2a99d4fa18ece21ae6b2b725cb11e6f7cfceff2f3486ba EBUILD git-1.7.5_rc1.ebuild 14908 RMD160 dad3da7bd083409b9c67cfe702fe660324a1f5c7 SHA1 71652f339314fcd3695e0e938a8cc6e4f45c75c9 SHA256 aa25cee30e32a207da21387bc6e10aac707798a81ad5e71fcc56cfda38dbe599 EBUILD git-1.7.5_rc3.ebuild 14847 RMD160 abcb9eda5d8aa1cf2e6c9b2ddd4b90a02645e7e7 SHA1 319a62c75a851f41f9e61e81304d6b7a2f84e6d3 SHA256 f781345c52bd624797e1922024a78884aac0728368dba3873334056434f281b6 -EBUILD git-1.7.6.ebuild 15146 RMD160 756ac64918c9f8e270461ee46447fcbe21fb35f6 SHA1 7bc91e3f03383c03fc1a5044d37171aff487bdd1 SHA256 121b548e00bd7b6677e08f1c27aa247f58e8a4ace9a9b185ca79ac3e894a3023 +EBUILD git-1.7.6.ebuild 15251 RMD160 e1cc839c0c678368056cd5bc6e07bc8300c31c75 SHA1 5f2a1c98342ec650c250a233e23688b02ec1cbc9 SHA256 1dc3a499a143d54486b16837d8292df30c36ab3fa6ea41c839cec762df3cb94c EBUILD git-9999.ebuild 15146 RMD160 71c3883a5f81573fcd544559081770773374060e SHA1 1c69938c6f463fee2cb39efb5b4a44d7735f0bdb SHA256 82ddf393840b1aad3a621c3a63d5ca687c7122a939bc50ae0b032e4e3a4bbff1 -MISC ChangeLog 81377 RMD160 554f0e404bc382ce85408d2a8e35e9357edcd38e SHA1 3b5760179461948debc153f33487302b7ad2367c SHA256 517c8ddd5a07021800dc1b055d576b59166c571d043be3dc214c37dfabc3bf94 +MISC ChangeLog 81573 RMD160 dae4081543a3f75e56d8024e190b433aeb061af6 SHA1 0478dad183733354886bfb08e16c1a2f16c0a570 SHA256 53de5a7addb6c912ddf37284fa43e26a67ff48affa1a9ff3db3dcaa0f40a3b5b MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b diff --git a/dev-vcs/git/files/git-1.7.6-interix.patch b/dev-vcs/git/files/git-1.7.6-interix.patch new file mode 100644 index 000000000000..575b0e398d2e --- /dev/null +++ b/dev-vcs/git/files/git-1.7.6-interix.patch @@ -0,0 +1,29 @@ +reported upstream: http://thread.gmane.org/gmane.comp.version-control.git/174407/focus=174438 + +diff -ru git-1.7.5.rc3.orig/Makefile git-1.7.5.rc3/Makefile +--- git-1.7.5.rc3.orig/Makefile 2011-05-27 08:40:59 +0200 ++++ git-1.7.5.rc3/Makefile 2011-05-27 09:00:58 +0200 +@@ -1121,8 +1121,6 @@ + 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 +@@ -1133,10 +1131,14 @@ + ifeq ($(uname_R),3.5) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease ++ NO_SOCKADDR_STORAGE = YesPlease ++ NO_FNMATCH_CASEFOLD = YesPlease + endif + ifeq ($(uname_R),5.2) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease ++ NO_SOCKADDR_STORAGE = YesPlease ++ NO_FNMATCH_CASEFOLD = YesPlease + endif + endif + ifneq (,$(findstring MINGW,$(uname_S))) diff --git a/dev-vcs/git/git-1.7.6.ebuild b/dev-vcs/git/git-1.7.6.ebuild index f1c4de6e2cfe..9ad3457529d7 100644 --- a/dev-vcs/git/git-1.7.6.ebuild +++ b/dev-vcs/git/git-1.7.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.6.ebuild,v 1.1 2011/06/27 19:56:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.6.ebuild,v 1.2 2011/07/13 07:03:15 mduft Exp $ EAPI=3 @@ -246,6 +246,8 @@ src_prepare() { # merged upstream #epatch "${FILESDIR}"/git-1.7.5-interix.patch + # but only one of two hunks made it into the release ... :( + epatch "${FILESDIR}"/git-1.7.6-interix.patch } git_emake() { |