Update reference fixing for Darwin for newer more strict versions of Portage

Package-Manager: portage-2.2.01.17063-prefix/cvs/Darwin powerpc

4 files changed, 34 insertions, 11 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index e0b56f26d380..df4c96d58c04 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.30 2010/10/24 12:11:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.31 2010/10/24 17:42:05 grobian Exp $
+
+  24 Oct 2010; Fabian Groffen <grobian@gentoo.org> clang-2.8-r2.ebuild,
+  clang-9999.ebuild:
+  Update reference fixing for Darwin for newer more strict versions of
+  Portage
 
   24 Oct 2010; Fabian Groffen <grobian@gentoo.org> clang-2.8-r2.ebuild,
   +files/clang-2.8-darwin-prefix.patch:
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 0b1a6c6b4fee..8aa431963877 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,7 +7,7 @@ DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 0
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 EBUILD clang-2.7-r4.ebuild 5698 RMD160 3696f22da1c248567a23f7d93c074f20e4b18647 SHA1 3d68f473c04054bbed11c4397925f1bbc5fcf0e5 SHA256 ccbb47c31340d22ed2f3e78f162d6e68975107609b2dcee3bf4e61c8f29b5c3b
 EBUILD clang-2.8-r1.ebuild 5557 RMD160 8bfc20e270118f636cc653c6077f57744910a45f SHA1 820b2e58a0858462127481674d434306ce0b9d54 SHA256 21c9c19e4f61c1541112dee465e236390437230d88ef8433e5a8b1d5d30f9871
-EBUILD clang-2.8-r2.ebuild 6307 RMD160 62baa0421668c71c659760738750f9d6cffc878e SHA1 98afea11daf77871d03bd6b2ac8fcfff015ba18d SHA256 a3fc1a8ecee693a981d4899d8bafe4f72d2a38d5a91d87a124d5de0cd7b2203e
-EBUILD clang-9999.ebuild 5344 RMD160 be0a3f8dc4ffb0d8e4a9ac5da2fb54283cadf95f SHA1 c551213b089348cae03a40ec341a99551be46e05 SHA256 3542307d01c6acc54baccd228ce159b36deea9670577ed22a5608ad4f52d28ff
-MISC ChangeLog 5541 RMD160 6eab6fb1f2715dc2f3a0b7d8ce820b6d51c9d241 SHA1 0ade3b2b6272b7d8cc5ecefe02ccde73f28dfabc SHA256 cdad626d80f689feed50d1ac1e05d98f642ea15c9381ff8997d91a4f5427932b
+EBUILD clang-2.8-r2.ebuild 6525 RMD160 9d1ff5b6e038f076e25f96a2827f5e86f67624f2 SHA1 366171c810434a600b737178749c60f53e713773 SHA256 06d99e3e82939d58d0c77369f7e4ec1a12d73f3f08fa34fb26e1bfa9d13f3564
+EBUILD clang-9999.ebuild 5852 RMD160 42477f97bb83b703946fb536ce56dab194e980e5 SHA1 b527f10640d5efcb33471dc4b4dd00afe9517781 SHA256 d45486fd9eb7efba7db4b4a05fe0930076af0b1283b5bab5e9987079262b5fba
+MISC ChangeLog 5716 RMD160 f7d3364a9f157daca2ed22ca65414bee5d0ab1e9 SHA1 9a2e98c22fd621261511e1fa6d77cc53dbf61b49 SHA256 67ae2f7b51d380a8f7cddd2c90f2173a9e2b5181a4c45d554a4d1d93b3fd4b14
 MISC metadata.xml 1360 RMD160 73b894c5108dd5d2d3b49f82353920da7f2adc4c SHA1 6808434002d0109de4ef8f52ad4a9cc4f4a2fbfc SHA256 14c80bf0afbebde4ec5bc2332865762d3dcd98db842cf52fc78617b4889dae38
diff --git a/sys-devel/clang/clang-2.8-r2.ebuild b/sys-devel/clang/clang-2.8-r2.ebuild
index a99a9f7ee4aa..f21b7dbe3656 100644
--- a/sys-devel/clang/clang-2.8-r2.ebuild
+++ b/sys-devel/clang/clang-2.8-r2.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/sys-devel/clang/clang-2.8-r2.ebuild,v 1.2 2010/10/24 12:11:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r2.ebuild,v 1.3 2010/10/24 17:42:05 grobian Exp $
 
 EAPI=3
 
@@ -157,18 +157,22 @@ src_install() {
 	# Fix install_names on Darwin.  The build system is too complicated
 	# to just fix this, so we correct it post-install
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in lib{CIndex,clang}.dylib ; do
+		for lib in libclang.dylib ; do
 			ebegin "fixing install_name of $lib"
 			install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
 				"${ED}"/usr/lib/llvm/${lib}
 			eend $?
 		done
-		for f in c-index-test ; do
-			ebegin "fixing reference to libclang.dylib in $f"
+		for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
+			ebegin "fixing references in ${f##*/}"
 			install_name_tool \
 				-change "@rpath/libclang.dylib" \
 					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
-				"${ED}"/usr/bin/$f
+				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
+				-change "${S}"/Release/lib/libclang.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				"${ED}"/$f
 			eend $?
 		done
 	fi
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 613fed40a296..3e19885d77e5 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.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/sys-devel/clang/clang-9999.ebuild,v 1.10 2010/10/06 09:22:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.11 2010/10/24 17:42:05 grobian Exp $
 
 EAPI=3
 
@@ -143,9 +143,23 @@ src_install() {
 	# Fix install_names on Darwin.  The build system is too complicated
 	# to just fix this, so we correct it post-install
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in libCIndex.dylib ; do
+		for lib in libclang.dylib ; do
+			ebegin "fixing install_name of $lib"
 			install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
 				"${ED}"/usr/lib/llvm/${lib}
+			eend $?
+		done
+		for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
+			ebegin "fixing references in ${f##*/}"
+			install_name_tool \
+				-change "@rpath/libclang.dylib" \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
+				-change "${S}"/Release/lib/libclang.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				"${ED}"/$f
+			eend $?
 		done
 	fi
 }