Make scan-build utility Prefix-compatible, by Lionel Orry, bug #352809

Package-Manager: portage-2.2.01.17689-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

5 files changed, 19 insertions, 15 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 062bb62a91ae..0fee63e111e4 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2010/12/19 22:45:55 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.33 2011/01/26 17:48:41 grobian Exp $
+
+  26 Jan 2011; Fabian Groffen <grobian@gentoo.org> clang-2.7-r4.ebuild,
+  clang-2.8-r3.ebuild, clang-9999.ebuild:
+  Make scan-build utility Prefix-compatible, by Lionel Orry, bug #352809
 
 *clang-2.8-r3 (19 Dec 2010)
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 007c2c3905f7..cfafa6b621cc 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,8 +7,8 @@ DIST clang-2.7.tgz 4953739 RMD160 177fdcf59be4a60c37cf0dfb058535c9cdbbad4e SHA1
 DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1 94977c84ce136307dbbeade95e67bfe3c25161ff SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
 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-r3.ebuild 6683 RMD160 5461e67eb03ea9c3a1323db9da8b8a9e526e2985 SHA1 703c48d7470ef4504003a9c45d78d10870b6b21f SHA256 86c126de86c7d539f846926779cc134f4e9bac0199e1c30714413a3fad95d023
-EBUILD clang-9999.ebuild 5852 RMD160 42477f97bb83b703946fb536ce56dab194e980e5 SHA1 b527f10640d5efcb33471dc4b4dd00afe9517781 SHA256 d45486fd9eb7efba7db4b4a05fe0930076af0b1283b5bab5e9987079262b5fba
-MISC ChangeLog 6115 RMD160 33567151f4e12d317bbdfe2a77050c6f6a71fff2 SHA1 a6f9e687490fe3a32c5269586070f8c2f92eea1f SHA256 45babd25d9d9329770870851ce457e07fd0ca43c1f4b1adb557691748eaa182d
+EBUILD clang-2.7-r4.ebuild 5707 RMD160 310d0efcb784418e4e90478812f4aade43f5367f SHA1 e9089d06a31165abe69c447446214363b3a8b7d8 SHA256 a766c3be81b017e2a3377c789c8f5a403f164bcbe6ce0a00addc0bd1d50db486
+EBUILD clang-2.8-r3.ebuild 6692 RMD160 b3aa159afcef791ede4a49ac92b9633fd4aa1230 SHA1 4e20d7c5a1fe69d06662eb04b782bbb3f88aed63 SHA256 fd3943608f0ef2841d7d040f7b4a0759566627fe72296f0561c64c00a9eb888d
+EBUILD clang-9999.ebuild 5862 RMD160 7f5850651f443ec5097770bcb546645047598ebf SHA1 53a0e815590a09144b00e4d1181710263f7b579a SHA256 63de56fa05b70424f2245936c46361061bf6a0dfd6f39e099919acb4a6b292b9
+MISC ChangeLog 6302 RMD160 6267c9bf831a55732956e8df3533726a5f4288b1 SHA1 0d3509612773179318ead50d88bdce9507baca22 SHA256 7931ab32f9239f283195252b4116dd4a9cacab635554b9139008586bee6f636b
 MISC metadata.xml 1360 RMD160 73b894c5108dd5d2d3b49f82353920da7f2adc4c SHA1 6808434002d0109de4ef8f52ad4a9cc4f4a2fbfc SHA256 14c80bf0afbebde4ec5bc2332865762d3dcd98db842cf52fc78617b4889dae38
diff --git a/sys-devel/clang/clang-2.7-r4.ebuild b/sys-devel/clang/clang-2.7-r4.ebuild
index a30467b1cabb..cb9906f0b380 100644
--- a/sys-devel/clang/clang-2.7-r4.ebuild
+++ b/sys-devel/clang/clang-2.7-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r4.ebuild,v 1.1 2010/09/21 16:14:35 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r4.ebuild,v 1.2 2011/01/26 17:48:41 grobian Exp $
 
 EAPI=3
 
@@ -48,7 +48,7 @@ src_prepare() {
 	sed -e 's/import ScanView/from clang \0/'  \
 		-i tools/clang/tools/scan-view/scan-view \
 		|| die "scan-view sed failed"
-	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#/usr/share/${PN}#" \
+	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
 		-i tools/clang/tools/scan-build/scan-build \
 		|| die "scan-build sed failed"
 	# Specify python version
diff --git a/sys-devel/clang/clang-2.8-r3.ebuild b/sys-devel/clang/clang-2.8-r3.ebuild
index 078e64b38fdf..197386d3d677 100644
--- a/sys-devel/clang/clang-2.8-r3.ebuild
+++ b/sys-devel/clang/clang-2.8-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r3.ebuild,v 1.1 2010/12/19 22:45:55 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r3.ebuild,v 1.2 2011/01/26 17:48:41 grobian Exp $
 
 EAPI=3
 
@@ -54,7 +54,7 @@ src_prepare() {
 	sed -e 's/import ScanView/from clang \0/'  \
 		-i tools/clang/tools/scan-view/scan-view \
 		|| die "scan-view sed failed"
-	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#/usr/share/${PN}#" \
+	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
 		-i tools/clang/tools/scan-build/scan-build \
 		|| die "scan-build sed failed"
 	# Specify python version
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 3e19885d77e5..a3db73f175d0 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.11 2010/10/24 17:42:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.12 2011/01/26 17:48:41 grobian Exp $
 
 EAPI=3
 
@@ -43,7 +43,7 @@ src_prepare() {
 	sed -e 's/import ScanView/from clang \0/'  \
 		-i tools/clang/tools/scan-view/scan-view \
 		|| die "scan-view sed failed"
-	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#/usr/share/${PN}#" \
+	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
 		-i tools/clang/tools/scan-build/scan-build \
 		|| die "scan-build sed failed"
 	# Specify python version