Add multilib support, bug #545190; thanks Peter Asplund and Ian Stakenvicius preparing the ebuild

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 345 insertions, 7 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index e1d8bd8d057c..a233d78a5ae5 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.51 2015/05/05 08:28:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.52 2015/06/15 16:50:40 jlec Exp $
+
+*tbb-4.3.20141023-r1 (15 Jun 2015)
+
+  15 Jun 2015; Justin Lecher <jlec@gentoo.org> +files/tbb-4.3-build.patch,
+  +tbb-4.3.20141023-r1.ebuild:
+  Add multilib support, bug #545190; thanks Peter Asplund and Ian Stakenvicius
+  preparing the ebuild
 
   05 May 2015; Jeroen Roovers <jer@gentoo.org> tbb-4.3.20141023.ebuild:
   Mark ~ppc64 (bug #499164).
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 6ceab8ae6bff..7056212b7881 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tbb-4.0.297-underlinking.patch 475 SHA256 489473e0f30a53d13bd508d3d720df2e6db24b1348470febd162d0834bf6a3de SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486 WHIRLPOOL 10e6e3f886dc1a8638f1788254e38f7f92ebbd9deab645e215e9abecfe871e8918de490dc0612de276829e75571db82bd04fe1a8606a50e5f2a6b938821a25fe
 AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb3814729267dc0333b03a5f1056923 SHA512 1b07f84163a1f372519b2a44ce1ed355c5d9bdad1987f2b2efcd5a85b599624b37d907d0dcc0c1d2254b619803edbeabdc5cbb7d933986b78b77081ecd4a23ab WHIRLPOOL cbbe2829f4e829867b4844486f07ff0be509f6b850332f5ee376e86519e0eb63598a2179c687199ad5b16a67ce74080f178940c8ac6bff354bf66dafb7192b06
+AUX tbb-4.3-build.patch 4729 SHA256 325f4b13ec59a042f3e92b83bed99b564a305e451c9a4a3dfc7c80a5377da40c SHA512 0542541a6cbb360a002770a2087519e41b7e20e4dc84a4255ba4ad8b9444a26d25e7a3047d08106ddfe0151704aaddad06fbe49fcd9cdeeced281294e8462e7a WHIRLPOOL a29ea567eee7147ecc0aa40c84ed35d7971e14f3a7aae23890d18997b9a880ddfc5342d0cf8504efa2c0ff083e09f88c0db96d7bc4b15b46d2bd50bc17042947
 DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
 DIST tbb42_20131118oss_src.tgz 3134290 SHA256 d95b816ac1618f5047d9ac4db1709d1f8bbeafaed597ce1ee7862b9577680882 SHA512 1f3e2bd807b7fa0cf42c712353cc2a622ddad22fe64359e668480617831ac595a46fa8db86ecd0376989cb4928bb4febe4d11a0f27c26437c60ed0a61c451174 WHIRLPOOL 90cc7de2309588dc546c4380d26211edc118f7dd7f1d7e15dcb38facb2ca0da9020129f1c03e4110eeb9b5991203aa0da0ff1561ed9da7cedcc2298e1b2e2a50
 DIST tbb42_20140122oss_src.tgz 3402631 SHA256 f1bd8d983f93a10e340ba63f3a479632ddca1562a5242814dd82a378d3233b75 SHA512 e4391666bdacd6990ed23cf3c8635b18f727e6e794cadba38c2bbe9113990b955f9f341316a541b4b1b5757ec9af9ac0926a56b4a2d9c2485e3b0a6c6aa888ca WHIRLPOOL 3e8f2a5493fd03702f892cf63f0d14a22467ac67c1c4b889e59ab1bb4fda56739c430934f4cfe6b5eeeca38affab32c850aa0f5dce3e587e978d64baebcd7203
@@ -10,13 +11,26 @@ DIST tbb43_20141023oss_src.tgz 2777177 SHA256 247a8d22d6850caa37d376aaeaf8bfcb06
 EBUILD tbb-4.1.20121003-r1.ebuild 3353 SHA256 14cb8d01605f53056db8a670a93ea13bac4a21ba05e33c3373ad5b9c7fd9e9af SHA512 0da009a251bf710f4633a558339a29e040c499c3fdb2f9b27f3a8cee25dfce1350c25411dead5d28f57906efaae742c1ff179fb5e1edd1956c7b7edd52e4ab30 WHIRLPOOL 7fb01cd161fb2066b04fbea717509210a8fbd0bf4fd73a3ea2d9def4b782e4b17680444c00295ecae7d36aa4b4a4b154fa8dee5dd5c6ea297914ed2a4868a020
 EBUILD tbb-4.2.20131118.ebuild 3510 SHA256 8abab54b1e8a71b3e0c9cb9d29084bb8fb6b620ecfe4faef05ba87c1fedfdad4 SHA512 6c271680007ae347f40863a743d55bc4b3d3c1dbd17bec2070696f8aab53a2f67d871f8f4c789bf5eec81c4fb9dc4b832859f0914a55b22e5ffd81ba2e6e1084 WHIRLPOOL b7c156690ac1a40977c56f1ae566307a02a1ae55f2613ccaa4a972fdf7f46f9eb4dc7720a9ed970363b5e72c406d5686acb068eef5bf75855e64b9443017af61
 EBUILD tbb-4.2.20140122.ebuild 3519 SHA256 f92b482f545b29533adfc85ba988438a83017ebf2be2b8b33788932246a19717 SHA512 10ba65f9f3de7a2d90b13b41b8cdffc2d80a917d39f035feeacd7dd4c443286faf6a94ebf888c10b90ac5e884de976834ea51f3e394169a9389a0781bda48e6f WHIRLPOOL 577eaf6f292365f9c9913f67addf47580f3675a18219143dcfb2d1a0a209fa3c48dfaae57ddd0f7228d4d291ab0fe7d736661d92e4891a919452689022a3d26a
+EBUILD tbb-4.3.20141023-r1.ebuild 3236 SHA256 9e3845a121f1bcdb44b7cf75e24a8028260fcb3561703bebe545dbf1f0eb4791 SHA512 0a67b4564bdec38e38726a3fddbc5d9cd3aa13eaa6a4421fde65d5d3db136c7e2e468c31ee1d72d85ce49e1219858c980d380cd2936fcc88f11c08a611c9c26a WHIRLPOOL 23243528ff7952e6cbb4fecc0ffaa4fbdf1b3ffd9d84f8ec900b92b8e0017763e6fd025dda5382c540fcd9fd41ed2e64d5adab412df7fc1776dafe158e9584d0
 EBUILD tbb-4.3.20141023.ebuild 3521 SHA256 eef3ca608c482ed11a87fd00fd4c74a0cc07d19c0e92c1c1372da0b478995fe4 SHA512 d396a9ec8fa3ae9a60824146a7347457a1b06bd4da07e4b7ddf6aa2723dfcc6c2a134bcd69a87ebcd6b03cf75ea2d9bcf044e94ea5061e5913c567eabb7d247b WHIRLPOOL 4b4b90dc436d6b2ae03703a7b6e425c354290d2e1484a6879c11b7e7c7bed7e208a1f72184150ccfb1fc9da8d2a9a20e3fea249427893c57313b79bbb8192f0d
-MISC ChangeLog 8564 SHA256 d93a99c8a91c9a107e3cbac4fddb808bd4e4bcdfd3ca3019004fe2174841a344 SHA512 c86b31aa75cc4a14385fbdbace9db9a47046bff522f47a8efdfe8b81976c3814556671b6e930219209ee7913af4d4a6d40982a2e4dbdc30cb4bf5a95bd5350d6 WHIRLPOOL 68f3bbe3eb24db66b577589a6436a3c284bfb1f96242b6b0055ddb0809980479d1b631e74efa68c5c943b09af22d9312b28c248c9643d9a929ad050207102df5
+MISC ChangeLog 8810 SHA256 1e922dcaf01b474f30c040cf9f0a52bea571300601dd5befcb2e01d1ac0c5c48 SHA512 8180214405844a2e620184a3b087d59389b95a2864be0655dcd5a383a94b93440d353010b7c08831bf9a63f8d80ce2311c574e63e15b77b128328d67f3251a2a WHIRLPOOL a80005737086b3a20363615bb0a39a50ff4a81c642d5358ed604abda7c390d1c1aa41b5a425f0f87f5bf375168d4d02adb7ddb9f07d9c7a4c5a49844cb1a8c51
 MISC metadata.xml 507 SHA256 2c4e4f0b91675da8916c33fd9277b846cd9cbcd8f2629b173682273e9e3edb28 SHA512 8efb5b8d01879a8707fc5d9dd2424edff475be7a1664bf23d8c7bf42f20af01d6a15f39c921cdb264560be3e6dd9ad1325fcf6979e326264f0c2e7cf828cd757 WHIRLPOOL 5a99185cb1995f3210930c5e117e11de2395cf4182e3892a5ad6487a61e8ac53e4c9f17ac1742ad40b1b6f4d159e4fde26b3ca9e4bf9d351fc49243a5f40bb2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVIfxQACgkQVWmRsqeSphOkmQCfWZD52JeAm6dUhlW8LsiK9eZz
-scAAn0DuEhQvOZxX0APVzH/gWNzW4lXG
-=Lniz
+iQJ8BAEBCgBmBQJVfwJlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihmUP/02V8915KTmtPP+WNEfQNhlY
+pcMXkbN1uxOn+29LzsCkvrQjpifvz6AQF0125eW/oaEKNkJRSmcvAWjdRLSdvqNW
+AKebERkX6s8ZqQU6BYuCFMWKpJpHXZKpnDvDCVkJKrL2aCBfoPbWaXibLgTiPYO0
+KSlDhJYUDVqUpkVZpnaDM6g8+paFIwBrZFZg1qrrB2sacynkuHHshbkQwx7tyZF2
+u9VFoVTLeI+wfgyeoH7Pzo/Wwtzem9UohfZbn5GKadspb2GCKkIP7IaeyW6COzz5
+lVaC8nq9hMALAPH5Z8jiZLf6KpwQn3MZYfnEVMXFgyH+KGFFar4muTuiayn9vzNm
+BqMKLyCGMHN14aurGI46ctOhAOHB04xBmpMgJYk5hjMEcCK97lIlWsxhrD1cxeIB
+M/8YxNdbFaVV84lANqm5GqjutxMhyAdGe0bz4lOlqXNXtxthn0PXZUP08aPX2eWK
+7tKyjlD7+/hsiINlBbCh84q+Dxld4bNUg7YGE09pDE6N/U7E5uWK96j9i3qp7tgJ
+r6T9Yj83H/HOuWUefHJlvllNG17e6HK2EdVsXnDPVfLfpGIW8BoIRZb88zAQklpp
+nfFz5xJY7aks5KKJRIMaFMDZZRJfRJwvLnHL2tL2KTDnH8Wck4dFgQcrvDJrNDDH
+m/TyzX8jYcSlmeWOVrhn
+=1Rj9
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/files/tbb-4.3-build.patch b/dev-cpp/tbb/files/tbb-4.3-build.patch
new file mode 100644
index 000000000000..a9119ef49212
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-4.3-build.patch
@@ -0,0 +1,185 @@
+--- a/build/linux.gcc.inc	2014-10-31 09:08:38.000000000 -0400
++++ b/build/linux.gcc.inc	2015-06-08 19:22:49.855807841 -0400
+@@ -32,12 +32,12 @@
+ EXPORT_KEY = -Wl,--version-script,
+ LIBDL = -ldl
+ 
+-CPLUS = g++
+-CONLY = gcc
++CPLUS := $(CXX)
++CONLY := $(CC)
+ LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
+ LIBS += -lpthread -lrt
+ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
+-C_FLAGS = $(CPLUS_FLAGS)
++C_FLAGS := $(CPLUS_FLAGS)
+ # gcc 4.4 and higher support -std=c++0x
+ ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[4-9]|[5-9])"))
+     CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X
+@@ -54,7 +54,7 @@
+ endif
+ 
+ ifeq ($(cfg), release)
+-        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
++        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
+ endif
+ ifeq ($(cfg), debug)
+         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
+@@ -74,24 +74,12 @@
+ 
+ ifeq (intel64,$(arch))
+     ITT_NOTIFY = -DDO_ITT_NOTIFY
+-    CPLUS_FLAGS += -m64 $(RTM_KEY)
+-    LIB_LINK_FLAGS += -m64
++    CPLUS_FLAGS += $(RTM_KEY)
+ endif
+ 
+ ifeq (ia32,$(arch))
+     ITT_NOTIFY = -DDO_ITT_NOTIFY
+-    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
+-    LIB_LINK_FLAGS += -m32
+-endif
+-
+-ifeq (ppc64,$(arch))
+-    CPLUS_FLAGS += -m64
+-    LIB_LINK_FLAGS += -m64
+-endif
+-
+-ifeq (ppc32,$(arch))
+-    CPLUS_FLAGS += -m32
+-    LIB_LINK_FLAGS += -m32
++    CPLUS_FLAGS += $(RTM_KEY)
+ endif
+ 
+ ifeq (bg,$(arch))
+@@ -99,12 +87,6 @@
+     CONLY = mpicc
+ endif
+ 
+-# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
+-ifeq (sparc,$(arch))
+-    CPLUS_FLAGS    += -mcpu=v9 -m64
+-    LIB_LINK_FLAGS += -mcpu=v9 -m64
+-endif
+-
+ # automatically generate "IT" instructions when compiling for Thumb ISA
+ ifeq (armv7,$(arch))
+     CPLUS_FLAGS    += -Wa,-mimplicit-it=thumb
+@@ -113,13 +95,7 @@
+ #------------------------------------------------------------------------------
+ # Setting assembler data.
+ #------------------------------------------------------------------------------
+-ASM = as
+-ifeq (intel64,$(arch))
+-    ASM_FLAGS += --64
+-endif
+-ifeq (ia32,$(arch))
+-    ASM_FLAGS += --32
+-endif
++ASM := $(AS)
+ ifeq ($(cfg),debug)
+     ASM_FLAGS += -g
+ endif
+--- a/build/FreeBSD.gcc.inc	2014-10-31 09:08:37.000000000 -0400
++++ b/build/FreeBSD.gcc.inc	2015-06-08 19:24:51.385810060 -0400
+@@ -27,14 +27,14 @@
+ WARNING_KEY = -Wall
+ DYLIB_KEY = -shared
+ 
+-CPLUS = g++ 
+-CONLY = gcc
++CPLUS = $(CXX)
++CONLY = $(CC)
+ LIB_LINK_FLAGS = -shared
+ LIBS = -lpthread 
+ C_FLAGS = $(CPLUS_FLAGS)
+ 
+ ifeq ($(cfg), release)
+-        CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
++        CPLUS_FLAGS = -g -DUSE_PTHREAD
+ endif
+ ifeq ($(cfg), debug)
+         CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
+@@ -51,22 +51,12 @@
+     CPLUS_FLAGS += $(PIC_KEY)
+ endif 
+ 
+-ifeq (intel64,$(arch))
+-    CPLUS_FLAGS += -m64
+-    LIB_LINK_FLAGS += -m64
+-endif 
+-
+-ifeq (ia32,$(arch))
+-    CPLUS_FLAGS += -m32
+-    LIB_LINK_FLAGS += -m32
+-endif 
+-
+ #------------------------------------------------------------------------------
+ # Setting assembler data.
+ #------------------------------------------------------------------------------
+ ASSEMBLY_SOURCE=$(arch)-gas
+ ifeq (ia64,$(arch))
+-    ASM=as
++    ASM=$(AS)
+     TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
+     MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
+ endif 
+--- a/build/linux.clang.inc	2014-10-31 09:08:37.000000000 -0400
++++ b/build/linux.clang.inc	2015-06-08 20:24:29.785875376 -0400
+@@ -31,15 +31,15 @@
+ EXPORT_KEY = -Wl,--version-script,
+ LIBDL = -ldl
+ 
+-CPLUS = clang++
+-CONLY = clang
++CPLUS := $(CXX)
++CONLY := $(CC)
+ LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
+ LIBS += -lpthread -lrt
+ LINK_FLAGS = -Wl,-rpath-link=.
+ C_FLAGS = $(CPLUS_FLAGS)
+ 
+ ifeq ($(cfg), release)
+-        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
++        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
+ endif
+ ifeq ($(cfg), debug)
+         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
+@@ -61,24 +61,10 @@
+ 
+ ifeq (intel64,$(arch))
+     ITT_NOTIFY = -DDO_ITT_NOTIFY
+-    CPLUS_FLAGS += -m64
+-    LIB_LINK_FLAGS += -m64
+ endif
+ 
+ ifeq (ia32,$(arch))
+     ITT_NOTIFY = -DDO_ITT_NOTIFY
+-    CPLUS_FLAGS += -m32 -march=pentium4
+-    LIB_LINK_FLAGS += -m32
+-endif
+-
+-ifeq (ppc64,$(arch))
+-    CPLUS_FLAGS += -m64
+-    LIB_LINK_FLAGS += -m64
+-endif
+-
+-ifeq (ppc32,$(arch))
+-    CPLUS_FLAGS += -m32
+-    LIB_LINK_FLAGS += -m32
+ endif
+ 
+ ifeq (bg,$(arch))
+@@ -90,12 +76,6 @@
+ # Setting assembler data.
+ #------------------------------------------------------------------------------
+ ASM = as
+-ifeq (intel64,$(arch))
+-    ASM_FLAGS += --64
+-endif
+-ifeq (ia32,$(arch))
+-    ASM_FLAGS += --32
+-endif
+ ifeq ($(cfg),debug)
+     ASM_FLAGS += -g
+ endif
diff --git a/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild b/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild
new file mode 100644
index 000000000000..ecb9e742a154
--- /dev/null
+++ b/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild,v 1.1 2015/06/15 16:50:40 jlec Exp $
+
+EAPI=5
+inherit eutils flag-o-matic versionator toolchain-funcs multilib-minimal
+
+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 ~arm ~ppc ~ppc64 ~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 \
+		"${FILESDIR}"/${PN}-4.3-build.patch
+
+	find include -name \*.html -delete || 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
+
+	use debug || sed -i -e '/_debug/d' Makefile
+}
+
+multilib_src_configure() {
+	# 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 || die
+	cat <<-EOF >> ${PN}.pc
+		Libs: -L\${libdir} -ltbb
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc.pc || die
+	cat <<-EOF >> ${PN}malloc.pc
+		Libs: -L\${libdir} -ltbbmalloc
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
+	cat <<-EOF >> ${PN}malloc_proxy.pc
+		Libs: -L\${libdir} -ltbbmalloc_proxy
+		Libs.private: -lrt
+		Requires: tbbmalloc
+	EOF
+}
+
+local_src_compile() {
+	cd "${S}"
+
+	local comp arch
+
+	case ${MULTILIB_ABI_FLAG} in
+	abi_x86_64) arch=x86_64 ;;
+	abi_x86_32) arch=ia32 ;;
+	esac
+
+	case "$(tc-getCXX)" in
+	*g++*) comp="gcc" ;;
+	*ic*c) comp="icc" ;;
+	*clang*) comp="clang" ;;
+	*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	CXX="$(tc-getCXX)" \
+	CC="$(tc-getCC)" \
+	AS="$(tc-getAS)" \
+	arch=${arch} \
+	CPLUS_FLAGS="${CXXFLAGS}" \
+	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
+	local_src_compile -j1 test
+}
+
+multilib_src_install() {
+	cd "${BUILD_DIR}_release"
+	local l
+	for l in $(find . -name lib\*.so.\*); do
+		dolib.so ${l}
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+	done
+
+	cd "${BUILD_DIR}"
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+}
+
+multilib_src_install_all() {
+	doheader -r include/*
+
+	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
+}