Version bump. ppc patch applied upstream

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

4 files changed, 139 insertions, 19 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 0bfaa20f6109..6f22d83a99a0 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.40 2013/05/02 15:58:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.41 2013/06/25 00:30:57 bicatali Exp $
+
+*tbb-4.1.20130613 (25 Jun 2013)
+
+  25 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +tbb-4.1.20130613.ebuild,
+  metadata.xml:
+  Version bump. ppc patch applied upstream
 
 *tbb-4.1.20121003-r1 (02 May 2013)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 01d47b4f6f44..585f95823b5a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -9,24 +9,16 @@ AUX tbb-4.1.20121003-ldflags.patch 14517 SHA256 4ebbe650a8005ac5667fc5f4815ee049
 AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb3814729267dc0333b03a5f1056923 SHA512 1b07f84163a1f372519b2a44ce1ed355c5d9bdad1987f2b2efcd5a85b599624b37d907d0dcc0c1d2254b619803edbeabdc5cbb7d933986b78b77081ecd4a23ab WHIRLPOOL cbbe2829f4e829867b4844486f07ff0be509f6b850332f5ee376e86519e0eb63598a2179c687199ad5b16a67ce74080f178940c8ac6bff354bf66dafb7192b06
 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
 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
-MISC ChangeLog 7043 SHA256 a75cc8ab7e99c0fea2c7a2132c829824c1df6b43902f3fe1a7c7ff6fad3eb06a SHA512 38b30aeabc16945e47fb299ef03286412285fa3d228b63dde6e0b4cfd276af4effc783b5aba65a7de60d2c1dec7ea95743ffd16bd7ab7e5d01f60a0c42142259 WHIRLPOOL 2ef36743a7e4a0129ef8278b10d5b93c9a329fe7723bcdf166fbfe1856972a4f8df56b71331fa23ffed208c4830177ec76a4c60284c109d6cef640d15bd84ff7
-MISC metadata.xml 507 SHA256 2c4e4f0b91675da8916c33fd9277b846cd9cbcd8f2629b173682273e9e3edb28 SHA512 8efb5b8d01879a8707fc5d9dd2424edff475be7a1664bf23d8c7bf42f20af01d6a15f39c921cdb264560be3e6dd9ad1325fcf6979e326264f0c2e7cf828cd757 WHIRLPOOL 5a99185cb1995f3210930c5e117e11de2395cf4182e3892a5ad6487a61e8ac53e4c9f17ac1742ad40b1b6f4d159e4fde26b3ca9e4bf9d351fc49243a5f40bb2b
+EBUILD tbb-4.1.20130613.ebuild 3295 SHA256 d2507f2280fc569f6a46f65ee47ba6febb4bc89d525fde4a4a5046942449875d SHA512 e3c0c1ae9ab1709297b3716772fdd39ce551eded946ae010ec91fed2c66ddd1bb42f03721dc53c13c77d27397e1ba9e4bb64e415a326621a3c3c0da556da7f1a WHIRLPOOL 8faa05b344bd7d0549d123f2f641f4a0952130e3e56c4dd05e68b7395f616b0b0850b05de98bff7d238412403c8d2eb9ae2b2ffedd26396ced7f64bcdc1ee8e3
+MISC ChangeLog 7216 SHA256 aff47b1300b3a6c92accff3f02285921d972cd3b5ac6b5e27c6c965d1750af82 SHA512 33bf1ccd9e26e5822fa7b7c874e137f6322a01c79ecebdb94cb8a5d6d1dc7d76d4a4cb1d530ab2468407fd5173ceb8f71bed5e62d54e2d8f18735605b74d68cb WHIRLPOOL 960ab07215ba49fd54113821e7ad63d92f2fac543b2be02783847cddbda6677c6a004a963caf36c5193e6f793c03e07ab7e659ca078307f9aecedb296a1eab71
+MISC metadata.xml 503 SHA256 df5167eb58798ee657f0c55f2776e7e44d96bd9fe2e1c71783dcf6cd1c65296f SHA512 1085a87e3f4e0dfc5c11e3b767f78e64225f6266a04be6271bbd8aeeb6bb16948ab26d0cec79773d1568dea23acf57a85acb84cf7c6dac314144c2f0087c7d1c WHIRLPOOL 6359fe487c224a3fb58df9e6cdbcf5703c751567521ae23a6f965905ca9e7a47b4b6689fa3e542fb196def6b55d8ae02bf14a51604bad95712eeaafb4f8c090c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRgo3KAAoJEJS/30SErRQvzZIQAIN+AsPsFoD+/GfzS55n4NkF
-4Xxz3fniNI2KrrkjZNRXy1fIlWXvADiq1v0/onuuqwgjeemWJNjvv9SPYo5VMveo
-II/qOPkpmh8tZhckfSS4l5dIllTj0Ia9IayR0wK0mj7Hlq+MVk0/UvqTJs7ivoA1
-+a3CllkpPzhYuhIaMN8lqXPkcle8HFV1s+47Mki3CdsRZ0LcvHWNDuZO7Diui1dH
-XeHIi+WeL485RhLALR1gue1vVTAKx/8ty/FO/DfbMZ3c4BfjIeYB/Qtz68ELoY/F
-bkL1FNzU4WqpzUS02eZo+EOKoAlTHfvVua9oGVrKIAo+7kCKC2gIG2FntlNPSsA6
-9hUFkzUPWHalCu0eiMtvmu0OTgUSNXoy4O4iugvHYM05U+YhtDePHwQ8L8XUxp9G
-BEeN+J7AGlpuAsFAtkxEaFuO/RpcBxqHRU3a0SyqJJw26akvbanVT+fJ51Y9H8yy
-YEfx0uN3P0ZOfnwpNlGyNRaOexkQmzfZPjmp7DgcGsaB8H64UpnIjWB3agDIC8BH
-y5C5WRt+6jWtJxm69Q4fx8qqUENgRuvnH5peJ4vsgArl3YuegGhr8YjIR+UcGpTf
-EqFQbT5C/uiKdKY3zqjaKxgSV6ICpBuYO37yEUo7zATPPTOhUo9upWdUyza3S6Kn
-ZSo1vHq96JoRx4c08fu/
-=uf6E
+iEYEAREIAAYFAlHI5MIACgkQ1ycZbhPLE2DXrwCcC31orr85ASGt6q3qluvl3ggE
+aM8Ani8lTVvoGxQeiFgrLsQ5oefM+miH
+=r+nS
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml
index d9d21c8a6ebc..4e6e40611722 100644
--- a/dev-cpp/tbb/metadata.xml
+++ b/dev-cpp/tbb/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   The Intel Threading Building Blocks is a library that helps you
   leverage multi-core processor performance without having to be a
   threading expert. It represents a higher-level, task-based
diff --git a/dev-cpp/tbb/tbb-4.1.20130613.ebuild b/dev-cpp/tbb/tbb-4.1.20130613.ebuild
new file mode 100644
index 000000000000..bf0b8d9dde09
--- /dev/null
+++ b/dev-cpp/tbb/tbb-4.1.20130613.ebuild
@@ -0,0 +1,122 @@
+# 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.1.20130613.ebuild,v 1.1 2013/06/25 00:30:57 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-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
+
+	# 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
+}