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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 97 insertions, 23 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/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
+}