[gentoo-commits] gentoo-x86 commit in sys-devel/llvm: ChangeLog llvm-3.0-r1.ebuild llvm-9999.ebuild

[gentoo-commits] gentoo-x86 commit in sys-devel/llvm: ChangeLog llvm-3.0-r1.ebuild llvm-9999.ebuild

[Bernard Cafarelli (voyageur)]

voyageur    12/03/13 15:37:28

  Modified:             ChangeLog llvm-3.0-r1.ebuild llvm-9999.ebuild
  Log:
  Tests require python-2, spotted by patrick, bug #407885
  
  (Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

Revision  Changes    Path
1.64                 sys-devel/llvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	6 Mar 2012 09:11:26 -0000	1.63
+++ ChangeLog	13 Mar 2012 15:37:28 -0000	1.64
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.63 2012/03/06 09:11:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.64 2012/03/13 15:37:28 voyageur Exp $
+
+  13 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0-r1.ebuild,
+  llvm-9999.ebuild:
+  Tests require python-2, spotted by patrick, bug #407885
 
   06 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
   Set python-2 to build, thanks Matthias Dahl in bug #406155 for report and



1.2                  sys-devel/llvm/llvm-3.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild?r1=1.1&r2=1.2

Index: llvm-3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- llvm-3.0-r1.ebuild	3 Feb 2012 13:11:42 -0000	1.1
+++ llvm-3.0-r1.ebuild	13 Mar 2012 15:37:28 -0000	1.2
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild,v 1.1 2012/02/03 13:11:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild,v 1.2 2012/03/13 15:37:28 voyageur Exp $
 
 EAPI="3"
-inherit eutils flag-o-matic multilib toolchain-funcs
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic multilib toolchain-funcs python
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -33,6 +34,10 @@
 S=${WORKDIR}/${P}.src
 
 pkg_setup() {
+	# Required for test and build
+	python_set_active_version 2
+	python_pkg_setup
+
 	# need to check if the active compiler is ok
 
 	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
@@ -82,6 +87,9 @@
 		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 
+	# Specify python version
+	python_convert_shebangs -r 2 test/Scripts
+
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
 	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
 	epatch "${FILESDIR}"/${P}-ocaml_install.patch



1.22                 sys-devel/llvm/llvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.21&r2=1.22

Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- llvm-9999.ebuild	6 Mar 2012 09:11:26 -0000	1.21
+++ llvm-9999.ebuild	13 Mar 2012 15:37:28 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.21 2012/03/06 09:11:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.22 2012/03/13 15:37:28 voyageur Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -33,7 +33,7 @@
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
 pkg_setup() {
-	# llvm strictly requires python-2 for building
+	# Required for test and build
 	python_set_active_version 2
 	python_pkg_setup
 
@@ -90,6 +90,9 @@
 			-i tools/gold/Makefile || die "gold rpath sed failed"
 	fi
 
+	# Specify python version
+	python_convert_shebangs -r 2 test/Scripts
+
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
 	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
 	epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch