fix llvm deps (bug #450786), python dep, remove old

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 26 insertions, 62 deletions

diff --git a/dev-lang/ispc/ChangeLog b/dev-lang/ispc/ChangeLog
index cad70b41dedc..e29e25486144 100644
--- a/dev-lang/ispc/ChangeLog
+++ b/dev-lang/ispc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ispc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ChangeLog,v 1.7 2012/09/10 00:07:30 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ChangeLog,v 1.8 2013/01/08 05:43:51 ottxor Exp $
+
+  08 Jan 2013; Christoph Junghans <ottxor@gentoo.org> -ispc-1.2.2.ebuild,
+  ispc-1.3.0.ebuild:
+  fix llvm deps (bug #450786), python dep, remove old
 
   10 Sep 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml:
   updated metadata.xml
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 5ac920179e45..528241bba279 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -3,19 +3,17 @@ Hash: SHA256
 
 AUX ispc-1.3.0-gcc-4.7.patch 1209 SHA256 87c70281b8f06092d7d81fff99c82ace09851e4b8f72bb87179926630bfc4c27 SHA512 64ca2afa30375e6b8c70928df6e37c6601af71d49c28fe45798f6a1a9e935370bda83abbea628fe5771181d4fcfdbea547655dbdbc72fb7775fad7fafdcd44cd WHIRLPOOL 56fb64b449d8ffa95ec3af40e07d2ac7649a4dfa362adae2aa7ad049f784d6cc4138fa928bcb43fc955bd64166106538c803978a6da303cbad4468b6f9198144
 DIST ispc-1.3.0.tar.gz 18280909 SHA256 6a3595450f3d9e9d790930d76d331435ca13e1aa28bc25d765703086b4a961ad SHA512 ec0c513908cb79c236e2024c64f1da81610286314fefcdcd9a5017cb9c05063154a887337f6a79111d52909ba1f2fbd815fa955a01a0ce309cd9584a50b335f7 WHIRLPOOL cd110b607191414207a55f9a27dba22cf5ab2275311210ede068fb884da685a0b7d7289bfd646cbd7708f199261e7ec38c693d86d54aa62b8a8c9d5fa6f942b5
-DIST ispc-git-1.2.2.tgz 18219664 SHA256 bae7fe36fd29cca70cb5dc21f3ba2e7760e4aeaa11d4490fedca5a7133ef50fd SHA512 c844211eedd0faa649d1c652f2f26d2030f5792334b6f1fd5e718285b233c068728423b17aad1913d51984aba9541085d8d6de4621427f5b6685332a71025d74 WHIRLPOOL 0285af72f47f4d9d27518165bce47f75c075b3454495c94a1a0e53156db8df8e6eeb0522606554c96648caeebcb16cc5f3a7c8c8785f9168234e8f3febe989cb
-EBUILD ispc-1.2.2.ebuild 947 SHA256 b5765ba97b3dd3234d4caa1c35f3afe06eea0f194d6e7b45cf8cf04a4dc52a41 SHA512 dfd8fce8df4f9bbac4c9685022547cbb550967d26dc80ad9fe0394aa2e0158921eb91592eb866b1cba69623055f66f1f0a905548cde4b844b11b9fdfccf7ed08 WHIRLPOOL 7dffd24a1236419145b0465151a6d31519c2b589a53b845ac008278404de67ef35bbcf40ad4487d2333d8777ae79f258b4430bb93ec1f53fad4dd5acbf8dad2f
-EBUILD ispc-1.3.0.ebuild 1056 SHA256 c9820df9f15ebf3f3427fe19fed09d0984ee8b2ab1dcb7772c4a500dd8197c69 SHA512 53b1e265bef75840596eed3dadef29ad40a5a45f77b996efacf39112b558ab1f5fc83afb2ab893185048150b4c543fad1ec11c1723e6b03b06238b6af68c8695 WHIRLPOOL f8102c8ee05f616a801d51089a4091b4419202a72ecf93fb6c7f1a6392d05f6985c551f451de9345df1c52428e1c4986f0d7e2b208dfb9c1bbe0a918721cc1f9
-MISC ChangeLog 986 SHA256 15a12017c1a0c45ec6be557057e7c1424721d0687c48bd07ac47de4626ff715e SHA512 4a1dd8d9cb644eea1c2242644ca3affca02d556d5def0b088306fe79e86b1c057ae83fabbbd6b7fc5f7f9ee64a8bd02ed74ffb44ef5132292fe1b67b466b52fc WHIRLPOOL 23f8f4ddfb350d7c18db7dcb4765ecefb4cd29feb577b36112f6664af8b7bc77c8324d1390f6034154c637996ea240aea9a4172d4c39d46c0b3d36796e2694c4
+EBUILD ispc-1.3.0.ebuild 1185 SHA256 4f993b4de3e574c3c340e1c2c75611a22e856091792d559d140d40d36c561de0 SHA512 aee936336dfb01b752efff543511c6cf2b4084712599bd01840ce8ab84cefa07674e48e1df8f20da18714d822cd9502b2a455758bc0a45c6b44ac88a59cf7966 WHIRLPOOL c34ab81872a84b0b285d3d7ae9e3be42142baf1acdba2a95952a2a6ffe90e715a0108d49d9cb9ec26dfb156b614b5947c2c8dade9895460d6ccbad2cbd701fd5
+MISC ChangeLog 1136 SHA256 cdb9132e20e399d40f903c6926ebce979182fad0b6015afa3765a5acb301e6a8 SHA512 aff0deab1190ec676483bf60bb62b479e6f343b9436558c9edaad5f9e5d21438d5d2cf03c0b5c41c4f38c5361f7dbae98f6e1243b6ee271149c062cde41b2baf WHIRLPOOL 9dc1b2e39cf31b105c220588d5a46f185d4ee0687155eb1c94e91c37d1249d6eabb175a8ae4396c29d0a774cc1eddfdae657b525808ba77463713f6e9e4f7a1a
 MISC metadata.xml 311 SHA256 0ee366f654431d07c84e13eb23f9676baedf81eb4e850b62da025f167152ad83 SHA512 412013eef341b6189e22fb25f12db1a2d6101d549579ddd882744b695f2777b03af58383a781963bf58ee184c3d6bcbc7b7235cc95cce8939ee0ee935b4e7c8c WHIRLPOOL 6aea4850b0860d715967cdcf06986510360626905507352d53525662043cc7ac89b9be2ecd76de3d7201fdfb86009c856af29d7d690e44fe7701f3b11310be67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQTS9HAAoJEOeBhlrCAAWGMioH/iFrFrDfvK37GZohhysSwQGk
-Oc3qKiWqE3QMjV8NL2RHyaPsKf9QiQeBwpR19prOQt204tgshSsBdfq5oldG3wEx
-U04Meudf3PVkSITbLJ/49Ox8/jN5hiiSkuADMqWR6EZ+dMPGcSmI+ORh2LZJr+IO
-7XeU3MY7HYw/PVGoTNX252Vjf6lz+4hodHvqtH2VAxioAth+ZFeilA6MPW0ARNS2
-bxIU9mdIJD6j33xyD0VTp872GyQS2DVMWd/7yBL3rzz3l/SNK6Kf1GPpaQE7chCu
-UjVZyEFIv2ajrgcyrdz5NRqly044VUDvzKTWaUijK5jNiRg+uPFqs7kNxxSlfZk=
-=WcyN
+iQEcBAEBCAAGBQJQ67IgAAoJEOeBhlrCAAWGh4sIAKdmiuugU5Ww1B4QADdFz4Er
+wieaxPfVS5Z6px8GTUyb+5y7RKyOaSOgIQQF8ltbP2bptp7LGef/iJZz3ca7vqbC
++YqfjcEbHauzZccLoBYaQy0dX9sh562swCjrN5cgw3iZeUtW+lStGu4NgSYht5N/
+A6wTl2hwZNAaof6J/8V7E8vJ5aHm162MBzC588u1Jrax1wFRvxqHNf/jAxB07yZd
+EGIL2BetxaKY/lxHfhB94fh7HT8L18MWdL4oiLy1Z0DXmgLSQ4pCRSQBin/r+WX2
+vOKDwvmv8bxs7o/uIGe7oG73jUmY3hBm00sB/X8KDSZcDfRVnQ26XELvWfhR9Dk=
+=CGNR
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ispc/ispc-1.2.2.ebuild b/dev-lang/ispc/ispc-1.2.2.ebuild
deleted file mode 100644
index 456c1ed8a4dc..000000000000
--- a/dev-lang/ispc/ispc-1.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ispc-1.2.2.ebuild,v 1.3 2012/06/19 12:22:33 ago Exp $
-
-EAPI=4
-GITHUB_ID="2c75ac1"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="http://ispc.github.com/"
-SRC_URI="https://github.com/ispc/ispc/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${PN}-${PN}-${GITHUB_ID}"
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	=sys-devel/clang-3.0*
-	=sys-devel/llvm-3.0*
-	"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	"
-
-DOCS=( README.rst )
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
-	dobin ispc
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
diff --git a/dev-lang/ispc/ispc-1.3.0.ebuild b/dev-lang/ispc/ispc-1.3.0.ebuild
index 9f89f175f418..cb1f11e974ea 100644
--- a/dev-lang/ispc/ispc-1.3.0.ebuild
+++ b/dev-lang/ispc/ispc-1.3.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ispc-1.3.0.ebuild,v 1.3 2012/08/26 18:41:28 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ispc-1.3.0.ebuild,v 1.4 2013/01/08 05:43:51 ottxor Exp $
 
 EAPI=4
 
-inherit base toolchain-funcs
+PYTHON_DEPEND="2"
+
+inherit base toolchain-funcs python
 
 DESCRIPTION="Intel SPMD Program Compiler"
 HOMEPAGE="http://ispc.github.com/"
@@ -24,8 +26,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
-	>=sys-devel/clang-3.0
-	>=sys-devel/llvm-3.0
+	|| ( =sys-devel/clang-3.0* =sys-devel/clang-3.1* )
+	|| ( =sys-devel/llvm-3.0* =sys-devel/llvm-3.1* )
 	"
 DEPEND="
 	${RDEPEND}
@@ -33,6 +35,10 @@ DEPEND="
 	sys-devel/flex
 	"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_compile() {
 	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
 }