Fix compilation with USE=subversion on platforms without intl and iconv in libc, bug #516168, force for odd syntax errors in dependencies in untouched ebuilds that Portage otherwise is fine with

Package-Manager: portage-2.2.10.1-prefix/cvs/Darwin i386
RepoMan-Options: --force
Manifest-Sign-Key: 0x5F75F607C5C74E89

7 files changed, 50 insertions, 30 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index a6fc39254a8d..7c92bc3edaef 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.270 2014/07/20 21:22:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.271 2014/07/27 10:38:48 grobian Exp $
+
+  27 Jul 2014; Fabian Groffen <grobian@gentoo.org> git-2.0.2.ebuild,
+  git-9999.ebuild, git-9999-r1.ebuild, git-9999-r2.ebuild, git-9999-r3.ebuild:
+  Fix compilation with USE=subversion on platforms without intl and iconv in
+  libc, bug #516168
 
 *git-2.0.2 (20 Jul 2014)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 882cfd1f13e7..13849fd862ac 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -54,28 +54,18 @@ EBUILD git-1.8.5.5.ebuild 18442 SHA256 07a712895990037bb6c584c1cc39ae26c555c14f0
 EBUILD git-1.9.3.ebuild 18401 SHA256 b5c8e8c34f18fe480316a4c1a362f5516c6694f9dcdb21cc701796a02c71095e SHA512 8713955f11876f0de849459d327ecdf5d04d454257683187d55477d73ee12cd592f79f0642aa3bbb7c62ef1cbb3b1eca2877fd169bc0cab748a102cc7ca9d05c WHIRLPOOL 363b60787caee4e3fdc24f444dac781138af6e998db0de0c50715ccc040ace7c4c24b1ebc47e1730a8bf85660494d865f929a85dbda0b394205ce1269c581688
 EBUILD git-2.0.0-r2.ebuild 18416 SHA256 4a4b6a2d9dc34292bc5de120291801f1aaef76a140dfb7b388454ed9b0ce7c44 SHA512 661c1c1393633cf710bb4134221458a2b2afd0532c7bb74a33b3876c1d7b0a1c12a6b0cadfb2bc468697de8c0b4bd58d4acd910c0609be9fc3ef880be6aa7835 WHIRLPOOL c8d43357bff9d69dbdeb60600c416a26b9a7762bc8142fb2d1f1891aedfb130bafca1442b9e93437ba40335989a5c52ec6895db3bcd12108f09b47aa4926223f
 EBUILD git-2.0.1.ebuild 18418 SHA256 725d667f9337a3cd33813a987586c62680adee7c75aaf16f9e0861702a482a2f SHA512 30b39996b243d2a378a32990c8ad428f22cd26e7e7d892f787f61d9234b7e31d2676b09d2489bc48e8595021a139c933196592221f418ee23db8429e5387ecb7 WHIRLPOOL 90c6a8bb73cd933407b838f6d55a9116d699fbb5fc32b4b20eac3d94f5c73fd2310faff1a54c02efdc538aaff175b2bd7f9371b0dff4e26ad728888a4951d1b7
-EBUILD git-2.0.2.ebuild 18418 SHA256 50ff2218e4a371b6f0d4c75420c276355f127cebf4eb2fcf9d400511a3cd6649 SHA512 434d41adfe4ffd425c4470309540fab81d95872db95fbeebf456f10d737fef8f178f3f79c825caea5ec9647496a8709371fc320d5c61f827e3520cc0b05b6bd1 WHIRLPOOL eb2f8b57d54d03c2e46ae361582dc6cfbdc812f658d3e8e6dd303ef966159ee33a329c17612f5593175490f90fce0f8ae0528d871f187d3de3e74c390442ada1
-EBUILD git-9999-r1.ebuild 18429 SHA256 b7a46df58d8db77fdb92dd9d38aa79ec13333663921a9ab5b555669dabbb6243 SHA512 e98f691dfb497c4026de6e809a9e1ead4d2039f62ef8c41535a738a923fed864d718173346765282fd344a5a93f599f97d2ff998c2d12d8cc974ff8a8f5cf5db WHIRLPOOL 236c89dbcedfc91a9a2f5a882eac340736e933e509c232c55ef0ca1c7b1dfab25da817d7afe9a35b3930ad54072b4a93f75b5064a9b7ce1f62ef943673ecd6f1
-EBUILD git-9999-r2.ebuild 18428 SHA256 7949810c2fc4a3a0949f2c6c79a6f0be5576c9bffae0668d15821529cb3fc114 SHA512 1e26eccf828111a432b1b72f4dbae0ff612617b95f4765d63d925aadc5c80cf0fe52c63c3f3614032c8825f2858205f66b9ebc7a1f5fcbd8e9589ea3313d3196 WHIRLPOOL 557acd343e23da274860ce0f1af59d3c9c86069d0690f0441418396ad661b8f50d82d91e0b7dbf951c7247de7232bcdf7867dd4080e5f1ea33dd67a0aed742cf
-EBUILD git-9999-r3.ebuild 18426 SHA256 472e5aba211cc1815a4f0fdc4c2681a0bf18ad00420dd6bd99b0dbe25506a99a SHA512 0cd75f80a7b04bedbefd264ea4dfc2fe9386ef85bef5d95c8f8fd9ae3fc56cd5e99d54d74af10228d33a32ded44d0987803c43dc7d6eb7ed6740d0dece98cf2c WHIRLPOOL 0a3f92bcbdf0475bb9a6c7026543e62e05649645e54c410d713443c033c7f24f30299568f037d3b46995c212c8c087de7acdbdc068f86e49167a5d6f572b6321
-EBUILD git-9999.ebuild 18428 SHA256 b15f3f6c987df2cebeae2537ffafe94d413b1370f620019593b58770b85935f4 SHA512 68d16476f4bef771feebc32caa866a31d60496f99ef18fdbd26a44cd5f9bb7bd2f98505a7d543011781228c02c494e2d91e7194a97d3cafe9424f464565bca96 WHIRLPOOL 5178cd97cdb410c7f3049352ae672a1aeafd913f093e0fd724c4232a9c37f237157ef2cfc0e4453a5610062f1fb355e2374f3bb568cbd430304199fe9017712d
-MISC ChangeLog 17095 SHA256 60239bb03c93a88d02b676cf460b9da79d9855fabe6aad7d0a8fba182c65f521 SHA512 e8c55d44e75e9c776b26eebd7a1deae7ab4030c36c9cb86e1439e18e64b43b073955fb996eeea2969ecc719a9ae8d8f8a353a40e5d5ce44c303defc63e4230c6 WHIRLPOOL 9fb586dca8c7feec0b9b15a83704a38a64dedc3d04e5a31200cc8c6850b3646f12d429e3cc684f74548b7c2d813062161cc9e854b97896d5f5349643b9a5ce64
+EBUILD git-2.0.2.ebuild 18644 SHA256 6326756d1c86fd12f9c9ffb7cbadd44afc93e7db3761b19f4d83a886b6415412 SHA512 db541e4210c90363ebc113845589707dbc57d10fa60293b6d744a106dcaf51d6bf174195fcaefce3f6492707a2b1f01db042450823e81d5072fdfb9994020bc4 WHIRLPOOL d49dc02555848c0365ada1eec43479cc989d1ed15f041af7ce133a25a1a26268ef393919fc0c2cca2e8599f7c9430c65799f97c4780bd8abfd94f2d060c3fca6
+EBUILD git-9999-r1.ebuild 18658 SHA256 dedf3765ee6589510eb5b2e8005d4843dbdc5d811ca65225dbc3c7d561818ed4 SHA512 5477c589c0e99dfac685582274f9390a2faba1d5a1034d5ce58fbeaec16e12b367930b2303141fbdb96a899a4aff626c53778308d587e20dfaa8ac758716795a WHIRLPOOL 6766b3eefc173f3432f8d8961cc19c36c6be9b8e058e25588714ba768ab75f46e1a8e435ae179894665c37d7f6499cb7f3af81554ed8b3faab046cc67763aa62
+EBUILD git-9999-r2.ebuild 18657 SHA256 56624b2a8bf6363f7472908440091eab253c814e89858c3b32f19916debab3e2 SHA512 38ea0d330e42d415a87231216043ca8c6d8f8832e158f97b646b3be28f06727dc444910e72e0459f20a546310c003b8541fe62333a1640e644c4868106f22c87 WHIRLPOOL 2f5884f27439ecf0b2aad1ccd1f403ee45e130a502cb06454f3339c4514c798995f1d58f71e9e94ba89cbc4823b27aeb5078a24d4321d5a3122041462f0d2b1b
+EBUILD git-9999-r3.ebuild 18655 SHA256 a81be5bbba71cd6021407ac1a5789ca4bb533dd206cf483571cab771e707b8eb SHA512 cba78f0679d947945b582da66c7a57ecf426e222fc5b422801a56eab0043c68d687c035b1d6a8f724b227491dd68df556ef7a9b9ef0e73d757e13a6d35b0ed12 WHIRLPOOL 8fd8daadc1824ab3c7867fe14d2cb9be6d6918a9c76f950b320857de95205a50030af3305f30f0389dfb67648f00267445ea7b298bf35d39bb6702f625c48705
+EBUILD git-9999.ebuild 18657 SHA256 451642af7dff08b7c79f81286f88d2a630a006019b2a1a67dc061ab9c0ec2f45 SHA512 d379379bef880512866eea7059fd72823c95c2a542d2c7b823c5ea8e1be8e5ffa248e550a298c97ca31f15296556f593bb80449e3d40e0453cd215da2c7b20f7 WHIRLPOOL 8dcce9a4f4e7e253b418e06add449243cdd841979f18dd595b85d303f626e5705641fd89c738a2e028461cb0088a232ff5a0d5d5ce911c0cf34e74b44feb15dd
+MISC ChangeLog 17336 SHA256 55c060f516c8673ae7b653bea4511c42926ea4dab92afafa7f86b68941a2af43 SHA512 e37bb3861c9b947299b95fb1ea069f15c7a306da22ce87b7ae5ff5cbd0c8e14addc6986bb88729dd9dd5482fd9fa3b56f9ba28f7b94b790f24df60727c797c77 WHIRLPOOL a49cb06bcf19c3ab86c11662f0723862c22edba66f0fbd946a0451f1321e2879add907662ef935fb5f2fd5ff218efea61533ab71a41ffbacc35eea8110344fed
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTzDMuAAoJEPiazRVxLXTFhAAQAMOTPb92zZ0HKCBIzl9AQSMr
-XhdcR6MDwhOSwkaRorzXkEjUJ5G3NLzZ3FZSv3YGqSEcGHv4/cDtNIlwIDzvQNUm
-gtKMfM7aB4FYhDcomW3QWXjNo8ATmdcqCikAyuEDf4UTtcu946RK1i+gGX5glycE
-mpSGTovNVeVHfloGm3R9CrLiqKdSwWfMKhrnyaTWhTx0MFpoZr2jPiVYkqbb3UNE
-BYImHB0kYNkwYte34Tkq7x4J7fv/L1OPeGJSpz1s4Y408UIhTfS4aVMHle7C1PAR
-sFLKwX0Lle4f48Et+mV7uXVTa+B0MbQcB770IPnH7O6XssOkVfhfYvyXwG9+4I6U
-8YA/0AWCzgA2h+qxpWtpYfAmWUZZ6VIYoEK3JeNOC/02WFrjkTUiL66UliUXpSKq
-DeTX1KWa6xdKnRtZtvq9IaX521wn6nIiKtyc9ySl4T/F/LV/VyezEL4sjP+7h0Rt
-FPd90lM3S0Z8R8ltWuSTjXA5ZCA2FxAn9XepqifsHB2kMXREOCbMuwI9AHnVq4XH
-nnzgC9Hh0e7OtZ8R9avzS3GOMbRd6BNS8yJupYJc9vxrr60RNnSYzKS0zYoJZDZk
-DQK9oCTuzP1/6QAvQt+GqSl0YRZXj8u/yPyBZIim7NktK7NZwCxZRLwHKCHqZVJ4
-WRvWEozlyhcqZC1UHjEY
-=5wKT
+iEYEAREIAAYFAlPU1rsACgkQX3X2B8XHTonbdgCcDzHm1H5vkr+M3nhfP0xuDas1
+9ysAnRMTVMJzuGRD3JeUrrIUYtNMwkwq
+=3ZYk
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-2.0.2.ebuild b/dev-vcs/git/git-2.0.2.ebuild
index 33b4b989a225..dab940ba4867 100644
--- a/dev-vcs/git/git-2.0.2.ebuild
+++ b/dev-vcs/git/git-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.1 2014/07/20 21:22:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.2 2014/07/27 10:38:48 grobian Exp $
 
 EAPI=5
 
@@ -325,7 +325,12 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index e9b68030975a..9b57293c0dd1 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.4 2014/07/27 10:38:48 grobian Exp $
 
 EAPI=5
 
@@ -325,7 +325,12 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 49f3bcee7143..e755b27660f9 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.4 2014/07/27 10:38:48 grobian Exp $
 
 EAPI=5
 
@@ -325,7 +325,12 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index de502e90cec2..f3ec8c10fe8d 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.4 2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.5 2014/07/27 10:38:48 grobian Exp $
 
 EAPI=5
 
@@ -325,7 +325,12 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 092cc354b435..119fc90b1eea 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.58 2014/06/24 01:44:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.59 2014/07/27 10:38:48 grobian Exp $
 
 EAPI=5
 
@@ -325,7 +325,12 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi