Version bump

Package-Manager: portage-2.2.7-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 140 insertions, 6 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 968ae55a7e37..a8db64c274bc 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.43 2013/08/27 20:20:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.44 2013/11/12 22:17:14 bicatali Exp $
+
+*tbb-4.2.20131003 (12 Nov 2013)
+
+  12 Nov 2013; Sébastien Fabbro <bicatali@gentoo.org> +tbb-4.2.20131003.ebuild:
+  Version bump
 
   27 Aug 2013; Alexis Ballier <aballier@gentoo.org> tbb-4.1.20130613.ebuild:
   Fix shared lib installation on FreeBSD.
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 99263c907dd7..94f20906e05a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -10,15 +10,17 @@ AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb381
 DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
 DIST tbb41_20130116oss_src.tgz 2461689 SHA256 4ae2c10899e3b6ef2f686013ec5901fc658444ca90178efaca6014b0665c34b6 SHA512 a537411cf9ae66caaa97af33fbc1e56b6598be7b14526c42fd24cedebac06b1979b39c89b080ff9ff353a1ce82b1d10c4863add79fb15578dd3b1598aea1200f WHIRLPOOL 279eb059a4877cd11d7c01bd8483885c12fbb389c51d0944cfe96270051705b8b42b6d6273533bfb668c231a557fe0cc127b091f2ba88237349137a8015e5654
 DIST tbb41_20130613oss_src.tgz 2089588 SHA256 a5234941ecc390b07a2d3e038cf4cf87ab48adc3f0e40e1c6ef0b625d850bab8 SHA512 00123264d300832fd6494814043f2bf10097946d24ec2dec8273aaf54b2d777ecef09f055a731f786d40fcff9be404fc4107e9e4d17afb3ce2e4da1cd6d0b3ea WHIRLPOOL c094850581d4a894e89804eaec999e84e034e1ec4f4a1e779d956ac5687f533cc2aa55e171e331a9622cc0ceb9d65d954a72439d21c4c39464d4f553b70dd579
+DIST tbb42_20131003oss_src.tgz 2118935 SHA256 dca8af40bcd69e434620c5800a6f464c78ab410a75d02f40547e851cc4d1519a SHA512 0e7b8ae9bb3600e6f5eaf25997a07e106416afa336549b34a90e97534685127bee612f798511c6da7b08c0116056565fe7022c773ff8e3eb6d9c69ab4ceaeda5 WHIRLPOOL 48e4e6de170fce2e67ff51adae3fc6fa69edcd444b68dfcc2da335a70661c39069801d7f15f52efd9c5064cbc420ad0f13115dd4ffae9595ce50a8dab0c3186d
 EBUILD tbb-4.1.20121003-r1.ebuild 3353 SHA256 67a609ea8c27fe0a3944bffad4eab317a25c38c69d410a1154f430f7a72c0291 SHA512 6a9e45c42dbc7b65e2c73f34a7b1188f67dd5e8296dc3cfa704aee5603acec4ae54b39e6e7d7a02b1b3cc594743387d9d83125245e74dc3117aace67a7369705 WHIRLPOOL 6ba174fb4aa7fbfb9ae17ce0006584eea335100b7b146d9d6ae4766aa2232fabcc8ea8e8a2fd165532ab403a1dcd88b07ccd20ebab9735ee795ae77d19fe0a44
 EBUILD tbb-4.1.20130116-r1.ebuild 3347 SHA256 956c07fc424f749eb47165c7068c15eec9850e554bafc5e7b40bec6e85a79499 SHA512 ff740b466b7f3f862071719964897b44cc1ec68720ea5eae2b185d47360a4590dd0f3a7ff81ec0ae66a43702a60013c27f3f049069070fb4c0ea35f16225138e WHIRLPOOL 5b2c465eaa7f3ea328272260aece036bed09f8d271986468963e10f56772cbed675d2f22f4275ccad3240c7a36bf9f4fb17ed110c5b33a0fcd49a7e3c41d2318
 EBUILD tbb-4.1.20130613.ebuild 3513 SHA256 acbef7f54549123a964f57dca389ab441a1fa30d7470bd2e039680cfa28e7de7 SHA512 929284e660e3b51fb5cfb43074eaf12e8b2108a9ab620b91103fc1caa81db19bbc1080e65806ce7c8c09bbc03f6c322d133e7657cc5ca37173fb9d4930471a1b WHIRLPOOL 0bb15df2b26a7c7c7bf2011ca0347feff0773b44fdf7c7e04cffb5ce35474029a3a91b832d1a37b26c4b3bf74745f01b9f9fadda29a8cd09223e80ab5dde599d
-MISC ChangeLog 7436 SHA256 fa798376eb772b7447179464adee6fb7b0f6ac16b53d09e7be6885a8eae8ee7f SHA512 c4d16b663a10c5686a53754a0d73feb14863d5a36e4573cb6b1dbffe6274171fd15955a3cd9452d87201316d12c21a1b870475d20039868499e573aa8f9ec897 WHIRLPOOL 998a318b548576ee916775eb67b065b3d77770ca70c3cdd131d54258d9b7479223aee1ac15b66bd1d03feca51d3896d5a8ce9250bbfdc4c99e5c1948b54f4f2f
+EBUILD tbb-4.2.20131003.ebuild 3513 SHA256 7b66a686b3784df23feb39925560f28d953f68a010b1b2887257ad9de8ed3cbe SHA512 07e526b93660c32e9fb47f3c9ab10db27cfc57a16d5f316ab7bd68a177dafc9ad789e289e16f9806c13bb0fbfaa515658a632d27301765c1ef7efd5ed0a79eab WHIRLPOOL 2a884d1425a655b24933a1d313cef27e5b6414ac12c902756e5df30932217a408ad787fe7ccd4ae2a8d6276743f0ce2089019b335cb98b164d23f285db00bae0
+MISC ChangeLog 7566 SHA256 bb448e1305cd67200e58e1aaf278b0c5618a86de78385bb2f0e0387b00dff740 SHA512 933f87e031e7dae2fedb7faec348696549d1571a8f4863119e4b87853fd21a7589b60daf59e44b65709bf768747b69c2cc6b735c0bc440ee314da5fdb1f03be2 WHIRLPOOL 4ea1970649204c675fd25c79400df9c1f16ca3374cf9ac89475e09432282c389cdae79038c639112584504c52e1cac7d6aff1db6768728a3801aaf1c91aa8079
 MISC metadata.xml 503 SHA256 df5167eb58798ee657f0c55f2776e7e44d96bd9fe2e1c71783dcf6cd1c65296f SHA512 1085a87e3f4e0dfc5c11e3b767f78e64225f6266a04be6271bbd8aeeb6bb16948ab26d0cec79773d1568dea23acf57a85acb84cf7c6dac314144c2f0087c7d1c WHIRLPOOL 6359fe487c224a3fb58df9e6cdbcf5703c751567521ae23a6f965905ca9e7a47b4b6689fa3e542fb196def6b55d8ae02bf14a51604bad95712eeaafb4f8c090c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIdCgIACgkQvFcC4BYPU0qKmgCgzb3wSRURdD4nFj4kH9Aby4fC
-uMkAoMrwHIbP02epuxbF6Sx9N5Z3PnYj
-=jdoE
+iEYEAREIAAYFAlKCqPMACgkQ1ycZbhPLE2AlAwCdHLrhumzjzG+uGwEyZ6oGNIXj
+DXsAniECTvtattcc1y38GG7xy60JAmO5
+=+S4b
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-4.2.20131003.ebuild b/dev-cpp/tbb/tbb-4.2.20131003.ebuild
new file mode 100644
index 000000000000..b956b4f305a6
--- /dev/null
+++ b/dev-cpp/tbb/tbb-4.2.20131003.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20131003.ebuild,v 1.1 2013/11/12 22:17:14 bicatali Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib versionator toolchain-funcs
+
+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://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch
+	# use fully qualified gcc compilers. do not force march/mcpu
+	# not tested with icc
+	# order in sed expressions is important
+	sed -i \
+		-e "s/g++/$(tc-getCXX)/g" \
+		-e "s/gcc/$(tc-getCC)/g" \
+		-e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \
+		-e 's/-\(m\|-\)\(64\|32\)//g' \
+		-e 's/-O2/$(CXXFLAGS)/g' \
+		-e "/^ASM/s/as/$(tc-getAS)/g" \
+		build/*.gcc.inc || die
+
+	# Give it a soname on FreeBSD
+	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
+	# Set proper versionning on FreeBSD
+	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
+
+	# force 64bit where applicable, 32bit where applicable...
+	# built-in detection is based on running kernel, which messes up
+	# e.g. in a x86 chroot on amd64 kernel. Bug 462130
+	# see build/linux.inc for values
+	use amd64 && export arch=x86_64
+	use amd64-linux && export arch=x86_64
+	use x86 && export arch=ia32
+	use x86-linux && export arch=ia32
+	# no idea what to do with ppc but so far it seems to work
+
+	find include -name \*.html -delete || die
+
+	# pc files are for debian and fedora compatibility
+	# some deps use them
+	cat <<-EOF > ${PN}.pc.template
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Cflags: -I\${includedir}
+	EOF
+	cp ${PN}.pc.template ${PN}.pc
+	cat <<-EOF >> ${PN}.pc
+		Libs: -L\${libdir} -ltbb
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc.pc
+	cat <<-EOF >> ${PN}malloc.pc
+		Libs: -L\${libdir} -ltbbmalloc
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc_proxy.pc
+	cat <<-EOF >> ${PN}malloc_proxy.pc
+		Libs: -L\${libdir} -ltbbmalloc_proxy
+		Libs.private: -lrt
+		Requires: tbbmalloc
+	EOF
+	use debug || sed -i -e '/_debug/d' Makefile
+}
+
+src_compile() {
+	if [[ $(tc-getCXX) == *g++ ]]; then
+		comp="gcc"
+	elif [[ $(tc-getCXX) == *ic*c ]]; then
+		comp="icc"
+	else
+		die "compiler $(tc-getCXX) not supported by build system"
+	fi
+	emake compiler=${comp} tbb tbbmalloc
+}
+
+src_test() {
+	append-cxxflags -fabi-version=4
+	# avoid oversubscribing with -j1
+	emake -j1 compiler=${comp} test
+}
+
+src_install(){
+	local l
+	for l in $(find build -name lib\*.so.\*); do
+		dolib.so ${l}
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+	done
+	doheader -r include/*
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+
+	dodoc README CHANGES doc/Release_Notes.txt
+	use doc && dohtml -r doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples
+	fi
+}