Removed all slot stuff (useless) and version bump for stable

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

4 files changed, 104 insertions, 28 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 1c6e3dafe006..1401637e1b05 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/tbb
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.3 2010/04/20 20:35:04 bicatali Exp $
+
+*tbb-3.0.20100310 (20 Apr 2010)
+*tbb-2.2.013-r1 (20 Apr 2010)
+
+  20 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> -tbb-2.2.013.ebuild,
+  +tbb-2.2.013-r1.ebuild, +tbb-3.0.20100310.ebuild:
+  Removed all slot stuff (useless) and version bump for stable
 
 *tbb-2.2.013 (20 Apr 2010)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index a774f8048330..6de7129cea97 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 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
+DIST tbb30_20100310oss_src.tgz 1573630 RMD160 80a0a6314a83c1efb23aad6c592d68bb2ff184f1 SHA1 4848f0998de232ae065f6a65b9c89f74aecdf01b SHA256 b6b4bdbcfe4d0cf7a8226e034654cba5d86f8d71da535a229e1c74624f1f870f
+EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c
+EBUILD tbb-3.0.20100310.ebuild 2010 RMD160 dfb624d61b2e80b369443ad189098f103e01149f SHA1 1ff0a1c31b2d8e38af457787192f71c40b0d81fd SHA256 b19194e059ad5c07248f16da00ea91da77a7a0d1a58dca30a5a698db64351f79
+MISC ChangeLog 929 RMD160 553098564569e73c57ef0c2e67f04f5822e5a2f6 SHA1 d1bd8909d6d2f49dc1f54271bf03578db9ab86b3 SHA256 b4bb018e2e82cc0875bcc86ad43ab3f891173af1dcae4077e32d1d099703f381
 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvN8V4ACgkQ1ycZbhPLE2Dw3QCeOMxBGAC2j/pBmJFIr8emkkfI
-JA0An0fIvkvbMI94bIUOYeQiHrZmjEEA
-=RHoG
+iEYEARECAAYFAkvOGwoACgkQ1ycZbhPLE2CzdgCggnYrvqlThHJeZQKueF/zoCHG
+hmwAni99YfYoDL9gZLFu9YS79QDQ50DY
+=qaL5
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-2.2.013.ebuild b/dev-cpp/tbb/tbb-2.2.013-r1.ebuild
index a514752bed0a..285f65861b3a 100644
--- a/dev-cpp/tbb/tbb-2.2.013.ebuild
+++ b/dev-cpp/tbb/tbb-2.2.013-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.013.ebuild,v 1.1 2010/04/20 17:37:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-2.2.013-r1.ebuild,v 1.1 2010/04/20 20:35:04 bicatali Exp $
 
 EAPI=2
 inherit eutils versionator toolchain-funcs alternatives
@@ -19,7 +19,7 @@ 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}"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc examples"
 
@@ -58,10 +58,13 @@ src_test() {
 }
 
 src_install(){
-	dolib.so $(find build -name lib\*.so.\*) || die
-	insinto /usr/include/${PN}-${SLOT}
-	insopts -m0644
-	doins -r include/tbb/* || die
+	for l in $(find build -name lib\*.so.\*); do
+		dolib.so ${l} || die
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+	done
+	insinto /usr
+	doins -r include || die
 
 	dodoc README CHANGES doc/Release_Notes.txt
 	if use doc ; then
@@ -75,19 +78,3 @@ 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
-}
diff --git a/dev-cpp/tbb/tbb-3.0.20100310.ebuild b/dev-cpp/tbb/tbb-3.0.20100310.ebuild
new file mode 100644
index 000000000000..985bfea53e93
--- /dev/null
+++ b/dev-cpp/tbb/tbb-3.0.20100310.ebuild
@@ -0,0 +1,80 @@
+# 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-3.0.20100310.ebuild,v 1.1 2010/04/20 20:35:04 bicatali Exp $
+
+EAPI=2
+inherit eutils versionator toolchain-funcs alternatives
+#  url number
+MYU="77/148"
+# release update
+MYR="3"
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="${PV1}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+DEPEND="!<=dev-cpp/tbb-2.1.016"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	sed -i \
+		-e "s/-O2/${CXXFLAGS}/g" \
+		build/*.inc \
+		|| die
+}
+
+src_compile() {
+	if [[ $(tc-getCXX) == *g++ ]]; then
+		myconf="compiler=gcc"
+	elif [[ $(tc-getCXX) == *ic*c ]]; then
+		myconf="compiler=icc"
+	fi
+	# from the Makefile, split debug
+	cd src
+	emake ${myconf} tbb_release tbbmalloc_release || die "emake failed"
+	if use debug || use examples; then
+		emake ${myconf} tbb_debug tbbmalloc_debug || die "emake debug failed"
+	fi
+}
+
+src_test() {
+	cd src
+	emake ${myconf} test_release || die "emake test failed"
+	if use debug || use examples; then
+		emake ${myconf} test_debug tbbmalloc_test_debug || die "emake test debug failed"
+	fi
+
+}
+
+src_install(){
+	for l in $(find build -name lib\*.so.\*); do
+		dolib.so ${l} || die
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+	done
+	insinto /usr
+	doins -r include || die
+
+	dodoc README CHANGES doc/Release_Notes.txt
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/html || die
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples || die
+	fi
+}