Bug #322205: The iconv patch added for -r1 just stopped the segfaults, the testsuite...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 8ec049ce58e040afab5a90fd405d7818f1fa2560..14d83a95d59d849e8bda5db39a626037ed7288af 100644 (file)
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2010/05/28 20:30:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.9 2010/05/31 20:06:33 robbat2 Exp $
+
+  31 May 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.1-r1.ebuild:
+  Bug #322205: The iconv patch added for -r1 just stopped the segfaults, the
+  testsuite still fails, so forcing USE=iconv for now.
 
   28 May 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.1.ebuild:
   Remove broken 1.7.1.

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index ae86bd45d608b6dda3b0f003392c903fd0cfa8ef..30cec0b4b2dc1fe45d7479735df38bb32c3e5534 100644 (file)
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -120,7 +120,7 @@ EBUILD git-1.6.6_rc4.ebuild 11105 RMD160 e44c3bf204a32ea492d80bbefdb9358cf43706f
 EBUILD git-1.7.0.3.ebuild 11286 RMD160 ec0d03c0cabbc8404f477cec651c642114fe19bb SHA1 817e47bd7d0e529ce890ba80e9eb9220b78c78d0 SHA256 b2a99106887fd07d71ebe151093349fcba95b3f810b1fdcad62ad834c83ca8be
 EBUILD git-1.7.0.4.ebuild 11286 RMD160 06b16788b54bcfee5c8219817b016b6a45aacd45 SHA1 2adfba0b08d51f7fa0a5740dd35a48e9f23f8d41 SHA256 03a74571a6123a38dc789cece8d4513a7cb9a153c033ced71f8f431421e78552
 EBUILD git-1.7.0.ebuild 11284 RMD160 53c1bbdc72ac4f8950221d17534444cd906305f2 SHA1 276f6355d48e56d9ee12d195d9be169fee36a84c SHA256 15d4292f13126491032cc1aca9766b773bf7bbbc0f9b37274c1771663f50e1a8
-EBUILD git-1.7.1-r1.ebuild 11418 RMD160 d5faaac1450404f6f5ab1da014285d268a74f783 SHA1 c453096de1f052b8b576fbea42f4f0c86bc073de SHA256 b7f06a62a02abfbe49a7000d0b9effda558f47a887578c1562d7fd446f1cd6f4
+EBUILD git-1.7.1-r1.ebuild 11489 RMD160 9d7210a52fd2b97c68618bf9731cc3e49d5dd385 SHA1 6816269a3bd592f069e7b6f789c58571243383d9 SHA256 4e1038bf80e62a561439869b3d0c5de8891efcb12405004997bf152bed66665e
 EBUILD git-9999.ebuild 11276 RMD160 0621eed66ee38cef41b541f279d07f893cd67e92 SHA1 3048e20973fe7b20b67bf61646f2a8c17677355c SHA256 4a8cd3861eed616cfcd96096d2ad817c08b36c52f3aaa9fa655f11bd9f933012
-MISC ChangeLog 64597 RMD160 32cda1e41a34fa809061bae5a8933060032352df SHA1 3d91272291e8e440aca442f4f4d03e5d2dfe2d61 SHA256 3fcfd7e11339984f2a737b91d43211ca32fe3dd69446b6d924d9117fe158c534
+MISC ChangeLog 64804 RMD160 013f28eda9b12b690ff8b366026bd995a2bb6320 SHA1 c2a024e396d8938279a1aa203654d04df72d99f0 SHA256 a2ae6cb57108f161471c243be35d4bece25d82b636b35d11aba9c04779e81f2c
 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007

diff --git a/dev-vcs/git/git-1.7.1-r1.ebuild b/dev-vcs/git/git-1.7.1-r1.ebuild
index 07059ba9ffef79ae9685fdfcc2bd35882e5ec3e7..2fd52719024909c1f8da95304b2d94a6d7f93b69 100644 (file)
--- a/dev-vcs/git/git-1.7.1-r1.ebuild
+++ b/dev-vcs/git/git-1.7.1-r1.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.1-r1.ebuild,v 1.1 2010/05/28 20:27:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1-r1.ebuild,v 1.2 2010/05/31 20:06:33 robbat2 Exp $
 
 EAPI=2
 
@@ -114,7 +114,8 @@ exportmakeopts() {
        fi
 
        use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
+               || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
+       #       || myopts="${myopts} NO_ICONV=YesPlease"
        use tk \
                || myopts="${myopts} NO_TCLTK=YesPlease"
        use perl \