Version bump. Moved slot from 2.1 to 2. Now uses alternatives eclass to simple selection to prepare for tbb-3

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 44 insertions, 28 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index c3a078428e1f..1c6e3dafe006 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/tbb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.1 2009/03/14 12:14:12 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.2 2010/04/20 17:37:14 bicatali Exp $
+
+*tbb-2.2.013 (20 Apr 2010)
+
+  20 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> -tbb-2.1.015.ebuild,
+  +tbb-2.2.013.ebuild:
+  Version bump. Moved slot from 2.1 to 2. Now uses alternatives eclass to
+  simple selection to prepare for tbb-3
 
 *tbb-2.1.015 (14 Mar 2009)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index e1c59a1b8fca..a774f8048330 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST tbb21_015oss_src.tgz 1179840 RMD160 a372678bdc862a299363c9e1054648cb1a1a9f26 SHA1 c8b925adf506cd370ca2d1a29ade9c8089129e4d SHA256 d32d2f3774a86d0fa4638aa098aef32dccf662a01d7f78a713167f239744d1ed
-EBUILD tbb-2.1.015.ebuild 2207 RMD160 4c7f6251f9ca6dfea1dafec13f0d5f5ee3e7015c SHA1 d13590985b61d3006d45256a69e8c7a14a911851 SHA256 5624cc4a72966088ccdf282330ba6a6f50f89ece9746ce49880a968cffe1a1e9
-MISC ChangeLog 432 RMD160 a3e4c400fee563295a0819266ea35b496ac1843c SHA1 fac5339e9d6d551f1aae1377074d006dd889076c SHA256 0dcde8af460e180b0710e4e6cc6445140ae2bdc3a174c3ce5228a170057f055f
+DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
+EBUILD tbb-2.2.013.ebuild 2314 RMD160 aba54f6a8a6a5a93884b86a6aeb8bc0c4a0d3f11 SHA1 5d2612d24e4fdcd5f40e6c13a61796164098ea04 SHA256 efa0c1297f16f16035957577cb877d6575f0b45b4773d566f5c9cf996d42467c
+MISC ChangeLog 674 RMD160 1245d91ee203ee52ea0f5f787fabded8055f5593 SHA1 18b1be25d94a9256b940a4501f7c29000d8bc5b4 SHA256 c7aa1ad139d1416084b1687b5214a66e9c9e6e36d10e6f0f78bc0e271715c17b
 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkm7n50ACgkQ1ycZbhPLE2BtEACeIFKXaVshk+lt4WugaK4/Mdrp
-7UYAn13uhRNRp5EdHEg9mFcxQXgTTs/H
-=2UhJ
+iEYEARECAAYFAkvN8V4ACgkQ1ycZbhPLE2Dw3QCeOMxBGAC2j/pBmJFIr8emkkfI
+JA0An0fIvkvbMI94bIUOYeQiHrZmjEEA
+=RHoG
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-2.1.015.ebuild b/dev-cpp/tbb/tbb-2.2.013.ebuild
index fcb2f2078316..a514752bed0a 100644
--- a/dev-cpp/tbb/tbb-2.1.015.ebuild
+++ b/dev-cpp/tbb/tbb-2.2.013.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-2.1.015.ebuild,v 1.1 2009/03/14 12:14:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-2.2.013.ebuild,v 1.1 2010/04/20 17:37:14 bicatali Exp $
 
 EAPI=2
-inherit eutils versionator toolchain-funcs
+inherit eutils versionator toolchain-funcs alternatives
 #  url number
-MYU="78/135"
+MYU="78/147"
 # release update
 MYR="3"
 
@@ -18,12 +18,13 @@ DESCRIPTION="High level abstract threading library"
 HOMEPAGE="http://www.threadingbuildingblocks.org/"
 SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}%20update%20${MYR}/${MYP}_src.tgz"
 LICENSE="GPL-2-with-exceptions"
-SLOT="${PV1}.${PV2}"
+
+SLOT="${PV1}"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc examples"
 
-DEPEND=""
-RDEPEND=""
+DEPEND="!<=dev-cpp/tbb-2.1.016"
+RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
@@ -57,20 +58,12 @@ src_test() {
 }
 
 src_install(){
-	insinto /usr/$(get_libdir)/${PN}-${SLOT}
-	insopts -m0755
-	for l in $(find build -name lib\*.so.\*); do
-		doins ${l}
-		# to fix when we have eselect stuff
-		local bl=$(basename ${l})
-		dosym ${PN}-${SLOT}/${bl} /usr/$(get_libdir)/${bl}
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-	insopts -m0644
-	dodoc README CHANGES doc/Release_Notes.txt
+	dolib.so $(find build -name lib\*.so.\*) || die
 	insinto /usr/include/${PN}-${SLOT}
-	dosym ${PN}-${SLOT} /usr/include/${PN}
+	insopts -m0644
 	doins -r include/tbb/* || die
+
+	dodoc README CHANGES doc/Release_Notes.txt
 	if use doc ; then
 		insinto /usr/share/doc/${PF}
 		doins -r doc/html || die
@@ -82,3 +75,19 @@ src_install(){
 		doins -r examples || die
 	fi
 }
+
+tbb_alternatives() {
+	for l in "${ROOT}"usr/$(get_libdir)/libtbb*.so.*; do
+		l=$(basename ${l}%.*)
+		alternatives_auto_makesym "/usr/$(get_libdir)/${l}" "/usr/$(get_libdir)/${l}.[0-9]"
+	done
+	alternatives_auto_makesym "/usr/include/${PN}" "/usr/include/${PN}-[0-9]"
+}
+
+pkg_postinst() {
+	tbb_alternatives
+}
+
+pkg_postrm() {
+	tbb_alternatives
+}