Re-enable USE=-iconv support now that the bug originally disabling it was fixed in upstream, and make sure we default to USE=iconv so that unicode/etc... messages "just work" out of the box #355467 by Tom Lloyd.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

17 files changed, 93 insertions, 185 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 07e2733792ac..ffeed8487987 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.131 2012/05/20 04:25:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.132 2012/06/14 04:48:02 vapier Exp $
+
+  14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.8.1.ebuild,
+  git-1.7.8.2.ebuild, git-1.7.8.3.ebuild, git-1.7.8.4.ebuild,
+  git-1.7.8.5.ebuild, git-1.7.8.6.ebuild, git-1.7.8.ebuild, git-1.7.9.1.ebuild,
+  git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
+  git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.9_rc2.ebuild, git-9999.ebuild:
+  Re-enable USE=-iconv support now that the bug originally disabling it was
+  fixed in upstream, and make sure we default to USE=iconv so that
+  unicode/etc... messages "just work" out of the box #355467 by Tom Lloyd.
 
 *git-1.7.10.2 (20 May 2012)
 
@@ -2533,4 +2542,3 @@
 
   15 Apr 2005; Carlos Silva <r3pek@gentoo.org> +metadata.xml:
   Initial import
-
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f7fe3165d5ad..ae565ce9787e 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.1-interix.patch 2192 RMD160 725c43e056bbaa82e4af1f2aef9dd152214f9d65 SHA1 de6062aaa8bd177c77c124696d4253c299bba1fb SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495
@@ -100,20 +103,37 @@ EBUILD git-1.7.5.3.ebuild 14734 RMD160 30ee5d07c329cd1dc518e7f41eba2fec33fdf8eb
 EBUILD git-1.7.6.4.ebuild 15368 RMD160 3275287346025a271d12c3886a08a50b64d0aaa0 SHA1 8b13544f371bb0f3fb080e1c127642853f550e5a SHA256 318ba9980b336deaa402de36ebb50b627cc3b5f194a1354931457329d1ddcc51
 EBUILD git-1.7.7.6.ebuild 15110 RMD160 660bfb676175c9138ce0f44f7a1e69d4b9da1df7 SHA1 176c6608dfb863b4acfb3e67f1824bd78fd0ca76 SHA256 38e35dbcb12e479c289111dde48cf41eef957c341cde5a841879888b3939abf7
 EBUILD git-1.7.7.7.ebuild 15110 RMD160 62eada188f1dd39052eec6c33bd7149ce33fef87 SHA1 6ba5a4f46cea4b76106e9f9ad235f434502de5ad SHA256 9356bafe2f1adb7d8b80753555fa190d425fb89d725b1881a572a47bf4c707e8
-EBUILD git-1.7.8.1.ebuild 15110 RMD160 4e8aef92de685c2636f45ed19b169a10da0d2085 SHA1 5366c3347f4fb5e38dfb487c77dc46dc82ff45bf SHA256 8ee569cd111d4af850e61bf40b0bad33af823519802cf595629f832638372226
-EBUILD git-1.7.8.2.ebuild 15110 RMD160 1b0ea4da22c120a9d696c62dbf19c97e4215dad6 SHA1 631e62ad317a44841363f19a167d9ba83f6d90ec SHA256 c4021030525ea958d054077bcf9658e24a3222bf105dbe68f04cfb6c95e28ce8
-EBUILD git-1.7.8.3.ebuild 15110 RMD160 e6c7afb193b21fed5df83773d245cb906c742713 SHA1 93e44695e199d483f076c62adc7de723f5782283 SHA256 cd68b51ae7d404e05f7e84f13d8e3d4ad54d434ea46d611232c516174dcfc739
-EBUILD git-1.7.8.4.ebuild 15110 RMD160 08984137854bd39d7d1f81773e81d7a615ed2a73 SHA1 6aaecd308c32d0f8a5f2467edb7061fc4b9079de SHA256 8b999e3208749bff054c2d3d35569d4d945a645793f702045501a84a46bdede8
-EBUILD git-1.7.8.5.ebuild 15110 RMD160 08e1944f00196f50b7daa312f1462acfcffdc10d SHA1 00b7b765eecc87ea44ea3c3c3e04d54d837d2cb7 SHA256 0915823368f53351c4ff8ed306e1c1b3ee204394c9bac154b03af5e57b20fb9a
-EBUILD git-1.7.8.6.ebuild 15123 RMD160 798b73c4ffbacf786ec2380f7de4603a4980e3b5 SHA1 99084f239dbb4457355c76921e3a383f11605193 SHA256 4ed48d7ed72aaf8737a9426cc02ddd446bac9fe3c909720610d5fb38f8547b29
-EBUILD git-1.7.8.ebuild 15108 RMD160 bbf80a4cdc89f02f98a0fab0c514b84adae71f7b SHA1 59459055b38ac4560ca487fcf2c4551739957725 SHA256 ada91dcf9536675492ac599fda7072b47a135356180c36b04ed8210dc0070760
-EBUILD git-1.7.9.1.ebuild 16743 RMD160 85ee4b40d277aba9caa2867d06011e7f0a363815 SHA1 960020ea4b0aa4e020390d8701e134feae936e5b SHA256 c19df4794e3ae902cbba2443439057d7c7c3cedb397113dcb3ae382cd73574ee
-EBUILD git-1.7.9.2.ebuild 16743 RMD160 b125b6d2ee311fc527e50a18d4fd01a022279ad2 SHA1 00098de392368c49f38b43cf78bf5cc621c58471 SHA256 7dfdade22ee6bd35836a2bad076c82566ff68edf63df69b15619bc05ec9f0d3d
-EBUILD git-1.7.9.3.ebuild 16743 RMD160 17fc278eea467f011f62b91f72cdcd897aabed50 SHA1 5836961fa8e6668b8df3ae3a349535a4a749ea72 SHA256 f14bfb0f60070b53b39e3770ca5e9c946843a1c691cc97bde4a35cf317fb9dfe
-EBUILD git-1.7.9.4.ebuild 16743 RMD160 761eff296464ba601e650bde3f91465999a1f725 SHA1 453afc83785e13118e19acd4747292c0b6986e15 SHA256 bf1cd39f02774751af40da67fe33b4f9209742fa6f9dd4f6878e390bd7ca8be4
-EBUILD git-1.7.9.7.ebuild 16744 RMD160 f2ccbf2d1cc83f06f3bfa4bd8f5a403c351c3861 SHA1 e4ad7887e13d972a56171beb2054f5d70ef3f33f SHA256 10826af3f38c64ba6a49ed2be33d0786f63d6fbd00bd432d0119f2c9a828bf6b
-EBUILD git-1.7.9.ebuild 16741 RMD160 0b854ca762709d878815e54577a81a63d502c6f6 SHA1 df903c594080adbd15559bc0201ddded904599d7 SHA256 e00ecb88dc7e8b8505a9e26df71da6b668071a1a44479793f4b024e6e23b8313
-EBUILD git-1.7.9_rc2.ebuild 16377 RMD160 8de8a1978772346f6aee19e07fa7409a4a6d9a76 SHA1 d884a5714ac92b4b423ec651f6d29a1ad100f8ad SHA256 c843afeb9b1139d5b883d25c4398aa7b1663c5faa223d4dba96b59119c5bba71
-EBUILD git-9999.ebuild 16299 RMD160 9a41e2bcc4ccaa80d031f0016d5ce05dce63714d SHA1 aeab7ce42b7af7663aa735062a67a64d967860c4 SHA256 8f92b308ecd1f496d723c4eff5430c10bd83b837658bd630a7538ed894768791
-MISC ChangeLog 87605 RMD160 329dcb2288a0429dff93eb1942263cb3c85d14ed SHA1 ada9092b11f8a68a3fdab98fb1ee7a565fe5deff SHA256 864136e1345bdd786668daae411ebedeeea6f42bc65a4370968fee7cd537de85
+EBUILD git-1.7.8.1.ebuild 14769 RMD160 5d471e3ed23038ab0e21aa74853b2e7c61e002a1 SHA1 0d36695285872895b35910c2feddae1a1cb4f8c5 SHA256 6b07f2ed70a6548ec7b6a41a610336ccc7d37bfdc872ceb922534f4ddd0a22e7
+EBUILD git-1.7.8.2.ebuild 14769 RMD160 d2c34f686acbf57df0fb12b6e7a619dfed0b2a72 SHA1 975d220b0b807fb94256a05d48f8a0c44867a087 SHA256 90c06c72fcfa45a167a8a88f06350b8f4a02f3bcfa34fbe829457195401e63f0
+EBUILD git-1.7.8.3.ebuild 14769 RMD160 a91a5f7a7859577282eedafad3b9653bf4554d6a SHA1 c8b9979fa8b53243097c8ee86b7e20661b0e3619 SHA256 ddbd07d5133703b8badeccc330ad17960ad809dcb4ddf8462c956731b1893ce6
+EBUILD git-1.7.8.4.ebuild 14769 RMD160 52db8444de47ebd96e947a93082ed2eef651f3b5 SHA1 80d865eac16e171da15d1f4a9d276412b9544939 SHA256 90cf63bd63ff6176fbd35bb85d75dd0b76cb09603e90b77cfab1d99a9e6d7f8b
+EBUILD git-1.7.8.5.ebuild 14769 RMD160 6443e7c1eff218bb9d45ea327e3c43e49c28ab5a SHA1 e2a81e38644821ff0f2c02956c03b3153c4e023f SHA256 9ddefdd129439c9ec5e8f6f76c9164010d39679fbf539394bd5094edc4471338
+EBUILD git-1.7.8.6.ebuild 14781 RMD160 b75093a524898f67658c46901b159ecfde048633 SHA1 f5302c4d07baad2cd86446c79c178e744281fda1 SHA256 f2c0c60e9b55622b076071f1514822c79a7427dd532f667b0692aaaf65472d74
+EBUILD git-1.7.8.ebuild 14767 RMD160 2218f55347ae3161d3cc3483f0ccf7315c3eca2a SHA1 c84dfde2d64dd98f94e9f794290a443ee238843f SHA256 25ce4faef6d965bda2e5c615793e926f1c09f93e8dd3a16e842b4470dd7908ae
+EBUILD git-1.7.9.1.ebuild 16403 RMD160 23520c18b320b09d298221708c5e589cf535f212 SHA1 8a406f59515dbf1738f77e7e5312c0b2ac2d9dc7 SHA256 e9519d8c1b79833b4b88a9b5331756aca1433fb64baf095eca7c8fc5dcca9738
+EBUILD git-1.7.9.2.ebuild 16403 RMD160 a735563c1825df1472494225514d6ed236638cdf SHA1 bd0ade75c42fe9a1e99feedc82dd7422fcd827b1 SHA256 4c63eae78c3c426438288543a1a0e688b90220e519340c8c5330c882e23f88ca
+EBUILD git-1.7.9.3.ebuild 16403 RMD160 e85631c5d7b85754c6aa21acd39bcdc3f80e00f1 SHA1 0f2ec21d4f39257bd07c516ce6bb4ebb22018312 SHA256 fd6dcfa217aeca6f08c14ba03da0b2d761bc43b8249757754fabe22d85890343
+EBUILD git-1.7.9.4.ebuild 16403 RMD160 cdce91e02a7d033ba58bda4a9beb5606ed2a38bb SHA1 9d107a15833fb2a99b53f2d2599319dfaae6b249 SHA256 bf4b6fbfb61d3ac3d55c6a2a8d8e2795c182af07d94788be153d0b3eab18a413
+EBUILD git-1.7.9.7.ebuild 16403 RMD160 565d1e3256f532fc401169465b9081b04957759a SHA1 ee6b9a3b55a5c48ee45f0fce07d055705ab10181 SHA256 e63d2af1032e3827e5ba56d61de58d0475372bc4a0566b06f27b623bc2ccff65
+EBUILD git-1.7.9.ebuild 16401 RMD160 9e21e39b9454155c42783d4f26179d3b376a7537 SHA1 efd2d45600b9500e6cbbde98831fcb323ef30900 SHA256 3b4ba57473b46abcaaed9f2354433e90fa3f2fbb24cd5958270cd8f5df923dc0
+EBUILD git-1.7.9_rc2.ebuild 16036 RMD160 84159ea871718442474dd5bb30bf22e007ef1367 SHA1 9dcfde78e66f6131ee0e84f61aebf19b365f3695 SHA256 0eb93296b4353374da0f7254a04f2cdf0b8d08210ef9d08f9ed11ded9baa401a
+EBUILD git-9999.ebuild 15958 RMD160 1adbe9a2520cb568fb2cf9b87d4146d80a935c34 SHA1 d63226c90d7d8a7a176880ac6229bfae886f036a SHA256 2c668018028de1413d8aeb4d38b419bd281861425671b5143f3f6d85fba82a92
+MISC ChangeLog 88175 RMD160 07f8bb592df1a456d36a8df06542763af785c029 SHA1 a28ce10e757760b94daf2c336ddf4fed699e7037 SHA256 d3bec323fea5da751c8919ab0e84eb8d4e62104e0c0919f7111a912e642d28b2
 MISC metadata.xml 1519 RMD160 4ba9e2c4e8239f644b1f4a82bc47d1b587e195a6 SHA1 813d8c8015a1cb757e54fa8681f8a7686cfc40e7 SHA256 58313781f3108991fee93cb0119e6720fe895487e43d44dbf96c4733f81854ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP2W0PAAoJELEHsLL7fEFW7ScQAJrChxdjcl1QPIM6gbniFZYX
+XO1pi6LYHir7EWxyRCI35K72GCvxzzmtj+SoVAeYpa9pFAQ0PTrrf5QZFZvSo7dZ
+hxWv3ZndADKJpK3dd8PZOFmGhynxvoLxXB7Dr6Olo+VZ/Lw/btAa5mxYlAT5k8L5
+Qy4mx5Qr7XNLzsAeZZELrTNSgh2M5lATwu7itU5KzRNyYX3jAqopMrSlYt0eOW9G
+Wr8OcUHNv27ghd6lXq0SxSw2OMu/jRgTKHTMKXjHfVRu2UdzmWAeV9UENP5mJD+C
+IqK4dFsl+/yQIc3IpFDOB0j14OiIDimQBDBq1D2c1i2VxL8CckoGTx/NRQ9STB1Y
+xCtYCTtgQPeudLYukk+LCqjQX62MHWvab95PHKe9a5gl5dLIwkwkva7kG/c6IUyA
+1mgWhQoXyRIWcSiukWlIvQ21aMppFSxEtnv6B0KP2mkmSebnlM38l3CrV2+E6oCZ
+nE0qPtlxVc/eGx3m4JiKYASRR0byZNb4x/uRvDxYGPJtfRZPJOYi9ImsYqjAjPLy
+vAGtnQhCtdovqd4k39HM8b4rjN2TqJhhyHZnaZz6M3+6ebKK932W3O9JG3szQE1Z
+bZbMeobu5uabXshA7fTn6a4agXaxpVJ4FF2xB23pCljbPBWCvmg6JNy87uXlsxxZ
+Sbg+2SUY2qfQG/XbgUjD
+=hPfu
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-1.7.8.1.ebuild b/dev-vcs/git/git-1.7.8.1.ebuild
index bdbc0393b94e..c289b48dfeea 100644
--- a/dev-vcs/git/git-1.7.8.1.ebuild
+++ b/dev-vcs/git/git-1.7.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.1.ebuild,v 1.1 2011/12/21 23:59:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.1.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.8.2.ebuild b/dev-vcs/git/git-1.7.8.2.ebuild
index fa4b57ed30c3..01a8c90eef44 100644
--- a/dev-vcs/git/git-1.7.8.2.ebuild
+++ b/dev-vcs/git/git-1.7.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.2.ebuild,v 1.1 2012/01/02 04:12:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.2.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.8.3.ebuild b/dev-vcs/git/git-1.7.8.3.ebuild
index d371fe874966..faa009a548c1 100644
--- a/dev-vcs/git/git-1.7.8.3.ebuild
+++ b/dev-vcs/git/git-1.7.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.3.ebuild,v 1.1 2012/01/07 02:58:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.3.ebuild,v 1.2 2012/06/14 04:48:02 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.8.4.ebuild b/dev-vcs/git/git-1.7.8.4.ebuild
index 58b26891a8fd..731123dcafb6 100644
--- a/dev-vcs/git/git-1.7.8.4.ebuild
+++ b/dev-vcs/git/git-1.7.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.4.ebuild,v 1.1 2012/01/20 08:32:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.4.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.8.5.ebuild b/dev-vcs/git/git-1.7.8.5.ebuild
index 7cdf9e34cf54..4c0ef3b48ee3 100644
--- a/dev-vcs/git/git-1.7.8.5.ebuild
+++ b/dev-vcs/git/git-1.7.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.5.ebuild,v 1.1 2012/02/28 02:08:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.5.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild
index 2186e4185e01..2afdb7e23362 100644
--- a/dev-vcs/git/git-1.7.8.6.ebuild
+++ b/dev-vcs/git/git-1.7.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.2 2012/05/09 15:51:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.8.ebuild b/dev-vcs/git/git-1.7.8.ebuild
index 5e28847e82ee..39f403e111f1 100644
--- a/dev-vcs/git/git-1.7.8.ebuild
+++ b/dev-vcs/git/git-1.7.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.ebuild,v 1.1 2011/12/03 01:57:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.ebuild,v 1.2 2012/06/14 04:48:02 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -138,11 +138,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -213,10 +209,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9.1.ebuild b/dev-vcs/git/git-1.7.9.1.ebuild
index ea877e0ee3f9..64807cd79cff 100644
--- a/dev-vcs/git/git-1.7.9.1.ebuild
+++ b/dev-vcs/git/git-1.7.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.1.ebuild,v 1.2 2012/04/23 17:21:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.1.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,11 +144,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -221,10 +217,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9.2.ebuild b/dev-vcs/git/git-1.7.9.2.ebuild
index 083bbd71d720..263bcd5c50e8 100644
--- a/dev-vcs/git/git-1.7.9.2.ebuild
+++ b/dev-vcs/git/git-1.7.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.2 2012/04/23 17:21:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,11 +144,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -221,10 +217,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9.3.ebuild b/dev-vcs/git/git-1.7.9.3.ebuild
index a9bce41b3ad4..b9f1bca812d0 100644
--- a/dev-vcs/git/git-1.7.9.3.ebuild
+++ b/dev-vcs/git/git-1.7.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.3.ebuild,v 1.2 2012/04/23 17:21:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.3.ebuild,v 1.3 2012/06/14 04:48:02 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,11 +144,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -221,10 +217,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9.4.ebuild b/dev-vcs/git/git-1.7.9.4.ebuild
index 043eaddf3c87..63875669a0f6 100644
--- a/dev-vcs/git/git-1.7.9.4.ebuild
+++ b/dev-vcs/git/git-1.7.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.4.ebuild,v 1.2 2012/04/23 17:21:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.4.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,11 +144,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -221,10 +217,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild
index b03c14ac2660..1b69b471e0e5 100644
--- a/dev-vcs/git/git-1.7.9.7.ebuild
+++ b/dev-vcs/git/git-1.7.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,11 +144,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -221,10 +217,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9.ebuild b/dev-vcs/git/git-1.7.9.ebuild
index def8190f32c9..434c188fdeda 100644
--- a/dev-vcs/git/git-1.7.9.ebuild
+++ b/dev-vcs/git/git-1.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.2 2012/04/23 17:21:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.3 2012/06/14 04:48:02 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -144,11 +144,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -221,10 +217,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-1.7.9_rc2.ebuild b/dev-vcs/git/git-1.7.9_rc2.ebuild
index 3c05eacc76ab..b69df564bc23 100644
--- a/dev-vcs/git/git-1.7.9_rc2.ebuild
+++ b/dev-vcs/git/git-1.7.9_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.4 2012/01/28 20:35:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.5 2012/06/14 04:48:02 vapier Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -143,11 +143,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use perl \
@@ -218,10 +214,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 650c2c068f3c..52278baa97c7 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.31 2012/05/20 04:25:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.32 2012/06/14 04:48:01 vapier Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -143,11 +143,7 @@ exportmakeopts() {
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 
 	use iconv \
-		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
-	#	|| myopts="${myopts} NO_ICONV=YesPlease"
-	# because, above, we need to do this unconditionally (no "&& use iconv")
-	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
+		|| myopts="${myopts} NO_ICONV=YesPlease"
 	use tk \
 		|| myopts="${myopts} NO_TCLTK=YesPlease"
 	use pcre \
@@ -220,10 +216,6 @@ src_prepare() {
 	# Merged in 1.7.5.x
 	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
 
-	# USE=-iconv causes segfaults, fixed post 1.7.1
-	# Gentoo bug #321895
-	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
 	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
 	# user.
 	# Merged upstream