Bump

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

3 files changed, 108 insertions, 5 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 42f7d0ef08b0..e0bdefc6d4df 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2010/11/19 06:11:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.10 2010/12/25 18:44:49 bicatali Exp $
+
+*tbb-3.0.131 (25 Dec 2010)
+
+  25 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> +tbb-3.0.131.ebuild:
+  Version bump
 
   19 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> -tbb-3.0.056.ebuild,
   tbb-3.0.104.ebuild:
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 102c0ba27cfe..46cd69fa6469 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -5,14 +5,16 @@ AUX tbb-3.0.056-tests.patch 885 RMD160 14af2f3f703376ab37668f8c21d57335e070a10a
 AUX tbb-3.0.104-tests.patch 676 RMD160 08111b5f403e0b437e7c23a9905c6ecd4b4cab39 SHA1 b205d4123ca1ca3ec8fb7a839e048ef7ff6063f0 SHA256 7d486b4b462a9d13226a29f303a374209e52c4e5ef0d0c8a216ea0b503bb0b21
 DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
 DIST tbb30_104oss_src.tgz 1592084 RMD160 a034edabc44b7ccfb196d561dd5d2609d0c71854 SHA1 7987f82fc19fb8df2ff61a51767c7fe67c486f52 SHA256 29d0a274d96b8749c91f319571f4d7b257f201fd69eec9812f4af3822235ca81
+DIST tbb30_131oss_src.tgz 1743379 RMD160 8c4ae2d06b9e17ca686328241c7a06d9de41cfcd SHA1 d6d960d50c0462804999d79b2d2b1c1b7a603aa9 SHA256 a97cc64dd9826c2ab3b78c19e0800c79b520ddb423aecbc4e750f0f1320590f1
 EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c
 EBUILD tbb-3.0.104.ebuild 2900 RMD160 bcea1e36e065b7f71f2119cc0c2fb3584b4366aa SHA1 a368fb087f4ffbc6f49ea12f742ef41611745397 SHA256 d1b0b5b32ea339770ff1ae363376b8dbc227cfaa514ce1b108e9c1455f6786a7
-MISC ChangeLog 2176 RMD160 256742c794d7d85dc2409ce903b99c85c2fa8a23 SHA1 610a0f75ec199d29113e1596bd7691f78db1a1af SHA256 47a4c2e250e70494c9b7a58a445907f31ae6c0a49294e60d57128caa9c411fef
+EBUILD tbb-3.0.131.ebuild 2958 RMD160 bd15cb8a7e8e3761fa17d88356a3b9986f9808b7 SHA1 6159a099ccfb5188f9e590ba3a72a6230b48193f SHA256 271c166d3d2328c6d318a706c3f1c00afb0f4fc2c9203c1e4835609dbc902cc5
+MISC ChangeLog 2297 RMD160 6e93dbc70c5450f6a5f34610a869ebe619da3156 SHA1 113fa1fd8324aca6f782d76093514a649755c181 SHA256 c1965f58f17373e49c1ccb6c43837e0849864b17b3834b4ce8d6a4b0664b21f2
 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzmFQQACgkQ1ycZbhPLE2CvDwCfdVW7IYA4NG3nZXmhHp1tPbHf
-kW0AoI0fwafszY5+j745V2zx2pXC0ZBt
-=IjmJ
+iEYEARECAAYFAk0WO6kACgkQ1ycZbhPLE2ATXQCeKy1RThl9wUwm852S2dtwXln/
+NuUAoKK/jQC8pbq37CKy65Woq+TBJXt2
+=Xonp
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-3.0.131.ebuild b/dev-cpp/tbb/tbb-3.0.131.ebuild
new file mode 100644
index 000000000000..539aeb244b4b
--- /dev/null
+++ b/dev-cpp/tbb/tbb-3.0.131.ebuild
@@ -0,0 +1,96 @@
+# 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.131.ebuild,v 1.1 2010/12/25 18:44:49 bicatali Exp $
+
+EAPI=3
+inherit eutils versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="78/165"
+# release update
+MYR="%20Update%20"5
+
+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
+	# 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
+}