Bump to EAPI=3, make Prefix aware, add support for Darwin platforms, bug #333387

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

5 files changed, 43 insertions, 20 deletions

diff --git a/sys-devel/llvm-gcc/Manifest b/sys-devel/llvm-gcc/Manifest
index 011b8a737f49..440fcf5b6e72 100644
--- a/sys-devel/llvm-gcc/Manifest
+++ b/sys-devel/llvm-gcc/Manifest
@@ -2,8 +2,8 @@ AUX gcc-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfee
 DIST llvm-gcc-4.2-2.6.source.tar.gz 48364917 RMD160 08d7ffadb88e3abdcc971372f737e4ddf8f991c6 SHA1 60670d550be09a57d315efa259d2b19955f6fa79 SHA256 5be01f0ed0787c33239ab27b93884e48b544a1be97b944c7a5d29e85fbab495d
 DIST llvm-gcc-4.2-2.7.source.tgz 55699337 RMD160 523edd94ece00caaaa3ff2399f3c0b044b50f432 SHA1 aaf466efa41e95014d51a2f8a60ad3b7771c1829 SHA256 1ccbcef5fe6613392e24f21fd23a9ed2692827c13f8d85c26b3bdcd1b3b5047a
 EBUILD llvm-gcc-2.6.ebuild 2019 RMD160 d613455439fe1bba7cc12b2d36473bf83b28978f SHA1 fdac8e473cbce552efa6c6fd0c81116f2944da76 SHA256 8b650918956ee6c4f9ef869342fcf47ca5f314f334438a3060bb7437d7ad5ab5
-EBUILD llvm-gcc-2.7-r1.ebuild 3549 RMD160 8f271cda1200640526c92104f6f2bb89824e9241 SHA1 5a8e3688d9f88763d2130d66fbecb6aaa83b3eba SHA256 b3631854953101ff5b0934aa42c507fd14516c70406715ee7074b356cb51af66
+EBUILD llvm-gcc-2.7-r1.ebuild 4033 RMD160 5f25b0a77dedd5ed49e18d3a79e0c0006749bf84 SHA1 827bbbc4c06b4c34d6018b61c35734cdf6171a4b SHA256 162a67a7ff238ccf7895a5f8f8b70f04f3d62954014b34b4bf8f1906c37c43cb
 EBUILD llvm-gcc-2.7.ebuild 2018 RMD160 c36660533b53fae7f64eb5d16c742c1a8626ca75 SHA1 be69e5c41844481919467aacbf0d8474c97400c3 SHA256 8a4b589e0660a15c235cf3fbdd919ff53cd97237f6035f18cad357bdd3feac49
-EBUILD llvm-gcc-9999.ebuild 3515 RMD160 7fa3621bacf956834b3ba6431acea1fa102777b0 SHA1 cf618403b0326d6bb64449124767314f2cf43afb SHA256 d42194098f5bd2f8ca0a08630a13715f63aa2edc89f87fa30ff43567b8fdf409
-MISC ChangeLog 1497 RMD160 5a55662d07709adf54d91f7bad63812789a89049 SHA1 d27f9a5190a07200ddf5448accf23794a24147d8 SHA256 e09fcbb0f0fc852d1f9851894c91b079598326c9d068c2a19ebdd78e9165ebfd
+EBUILD llvm-gcc-9999.ebuild 3988 RMD160 a992a4eb5d44eb6bb2b9222fe35a89a9eca47a50 SHA1 43d322944696bfd89c9a15f23d8ebe01171f8617 SHA256 11ab00337dd97dc2688cf9ade88b384edce7dd3cdc4f713b03f7a50f98062d26
+MISC ChangeLog 1681 RMD160 9a36072e71466849f39f8c054e8e9dc700b06c1e SHA1 82c396393e5bd23909fae25082727e76ed42c70c SHA256 8dd51cf75f871a67be1cc101d3a2fb3b4c69414764ed6181003ef87f9adc8d14
 MISC metadata.xml 1210 RMD160 452adfc54714ef433d1029368d731d2ba232443a SHA1 00c2795c89050749d088beb5202877fa6bf7a01d SHA256 9d192d1f60fc67d6bee5d6669fe84adc94a097d42f70a6f20e4f708d094b5d7c
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index a79ef056dc36..4864232c7237 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.15 2010/07/20 09:25:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.16 2010/08/26 07:00:53 grobian Exp $
+
+  26 Aug 2010; Fabian Groffen <grobian@gentoo.org> llvm-2.7.ebuild,
+  llvm-9999.ebuild:
+  Bump to EAPI=3, make Prefix aware, add support for Darwin platforms,
+  bug #333387
 
   20 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.6-r2.ebuild,
   -files/llvm-2.6-cflags.patch:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index c5fd77869b48..2c9cadb36604 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -2,7 +2,7 @@ AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b
 AUX llvm-2.6-nodoctargz.patch 1602 RMD160 b4de7f5e68386bd9dab44a6d7addae0eb9d7f958 SHA1 5a2faf5d9c52f1eb1f1eac3aa69b6d0499c093a4 SHA256 503d31616ca7c76f6da1cd46d6e7c54241effbd11652ab568759350f0c21e473
 AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
-EBUILD llvm-2.7.ebuild 4706 RMD160 28ea3e6abb51a300a288d81a8772b5dd8e2f8f53 SHA1 49645580b4694a90f96f96e0c077a6af06caf51b SHA256 120620ada632a854a93bfac82e594aa0a92a43340cd88343d7ebad7272f4c48a
-EBUILD llvm-9999.ebuild 4723 RMD160 3b2308169b51229a2f2fa2b1a51ce9821e293e9d SHA1 f939243baf992525f8e317cd256fc586cbd4e320 SHA256 62b834e986820b7de3d3f7b69b1440d0060bb91a38732a184010aa82e0f08539
-MISC ChangeLog 2736 RMD160 be916bf780a9982dbeab96ab1abf940b54a06cb8 SHA1 0a2c0b5ac3dc8f2572b4f5526c84bcdcfb956f1c SHA256 6c5c8de750342fa858c1bbf1032d87195ba65fd31f5f786e23decbeee6678ace
+EBUILD llvm-2.7.ebuild 5114 RMD160 f3b39dd7114f4e68862c2517d960aff7cb60c332 SHA1 16f2848a7a53c0ff10d6d737ee9f51831290ba04 SHA256 8c98b61d5c751537c1608026390e35b77e98f7540bb7aa6a91101195263e288a
+EBUILD llvm-9999.ebuild 5120 RMD160 046acfce51475db58915c03beda6a49ba5a9c486 SHA1 6b79d5d423888b224958adf4b1ceb31ae7740599 SHA256 bc21212c94f77b50906cc56abc11f8a0f8f539f7876fe73bb76eec587ceb663d
+MISC ChangeLog 2909 RMD160 b12efb9ef3251a98ac94d77a1aa397b1956e5a6a SHA1 8ed4d0b6bde9253f4959a049fa39f35e3b208d2f SHA256 4b81056c1642b1f332b5b03088413ed65c87acfeadb1a7455257847afc976fea
 MISC metadata.xml 2384 RMD160 9e29d256ab1d3d7cc23fe25d170a1716b6e35dba SHA1 db599887234c1013a7849be3e1b6bd399c716598 SHA256 44f73ce01ca8dc1d2fea546bb70550d6324ed893a224a6db8e55fd932b3a10f8
diff --git a/sys-devel/llvm/llvm-2.7.ebuild b/sys-devel/llvm/llvm-2.7.ebuild
index de372c52edfe..4566c5b435b2 100644
--- a/sys-devel/llvm/llvm-2.7.ebuild
+++ b/sys-devel/llvm/llvm-2.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild,v 1.2 2010/06/01 19:29:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild,v 1.3 2010/08/26 07:00:53 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -11,7 +11,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
 IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86"
 
 DEPEND="dev-lang/perl
@@ -20,8 +20,8 @@ DEPEND="dev-lang/perl
 	>=sys-devel/bison-1.28
 	!~sys-devel/bison-1.85
 	!~sys-devel/bison-1.875
-	>=sys-devel/gcc-3.0
-	>=sys-devel/binutils-2.18
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.1.2 )
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
 	libffi? ( virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
 	test? ( dev-util/dejagnu )
@@ -69,7 +69,7 @@ src_prepare() {
 	# care of this.
 	einfo "Fixing install dirs"
 	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
 		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
@@ -110,7 +110,7 @@ src_configure() {
 	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
 	if use llvm-gcc ; then
 		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${ROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
+			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
 			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
 			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
 				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
@@ -149,4 +149,13 @@ src_compile() {
 
 src_install() {
 	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+	
+	# 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{LLVMHello,LTO,profile_rt}.dylib ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/${lib} \
+				"${ED}"/usr/lib/${lib}
+		done
+	fi
 }
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 29f69397dfdd..e33f04435807 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 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.1 2010/06/01 21:25:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.2 2010/08/26 07:00:53 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 inherit subversion eutils multilib toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
@@ -21,8 +21,8 @@ DEPEND="dev-lang/perl
 	>=sys-devel/bison-1.28
 	!~sys-devel/bison-1.85
 	!~sys-devel/bison-1.875
-	>=sys-devel/gcc-3.0
-	>=sys-devel/binutils-2.18
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.1.2 )
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
 	libffi? ( virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
 	test? ( dev-util/dejagnu )
@@ -70,7 +70,7 @@ src_prepare() {
 	# care of this.
 	einfo "Fixing install dirs"
 	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
 		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
@@ -111,7 +111,7 @@ src_configure() {
 	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
 	if use llvm-gcc ; then
 		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${ROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
+			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
 			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
 			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
 				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
@@ -150,4 +150,13 @@ src_compile() {
 
 src_install() {
 	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+	
+	# 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{LLVMHello,LTO,profile_rt}.dylib ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/${lib} \
+				"${ED}"/usr/lib/${lib}
+		done
+	fi
 }