Fix build on Darwin 10 systems with Xcode 4.0, bug #362891

Package-Manager: portage-2.2.01.18091-prefix/cvs/SunOS i386

3 files changed, 15 insertions, 24 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 8670d5e1f599..8711e2763dbf 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.42 2011/04/04 06:54:39 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.43 2011/04/15 08:19:45 grobian Exp $
+
+  15 Apr 2011; Fabian Groffen <grobian@gentoo.org> mercurial-1.8.2.ebuild:
+  Fix build on Darwin 10 systems with Xcode 4.0, bug #362891
 
 *mercurial-1.8.2 (04 Apr 2011)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 73dd354dcd4c..81e6d9dbaf43 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-1.7.5.tar.gz 2486207 RMD160 83b3d68d2d68419f81da8aa63085206646141dae SHA1 3b2dad1415e8bde00d2248b7d8c4255e9f0d79aa SHA256 dfadcf883d30a923c7164ed0f3b8ee72e63030627668707f954dd12d8a4d0491
 DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
@@ -8,25 +5,8 @@ DIST mercurial-1.8.2.tar.gz 2547027 RMD160 6a18f5e56928e1fbea7ac1821bdde77066f5c
 DIST mercurial-1.8.tar.gz 2528310 RMD160 ed428f767c624e935173487c110515f66a6b2c9a SHA1 51e335638996e614c8a1c251d4cadb9524ed9ad0 SHA256 421d19151f754d8452b5cf0817e0bbac2f74d93a4f76f9de41fc7a7f33c5db93
 EBUILD mercurial-1.7.5.ebuild 3582 RMD160 716f0696b5bd01366c06ba768eb58fc444fbd13d SHA1 85bf12abd853d329ef405694e7d91feb7eef5807 SHA256 985324180629a83c64dfad7202d0d993b3d7f0d6ebf92eea70602027e301f093
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
-EBUILD mercurial-1.8.2.ebuild 3582 RMD160 a975d3a372c40373e39ebe6034c572d11ce16e78 SHA1 01b896acca939155420b81a6ba425d32f7f85bb1 SHA256 098ea7cf05d42e2fd0cf3fc540d6b7eec9d8879d6be6af0c08f8047c62465cc3
+EBUILD mercurial-1.8.2.ebuild 3787 RMD160 d7ab33ab28cded270105b8c70b70b0d8c8e8a1b2 SHA1 351b712524575bd52a998c3440337098820110da SHA256 a592c6490454c68adbe093fac902dd7ef45711199ecf24950274fed614945ebe
 EBUILD mercurial-1.8.ebuild 3580 RMD160 4aef4db5d053a8570d5f6e3678cde91effd9fd97 SHA1 f3be66c0477f5a304f4755a6f66b080f8e5ce330 SHA256 f31a08147b435632b2db9faa7c6fb8fe3f97986631a35a4127a21186560af059
 EBUILD mercurial-9999.ebuild 3426 RMD160 91f6483efac5eae0d216212c8c9c7805138bf603 SHA1 dc24d5db8e80f75f5680599ff9c9b889cee68d43 SHA256 3861ce259f51eeac801e1e49ff22eb6a422efa82d6ae890e7e903188e60a8239
-MISC ChangeLog 23960 RMD160 aacd93cf19d08c48f954c59567727aaffb94623c SHA1 71c8fcce0cc8ebc97b7b9972eee27d0e1025ec54 SHA256 7b830d06993be8163adcd3419c6086cda05010a0862b23f6ffa3d7d504c5249a
+MISC ChangeLog 24101 RMD160 df1bb1a57e771455e05426431734b70b2962b85e SHA1 05967458b67b935a28b1e47c250b074ccc6ab7f1 SHA256 b5ef1e8c4ee9998859922bb3a112d88c87ee1f3728ab2269bd05352b76f2765a
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNnMJpAAoJENgZr6v6gHY0wNAQAIgUM3+9fdZBl7AqF9fgjFQU
-iQIMLQV7V+jl36APFPeXKcAzpZZydYDxzUXg2yWNhS7GdByRqw6d0QsUXbF7G5o7
-n+v/ZUFMVd9BTsG8FB9LjdA2zT6mCBZeP14mzxmsrqZs1szT52SeUjZDY3SkNMRp
-99Pfo9FM3w30cNNbU4oog3hVifCevj8xhDc2wleZxBrrlCOgDzHBoHDB5lrHpR67
-Jr80fHEfdYnd2Drj9fEbrYRttiUabie+23dPih8lHnYHLwfQwQ/Aj8ptwtw/mygi
-QcXfq4KhYshL0P1j/+HiJJi768nJZBEeGfNIvmQWCCPbqRxZnesz35ZjMhXNPNgu
-NJyZyAebv2gfh8f6xCvz6vARIDDjlpu8m7pXhS4NoaBBfvVHTkhBAqdPw0906yYt
-cckzOBjJn3c0Duut41LuYU0gjiddRtHbffkmPhaZB9uSZ43Ylu+yCX0cMxIVNgWT
-IHgxWdQzaRWqjAlGoWbTVQgpAZCHNiwY7/9qS2nAsRQO8WpxjN/kKNrrKOdkRucm
-50bB3MVY3NwzE/OH29QeewDEMAyL42iFxWWFd6M5zvKU+IlNT9Uz//lsiHLLL9EZ
-gpN8NfZc5FRYt5qGs+wSs5+DwA9DHf47TTE1JnGAoj1jsKtQC9BIh8qWYnNerkRZ
-buSrgFPOh95kcEPuXYE7
-=4aYM
------END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-1.8.2.ebuild b/dev-vcs/mercurial/mercurial-1.8.2.ebuild
index c4444c1c80cc..410be5fe3eab 100644
--- a/dev-vcs/mercurial/mercurial-1.8.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.8.2.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/mercurial/mercurial-1.8.2.ebuild,v 1.1 2011/04/04 06:54:39 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.8.2.ebuild,v 1.2 2011/04/15 08:19:45 grobian Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -35,6 +35,14 @@ PYTHON_CFLAGS=(
 PYTHON_MODNAME="${PN} hgext"
 SITEFILE="70${PN}-gentoo.el"
 
+src_prepare() {
+	distutils_src_prepare
+
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+}
+
 src_compile() {
 	distutils_src_compile