Don't depend on/try to use chrpath on Darwin, bug #479568

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

4 files changed, 27 insertions, 31 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 40615434b4a9..ede29d78ebc9 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.131 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.132 2013/08/14 19:50:28 grobian Exp $
+
+  14 Aug 2013; Fabian Groffen <grobian@gentoo.org> llvm-3.3-r1.ebuild,
+  llvm-9999.ebuild:
+  Don't depend on/try to use chrpath on Darwin, bug #479568
 
   14 Aug 2013; Michał Górny <mgorny@gentoo.org> llvm-3.2.ebuild,
   llvm-3.3-r1.ebuild, llvm-3.3.ebuild, llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 113b595851cf..9d549cdf521d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -40,27 +40,15 @@ EBUILD llvm-2.9-r2.ebuild 6380 SHA256 e95d4d6c0fefb602a04197b10d31fff3c4ef997ff7
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
 EBUILD llvm-3.2.ebuild 6538 SHA256 7d22b038034d3a9707901c2404f624f1e5c565e9607802c81fbc752942cb1aac SHA512 8a42620796f27f6a3e3dfb9b8cad94b68789dda6db51898eee1dcd6674b8cc246991839b00e00e9e137eac950c708ad94ede174ed1b29d0d8615a023786862d7 WHIRLPOOL e5688f4bae42a695a3e20404667f61589bec0b072d45fb5b72a826d1830f9c84f1d781cc917cfbba8608d86ae2ec52bc8ca041facb3b3f06b00c807d3ce30859
-EBUILD llvm-3.3-r1.ebuild 11793 SHA256 1238af647460c7badd18a3b90db1e2cf548990bb941675743b369ff33aa816a8 SHA512 c12495ab15b7b6f782763dac596a3005dd322bd47dee072db1fe426e67f8ffc3d0dec9bed762bc1404dc1a55bd669cf8ebffe5b5fb92d0dfbbd3a3174a9a14a4 WHIRLPOOL 1ba8bfc1c7b5f508a8a06596250119989d010fbe61faf60f962b54ea6c9e985961de3df0e76e8eec67aa4dce08133d6d7f515aa629d54c7725aa9f6aadf9d4b2
+EBUILD llvm-3.3-r1.ebuild 11864 SHA256 9299ce4d2e300b1062bc9b316030503f3fe922ab58641c57c8d2216da23b1f97 SHA512 6daaa1655836080d40fad17e77fc462aae97e73512b0e84a487761e04659813a435a6a7cdb32543f0e07cfe6b886a9bbcbb532e15cb402e3f8f5aef6c9b7880c WHIRLPOOL 291fdf4889dd4a229303e8797a03208bf0aafbe03815a8507a5bffde900ab052635a8dfea9d963a608fbeb859f7b95eb3c75b545328414757e88577d1592f3a2
 EBUILD llvm-3.3.ebuild 6802 SHA256 56cdaed39025b327fc9bd8e91e6aa16dde6fb45390f1df1e6ff4dd6d55383e3d SHA512 c7d1731b41e215fd7113cbe61c0ab4e83e541fc15fba77d8864bd6a6c160496d0498ebf8f392bc028e777f18dce65fd2fd3dffb96560e50dd9ba5d53a4bcffb7 WHIRLPOOL 8762555cc335970fed27d1c8287acaac33b0c15467fdbcff6d6cced05366c8e6d09dee5bd011d6794db3032c8fda489299a4a12b7c20788933b1eeb5aa26b0f9
-EBUILD llvm-9999.ebuild 10794 SHA256 9b09a7a272993bd8c8726b6692097b34a414a1f61f66a1752f3267283ca04efa SHA512 d61ee997a8e182063533de072d0f25664032d558764ceba72584f1355be0606a0a1a3abae5839699fbf1a231adc2a1bf0d0bad879ef30f6143f277678b33850e WHIRLPOOL 9718e87f35756f5843718d3ff94e216299d1e72f66da103293d6584fa6140448db5a2d6b509392df5484f559396ce8a3c27e824622eb1be54efe0f3b9a0c82c3
-MISC ChangeLog 22115 SHA256 c46806c05a3fb73ce15242b4fd3ec0125871536bebce6b384002047a8bedf98b SHA512 c19f2aea6267925ae3b940ed8a514e5048cf000c741c0851dfa113ce9a12e0aa069fae6502d5ceeaa8240300898411cd4e4c4f084c8552c31f036892c411199f WHIRLPOOL 6e7dd72e59d7144f251cdb900db55a08df5039ba510f7851857c9e266521e04bd7065d047cad99827863fbaabf7c711912126f4b4b06d908feb6eb98fd4c0262
+EBUILD llvm-9999.ebuild 10865 SHA256 b67c63b3699a53de40daea4d7bfe59b930c755459db5b335d6bad595ae318041 SHA512 3fe0b60f9e68ce4d7e394755d44183f8acb18fecfb37d722d6d29bb43ad7e81d1662b22a954d1a78ea3fc25404a69b47014a7c37fdb68dd0572069d7ef324c1d WHIRLPOOL 94aea18b37613a9f7cd8983942ff518ff9cc7f997cb08aaaedc84438d38e77258986136f77db234930f28dfbb784c37b9d40897233ff817025cdeeaefd6eefcb
+MISC ChangeLog 22268 SHA256 b768f77dfaee57077aaa61031d370500e036a595bd685dae19ca4f9ee5557544 SHA512 83fb89896f9e2db779d8e46bd0492b619478a74eebd7109ee24c59e35ce73aeb49296568accade32acaec975911ee566b49f8388ca73dc7b08c6da9f86d22675 WHIRLPOOL e83a6bb91322dad76673b47df4f04dc8309240149892fc5853a9f763cd8ac816df6e69a1f1942258a92b4090d7539d663038a91ea34a53b9f2a17dbb4929ffb6
 MISC metadata.xml 2632 SHA256 2600c9022e42659f3c9201ecc0387455d2b76d70225ba4c9be8420c55fa6ab07 SHA512 43702a59d30b6bbc57d7f33497b3889d3dddf228776e8a79946ca868269451e6fa5666f561ae99fe035851bb305c6e9d3eb5de5955f1cc84bd62d557ad4ec314 WHIRLPOOL 143e68e5f52836d6bc6de79e7c055d7f776e49b17d563bb71e84f37b16f207e0cede39ee6c4b29bc566fc1b102ecd16743e596509fdcf239ffb8bced13b15ac2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.20 (Darwin)
 
-iQJ8BAEBCABmBQJSC39NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDAGgQAKO3tZE59ZVfUrLexqRPG+ey
-rDsCTG73xoKKPtOlzHWE+LBWmzPjVBET6zNxsJ0+apBydXwE66RttpgZnh7mGO1/
-lzFKEsm1GaX4F1n4M4pSArphl77PVlI0PnIZXbHyCyKmQFQ/0OK93PPUf317qqAU
-y0D+6W20AjFUz/2hPP48gCNSsa5MLgvCOp1PyRVbiHwCeMP6jGdXDC5xTybcKH/f
-ThS1tGjD3jkk9rkkIFfQJT8cC8erAjOVjOAXNspn8AfI9Rx/KfP886rcbz0t3mUb
-lX16IN/iqMnW/W1B546RXoEKIQqPuir+qgFvGYaKISszGt/D/znjVifPykzoltSv
-vrJ5Gpj7ma2/NE1FLBHeViifVKrBDaTG5KT6N9KsFvL6Eb4JYLi4AFd/Ntx9v/U9
-rC5QMFbCD6DjOUzTe9AwuWwfVH0wCTJtaA9Az6JAvyDVNN4HWuHi1Dj4sTyA3JXj
-y+pwnkyM87Q5BLSxmdsxpG3aJn8iK4P68RqM3Goac1+A42yhD3vdEzO96LLcCJxM
-Y0924yvdW+5WGJM6hMgzldij1K+7owuWBqSpQnpjfA8iXTJqOpTiKd0ptq89wDeL
-uxfsgDeVQ+bMWxkk68IrFIHO23cltNMFPsjV2Ud5G7/WFBKaxLGU9KLCvnYgz/yR
-8UC8phdjQ/h2sn97qCRu
-=T6qk
+iEYEAREIAAYFAlIL34YACgkQX3X2B8XHTonungCfc/FTfw3a+oXowYn3Xlh9uPwx
+xdUAnirLU0M78exnSvjSBTqEA/1sLJFg
+=oHio
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 18fc086e53b9..0051cd5076aa 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.10 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.11 2013/08/14 19:50:28 grobian Exp $
 
 EAPI=5
 
@@ -19,10 +19,10 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
 LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="clang debug doc gold kernel_FreeBSD +libffi multitarget ocaml python
-	+static-analyzer test udis86 video_cards_radeon"
+IUSE="clang debug doc gold kernel_Darwin kernel_FreeBSD +libffi multitarget
+	ocaml python +static-analyzer test udis86 video_cards_radeon"
 
-DEPEND="app-admin/chrpath
+DEPEND="!kernel_Darwin? ( app-admin/chrpath )
 	dev-lang/perl
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
@@ -296,8 +296,10 @@ multilib_src_install() {
 	emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
 
 	# Fix rpaths.
-	chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
-		"${ED}"/usr/bin/* || die
+	if use !kernel_Darwin ; then
+		chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
+			"${ED}"/usr/bin/* || die
+	fi
 
 	if multilib_is_native_abi; then
 		# Move files back.
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index e4eb2032170c..983ab8c7fa8f 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.49 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.50 2013/08/14 19:50:28 grobian Exp $
 
 EAPI=5
 
@@ -18,9 +18,9 @@ LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="clang debug doc gold +libffi multitarget ocaml python
-	+static-analyzer test udis86 video_cards_radeon"
+	+static-analyzer test udis86 video_cards_radeon kernel_Darwin"
 
-DEPEND="app-admin/chrpath
+DEPEND="!kernel_Darwin? ( app-admin/chrpath )
 	dev-lang/perl
 	dev-python/sphinx
 	>=sys-devel/make-3.79
@@ -273,8 +273,10 @@ multilib_src_install() {
 	emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
 
 	# Fix rpaths.
-	chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
-		"${ED}"/usr/bin/* || die
+	if use !kernel_Darwin ; then
+		chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
+			"${ED}"/usr/bin/* || die
+	fi
 
 	if multilib_is_native_abi; then
 		# Move files back.