Version bump

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

3 files changed, 109 insertions, 5 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 9e0ad02c2d9c..0d9d6fe5229d 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.11 2011/04/21 21:04:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.12 2011/05/31 21:34:13 bicatali Exp $
+
+*tbb-3.0.196 (31 May 2011)
+
+  31 May 2011; Sébastien Fabbro <bicatali@gentoo.org> +tbb-3.0.196.ebuild:
+  Version bump
 
 *tbb-3.0.174 (21 Apr 2011)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index a2987a8e0d2b..1c828387c40e 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -5,14 +5,16 @@ AUX tbb-3.0.104-tests.patch 676 RMD160 08111b5f403e0b437e7c23a9905c6ecd4b4cab39
 AUX tbb-3.0.174-gcc46.patch 1600 RMD160 77c2aaf4cbf566ba11f8bb27a91d94aaa42600cb SHA1 98ffc2ccec74c94e522dafd27bbc1923db627154 SHA256 7d2b422d013defecbd62bd1f04db73b3038f4f4901e543d50c35fada8309d40b
 DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
 DIST tbb30_174oss_src.tgz 1826899 RMD160 5f6f853cf2fc6c05bd11dcf2928d60c5e2459fbf SHA1 b68764d0d9d2517c60fd88c71a3554d194733b03 SHA256 c06eae08435cb7118d2f922303fd83b03e2754d45a6c8fa98721cb09b0a463cc
+DIST tbb30_196oss_src.tgz 2015992 RMD160 8af026a436415b8d790a77b6a88165e1b926caaf SHA1 eb77db011bc595d77a69de4fb78004b370cabd2f SHA256 bc342b93b8456bdec911baaea2c44ae787c39b7bbcac88789f05ebed634510d7
 EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c
 EBUILD tbb-3.0.174.ebuild 3006 RMD160 585e6d26de3ce0142a6474e912a69d4207a89ab0 SHA1 44c9aecc1734f6aeb48c8fb6eae74262b271035a SHA256 e6161a3b809d9437727e59afdbaaf33582dff394464d398ca9e9f23cebfbfedb
-MISC ChangeLog 2553 RMD160 fad7dd751b121aae8465665b239d953de13b9752 SHA1 b86529e38f59d7bfd3c8a19a104c00bf20ad2b57 SHA256 998ae254ef647f01492164e749268ccdb2ac55bf361fef74c433fb92e38ea7fa
+EBUILD tbb-3.0.196.ebuild 3006 RMD160 cd9074569c73e100f94fcac68bb60770e807f0a6 SHA1 f4e9db69c027ceabebfa9cf3aa8ab634222e0af9 SHA256 778d246dac9bd6168debb6cedfcdf4fe06a327dee771a9f406ff0ce9971fea65
+MISC ChangeLog 2673 RMD160 b63551c2c4988c77169c2a83ef6100701cacf5c8 SHA1 9ac202a4cbdd0abd6fc56a4ff0b65d6c22a4e33a SHA256 2bcc7ace449c5b44e3230a42bf0b57db250f66181464cb916b98388fa926a2fc
 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2wm/4ACgkQ1ycZbhPLE2CclACdHtcFG6iZkNxkmBiBe/T84Jsj
-rOEAn04uuWbt0n5jgssyvXENNfrffweo
-=KM/A
+iEYEARECAAYFAk3lXuAACgkQ1ycZbhPLE2CLxgCfUU5Stf0l2pHFrnUIsWRc1dLS
+6O8An3qj1gqMTygniRWUaFv/ZHhsH6tD
+=J+gb
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-3.0.196.ebuild b/dev-cpp/tbb/tbb-3.0.196.ebuild
new file mode 100644
index 000000000000..8528e8c4becc
--- /dev/null
+++ b/dev-cpp/tbb/tbb-3.0.196.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.196.ebuild,v 1.1 2011/05/31 21:34:13 bicatali Exp $
+
+EAPI=3
+inherit eutils versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="78/170"
+# release update
+MYR="%20update%20"7
+
+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}${MYR}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+DEPEND="!<=dev-cpp/tbb-2.1.016"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
+	epatch "${FILESDIR}"/${PN}-3.0.174-gcc46.patch
+	# use fully qualified compilers. do not force pentium4 for x86 users
+	local CC="$(tc-getCC)"
+	sed -i \
+		-e "s/-O2/${CXXFLAGS}/g" \
+		-e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
+		-e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
+		-e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
+		-e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+		build/*.inc || die
+	# - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+	#   actual command.
+	# - Force generation of version_string.tmp immediately after the directory
+	#   is created.  This avoids a race when the user builds tbb and tbbmalloc
+	#   concurrently.  The choice of Makefile.tbb (instead of
+	#   Makefile.tbbmalloc) is arbitrary.
+	sed -i \
+		-e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+		-e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1"  -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+		src/Makefile || die
+}
+
+src_compile() {
+	if [[ $(tc-getCXX) == *g++ ]]; then
+		myconf="compiler=gcc"
+	elif [[ $(tc-getCXX) == *ic*c ]]; then
+		myconf="compiler=icc"
+	fi
+	local ccconf="${myconf}"
+	if use debug || use examples; then
+		ccconf="${ccconf} tbb_debug tbbmalloc_debug"
+	fi
+	emake -C src ${ccconf} tbb_release tbbmalloc_release || die "emake failed"
+}
+
+src_test() {
+	local ccconf="${myconf}"
+	if use debug || use examples; then
+		${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
+	fi
+	emake -C src ${ccconf} test_release || die "emake test failed"
+}
+
+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
+}