Version bump

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

8 files changed, 18 insertions, 823 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index a8db64c274bc..a4087c891a54 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.44 2013/11/12 22:17:14 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.45 2014/02/05 18:10:26 bicatali Exp $
+
+*tbb-4.2.20131118 (05 Feb 2014)
+
+  05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +tbb-4.2.20131118.ebuild,
+  -files/tbb-3.0.104-tests.patch, -files/tbb-4.0.297-ldflags.patch,
+  -files/tbb-4.1.20120718-ldflags.patch, -files/tbb-4.1.20121003-ldflags.patch,
+  -tbb-4.1.20130116-r1.ebuild, -tbb-4.1.20130613.ebuild:
+  Version bump
 
 *tbb-4.2.20131003 (12 Nov 2013)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 94f20906e05a..9242cc356ed3 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tbb-3.0.104-tests.patch 676 SHA256 7d486b4b462a9d13226a29f303a374209e52c4e5ef0d0c8a216ea0b503bb0b21 SHA512 95dd4af60a8395856b8c527b196341e97dec2b9b7f38eba29c2a1cc62abcf6c66546b8da08162bce444823e520ee40d2a1c240e97ed92b2108693627e2ccaac7 WHIRLPOOL ea2a728532550a809f494602e34f73ca80e3b8985e23ba10f1f4068eb55d785f51f1a15c1558b804b84dbca0686d0254ef278a9191a8f1e27d2314cc9cbaf6c7
-AUX tbb-4.0.297-ldflags.patch 11719 SHA256 05ca92a307e8c797b023c7984a739fc04ae54e0399b0036f89a7ae6c0bec6df7 SHA512 9575ad14b038c0f3636ecbb839cc222ae2a2cfe5f383516d40b49b0eb9115b8642eb31e3e2002fe0da5ebf17462a19eb7fc965ca134c4aa8d6d450979f47ae9b WHIRLPOOL 29e0cc4a01f488aa5497b37e1c83d839cf52509f986456cdaefdf78f333984f58bb1980c75301ae945d06c8543f34ff41b1f1c1b396ece81b36f15adbc001a0f
 AUX tbb-4.0.297-underlinking.patch 475 SHA256 489473e0f30a53d13bd508d3d720df2e6db24b1348470febd162d0834bf6a3de SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486 WHIRLPOOL 10e6e3f886dc1a8638f1788254e38f7f92ebbd9deab645e215e9abecfe871e8918de490dc0612de276829e75571db82bd04fe1a8606a50e5f2a6b938821a25fe
-AUX tbb-4.1.20120718-ldflags.patch 14639 SHA256 92f025c7f4fee3b6409823b0cfc6f29866bc813f64646fd61df8bdd24e630b20 SHA512 5afe125357d679eac2b11afacfb2443fe6bbed841223caccb625edf677562fe0886a2dcb9db0b96b0cd6ee3bf5f07363e26496b52d0b593081bcf2196688d638 WHIRLPOOL 2f57784f596fd39a3008e8557484c1bb46aec1c800abebe54bc5e4cdf5f96bbbea4d1b1967c4c1f70c340641c2eb19bb6e6d84c8622817f0df15bbb551f02858
-AUX tbb-4.1.20121003-ldflags.patch 14517 SHA256 4ebbe650a8005ac5667fc5f4815ee0492dee84c90f4ded51169013072d561379 SHA512 78ef3992809a30d0d5a146f4ec3bb5c6674d59581626ad02dc82a41c080921d1291e1e29823509fe532043107bf1927fc04a9824294d9a416986264725ee58e3 WHIRLPOOL afcb4488dbd367c7659b1929a4ab2ab0dd2d91d214a33de8fdf4c7942d84943b171d19955db540c345acfbbf63125e034944bc0f2a0e7a8b59ec3e767b66a1d3
 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
 DIST tbb42_20131003oss_src.tgz 2118935 SHA256 dca8af40bcd69e434620c5800a6f464c78ab410a75d02f40547e851cc4d1519a SHA512 0e7b8ae9bb3600e6f5eaf25997a07e106416afa336549b34a90e97534685127bee612f798511c6da7b08c0116056565fe7022c773ff8e3eb6d9c69ab4ceaeda5 WHIRLPOOL 48e4e6de170fce2e67ff51adae3fc6fa69edcd444b68dfcc2da335a70661c39069801d7f15f52efd9c5064cbc420ad0f13115dd4ffae9595ce50a8dab0c3186d
+DIST tbb42_20131118oss_src.tgz 3134290 SHA256 d95b816ac1618f5047d9ac4db1709d1f8bbeafaed597ce1ee7862b9577680882 SHA512 1f3e2bd807b7fa0cf42c712353cc2a622ddad22fe64359e668480617831ac595a46fa8db86ecd0376989cb4928bb4febe4d11a0f27c26437c60ed0a61c451174 WHIRLPOOL 90cc7de2309588dc546c4380d26211edc118f7dd7f1d7e15dcb38facb2ca0da9020129f1c03e4110eeb9b5991203aa0da0ff1561ed9da7cedcc2298e1b2e2a50
 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
 EBUILD tbb-4.2.20131003.ebuild 3513 SHA256 7b66a686b3784df23feb39925560f28d953f68a010b1b2887257ad9de8ed3cbe SHA512 07e526b93660c32e9fb47f3c9ab10db27cfc57a16d5f316ab7bd68a177dafc9ad789e289e16f9806c13bb0fbfaa515658a632d27301765c1ef7efd5ed0a79eab WHIRLPOOL 2a884d1425a655b24933a1d313cef27e5b6414ac12c902756e5df30932217a408ad787fe7ccd4ae2a8d6276743f0ce2089019b335cb98b164d23f285db00bae0
-MISC ChangeLog 7566 SHA256 bb448e1305cd67200e58e1aaf278b0c5618a86de78385bb2f0e0387b00dff740 SHA512 933f87e031e7dae2fedb7faec348696549d1571a8f4863119e4b87853fd21a7589b60daf59e44b65709bf768747b69c2cc6b735c0bc440ee314da5fdb1f03be2 WHIRLPOOL 4ea1970649204c675fd25c79400df9c1f16ca3374cf9ac89475e09432282c389cdae79038c639112584504c52e1cac7d6aff1db6768728a3801aaf1c91aa8079
+EBUILD tbb-4.2.20131118.ebuild 3513 SHA256 a3a8424f6a96278f018891726eda25b7c0c4261d4bf3e3f1d159c2416d50d528 SHA512 63a44b8063768a590d5361a2956e145d92a224a4c5c1ee72baa4cfa31708034bcca57bbf5c7a7a967f7806d93cb087af88c175b1c10c5327a7be275ea97f67ad WHIRLPOOL 0743ff1f4dc61dcb057c291597536c53c13511873276b48b6a8c1631d909ead4d515014ad21269a6ec0bed9ee9e2da2baf97e5249896e225524f870d18d48be3
+MISC ChangeLog 7901 SHA256 14897315f13b0d16e3652115096d21e13ed842ada4637442cd8b1e308a991842 SHA512 64db9e6b4ac4887100a4592598a4fb65e444b5c4fc886b7cfad91e4f8a99c4b5a2d71670eeea24216c059b2af408d2c1c8c1b9eb5faaa11f8a412d5dfd67a136 WHIRLPOOL bc08097fe44c4704d0671b5ca48be65836fbc16075df6460876284687fefbbeea8f582eb6f186b3b2e90e803038b7014d8d261918f10067ac5f3f0c51dac88f4
 MISC metadata.xml 503 SHA256 df5167eb58798ee657f0c55f2776e7e44d96bd9fe2e1c71783dcf6cd1c65296f SHA512 1085a87e3f4e0dfc5c11e3b767f78e64225f6266a04be6271bbd8aeeb6bb16948ab26d0cec79773d1568dea23acf57a85acb84cf7c6dac314144c2f0087c7d1c WHIRLPOOL 6359fe487c224a3fb58df9e6cdbcf5703c751567521ae23a6f965905ca9e7a47b4b6689fa3e542fb196def6b55d8ae02bf14a51604bad95712eeaafb4f8c090c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKCqPMACgkQ1ycZbhPLE2AlAwCdHLrhumzjzG+uGwEyZ6oGNIXj
-DXsAniECTvtattcc1y38GG7xy60JAmO5
-=+S4b
+iEYEAREIAAYFAlLyfpcACgkQ1ycZbhPLE2CcxQCeLffg4hFRnEh/PCHiqWH9NNbh
+VhMAoJGGxvhHqwz6j3JjVEa0NMhAdL5y
+=8XwG
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/files/tbb-3.0.104-tests.patch b/dev-cpp/tbb/files/tbb-3.0.104-tests.patch
deleted file mode 100644
index 886d1644e62a..000000000000
--- a/dev-cpp/tbb/files/tbb-3.0.104-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/Makefile.test.orig	2010-10-26 10:22:22.058506834 +1100
-+++ build/Makefile.test	2010-10-26 10:22:38.370427924 +1100
-@@ -159,7 +159,7 @@
- # If a component Y uses component X, then tests for Y should come after tests for X.
- # Note that usually run_cmd is empty, and tests run directly
- test_tbb_plain: $(TEST_PREREQUISITE) $(TASK_CPP_DIRECTLY_INCLUDED) $(TEST_TBB_PLAIN.EXE)
--	$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
-+	#$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
-         # Checking TBB version first to make sure the following testing has anything in it
- 	$(run_cmd) ./test_assembly.$(TEST_EXT) $(args)
- 	$(run_cmd) ./test_atomic.$(TEST_EXT) $(args)
diff --git a/dev-cpp/tbb/files/tbb-4.0.297-ldflags.patch b/dev-cpp/tbb/files/tbb-4.0.297-ldflags.patch
deleted file mode 100644
index b42871f66880..000000000000
--- a/dev-cpp/tbb/files/tbb-4.0.297-ldflags.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu May 31 21:37:47 UTC 2012
-Subject: build system
-
-respect LDFLAGS properly
-wrt https://bugs.gentoo.org/show_bug.cgi?id=418453
-
---- build/common_rules.inc
-+++ build/common_rules.inc
-@@ -44,8 +44,6 @@
- ifeq ($(tbb_cpf),1)
- CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
- endif
--LINK_FLAGS += $(LDFLAGS)
--LIB_LINK_FLAGS += $(LDFLAGS)
- CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
- 
- LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
---- build/Makefile.rml
-+++ build/Makefile.rml
-@@ -103,7 +103,7 @@
- 
- $(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
- $(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
- 
- ifneq (,$(RML_NO_VERSION.DLL))
- $(RML_NO_VERSION.DLL):
-@@ -126,13 +126,13 @@
- RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
- 
- test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- rml_omp_stub.$(OBJ): rml_omp_stub.cpp
- 	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
-@@ -141,7 +141,7 @@
- 	$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
- 
- test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- ### run_cmd is usually empty
- rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
---- build/Makefile.tbb
-+++ build/Makefile.tbb
-@@ -115,7 +115,7 @@
- 
- $(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
- $(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
- 
- ifneq (,$(TBB_NO_VERSION.DLL))
- $(TBB_NO_VERSION.DLL):
---- build/Makefile.tbbmalloc
-+++ build/Makefile.tbbmalloc
-@@ -82,7 +82,7 @@
- 
- $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
- $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
--	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
-+	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
- 
- ifneq (,$(MALLOCPROXY.DEF))
- tbbmallocproxy.def: $(MALLOCPROXY.DEF)
-@@ -95,7 +95,7 @@
- ifneq (,$(MALLOCPROXY.DLL))
- $(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
- $(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
- endif
- 
- ifneq (,$(MALLOC_NO_VERSION.DLL))
-@@ -143,32 +143,32 @@
- endif
- 
- test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
- test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
- 
- test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.tmp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
- 
- $(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
- 
- ifeq (,$(NO_C_TESTS))
- MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
- 
- $(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
- endif
- 
- # Rules for generating a test DLL
- %_dll.$(DLL): %_dll.$(OBJ)
--	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(DYLIB_KEY) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(DYLIB_KEY) $(LIB_LINK_FLAGS)
- 
- test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
- 
- MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT)
- ifneq (,$(MALLOCPROXY.DLL))
---- build/Makefile.tbbproxy
-+++ build/Makefile.tbbproxy
-@@ -102,7 +102,7 @@
- 
- # Link rules.
- $(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- # Compilation rules.
- $(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
---- build/Makefile.test
-+++ build/Makefile.test
-@@ -55,26 +55,26 @@
- 
- # Rule for generating executable test
- %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- # Rules for generating a test DLL
- %_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
- .PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
- 
- # Rules for the tests, which use TBB in a dynamically loadable library
- test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
- test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
- test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
- 
- # Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
- # The issue reveals itself if a version of binutils is prior to 2.17
- ifeq (linux,$(tbb_os))
- ifeq (icc,$(compiler))
- test_cilk_interop.$(TEST_EXT): test_cilk_interop.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) -lcilkrts
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) -lcilkrts
- endif
- endif
- 
-@@ -92,18 +92,18 @@
- $(TASK_CPP_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
- 
- $(TASK_CPP_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(TASK_CPP_DEPENDENCIES)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
- 
- test_tbb_header2.$(OBJ): test_tbb_header.cpp
- 	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
- 
- # Detecting "multiple definition" linker error using the test that covers the whole library
- test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
- 
- # Checks that TBB atomics work correctly in position independent code
- test_atomic_pic.$(TEST_EXT): test_atomic.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(LDFLAGS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- # The main list of TBB tests
- TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT)   \
-@@ -188,7 +188,7 @@
- ifdef OPENMP_FLAG
- TEST_TBB_PLAIN.EXE += test_tbb_openmp
- test_openmp.$(TEST_EXT): test_openmp.cpp
--	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
-+	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
- .PHONY: test_tbb_openmp
- test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
- 	$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
diff --git a/dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch b/dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch
deleted file mode 100644
index af7f8e6c025e..000000000000
--- a/dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From: Sebastien Fabbro <bicatali@gentoo.org>
-Date: Thu Sep 13 15:13:19 PDT 2012
-Subject: build system
-
-respect LDFLAGS properly
-wrt https://bugs.gentoo.org/show_bug.cgi?id=418453
-
-diff -Nur tbb41_20120718oss.orig/build/common_rules.inc tbb41_20120718oss/build/common_rules.inc
---- tbb41_20120718oss.orig/build/common_rules.inc	2012-08-06 05:06:15.000000000 -0700
-+++ tbb41_20120718oss/build/common_rules.inc	2012-09-13 14:58:45.556908494 -0700
-@@ -44,8 +44,6 @@
- ifeq ($(tbb_cpf),1)
- CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
- endif
--LINK_FLAGS += $(LDFLAGS)
--LIB_LINK_FLAGS += $(LDFLAGS)
- CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
- 
- LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
-diff -Nur tbb41_20120718oss.orig/build/Makefile.rml tbb41_20120718oss/build/Makefile.rml
---- tbb41_20120718oss.orig/build/Makefile.rml	2012-08-06 05:06:15.000000000 -0700
-+++ tbb41_20120718oss/build/Makefile.rml	2012-09-13 14:58:45.556908494 -0700
-@@ -103,7 +103,7 @@
- 
- $(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
- $(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
- 
- ifneq (,$(RML_NO_VERSION.DLL))
- $(RML_NO_VERSION.DLL):
-@@ -126,13 +126,13 @@
- RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
- 
- test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- rml_omp_stub.$(OBJ): rml_omp_stub.cpp
- 	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
-@@ -141,7 +141,7 @@
- 	$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
- 
- test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- ### run_cmd is usually empty
- rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
-diff -Nur tbb41_20120718oss.orig/build/Makefile.tbb tbb41_20120718oss/build/Makefile.tbb
---- tbb41_20120718oss.orig/build/Makefile.tbb	2012-08-06 05:06:15.000000000 -0700
-+++ tbb41_20120718oss/build/Makefile.tbb	2012-09-13 14:58:45.556908494 -0700
-@@ -120,7 +120,7 @@
- 
- $(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
- $(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
- 
- ifneq (,$(TBB_NO_VERSION.DLL))
- $(TBB_NO_VERSION.DLL):
-diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbmalloc tbb41_20120718oss/build/Makefile.tbbmalloc
---- tbb41_20120718oss.orig/build/Makefile.tbbmalloc	2012-08-06 05:06:15.000000000 -0700
-+++ tbb41_20120718oss/build/Makefile.tbbmalloc	2012-09-13 15:06:11.893254873 -0700
-@@ -82,7 +82,7 @@
- 
- $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
- $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
--	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
-+	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
- 
- ifneq (,$(MALLOCPROXY.DEF))
- tbbmallocproxy.def: $(MALLOCPROXY.DEF)
-@@ -95,7 +95,7 @@
- ifneq (,$(MALLOCPROXY.DLL))
- $(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
- $(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
- endif
- 
- ifneq (,$(MALLOC_NO_VERSION.DLL))
-@@ -143,38 +143,38 @@
- endif
- 
- test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
- test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
- 
- test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.ver
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
- 
- # TODO: use generic rules
- test_malloc_used_by_lib.$(TEST_EXT): test_malloc_used_by_lib.cpp test_malloc_used_by_lib.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- test_malloc_used_by_lib.$(DLL): test_malloc_used_by_lib.cpp
- 	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/LD,$(M_CPLUS_FLAGS)) $(PIC_KEY) $(M_INCLUDES) $(DEFINE_KEY)_USRDLL $< $(MALLOC_LIB) $(LINK_FLAGS) $(DYLIB_KEY)
- 
- $(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
- 
- MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
- 
- $(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
- 
- # Rules for generating a test DLL
- %_dll.$(DLL): %_dll.$(OBJ)
--	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
-+	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
- .PRECIOUS: %_dll.$(OBJ)
- 
- test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
- 
- MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT)
- ifneq (,$(MALLOCPROXY.DLL))
-diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbproxy tbb41_20120718oss/build/Makefile.tbbproxy
---- tbb41_20120718oss.orig/build/Makefile.tbbproxy	2012-08-06 05:06:15.000000000 -0700
-+++ tbb41_20120718oss/build/Makefile.tbbproxy	2012-09-13 14:58:45.557908491 -0700
-@@ -102,7 +102,7 @@
- 
- # Link rules.
- $(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- # Compilation rules.
- $(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
-diff -Nur tbb41_20120718oss.orig/build/Makefile.test tbb41_20120718oss/build/Makefile.test
---- tbb41_20120718oss.orig/build/Makefile.test	2012-08-06 05:06:15.000000000 -0700
-+++ tbb41_20120718oss/build/Makefile.test	2012-09-13 15:10:46.438703091 -0700
-@@ -55,17 +55,17 @@
- 
- # Rule for generating executable test
- %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- # Rules for generating a test DLL
- %_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
- .PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
- 
- # Rules for the tests, which use TBB in a dynamically loadable library
- test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
- test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
- 
- 
- # tbb_misc.$(OBJ) has to be specified here (instead of harness_inject_scheduler.h) because it carries dependency on version_string.ver
-@@ -82,31 +82,31 @@
- $(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
- 
- $(SCHEDULER_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(SCHEDULER_DEPENDENCIES)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
- 
- # Tests that use some features of C++11
- TEST_TBB_CPP11 = test_lambda.$(TEST_EXT) test_cache_aligned_allocator_STL.$(TEST_EXT)
- 
- $(TEST_TBB_CPP11:%.$(TEST_EXT)=%.$(OBJ)): %.$(OBJ): %.cpp
--	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
-+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
- $(TEST_TBB_CPP11): %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- test_tbb_header2.$(OBJ): test_tbb_header.cpp
--	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
-+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
- 
- # Detecting "multiple definition" linker error using the test that covers the whole library
- test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
- 
- # Checks that TBB atomics work correctly in position independent code
- test_atomic_pic.$(TEST_EXT): test_atomic.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- #Test of generic gcc port 
- %_compiler_builtins.$(TEST_EXT): CPLUS_FLAGS+=$(DEFINE_KEY)__TBB_TEST_GCC_BUILTINS=1
- %_compiler_builtins.$(TEST_EXT): %.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- # The main list of TBB tests
- TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT)   \
-@@ -192,7 +192,7 @@
- 
- ifdef OPENMP_FLAG
- test_openmp.$(TEST_EXT): test_openmp.cpp
--	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
-+	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
- test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
- 	$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
- else
-@@ -202,7 +202,7 @@
- 
- ifdef CILK_AVAILABLE
- test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
- # Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
- # The issue reveals itself if a version of binutils is prior to 2.17
- ifeq (linux_icc,$(tbb_os)_$(compiler))
diff --git a/dev-cpp/tbb/files/tbb-4.1.20121003-ldflags.patch b/dev-cpp/tbb/files/tbb-4.1.20121003-ldflags.patch
deleted file mode 100644
index 6da6d6f7e9d8..000000000000
--- a/dev-cpp/tbb/files/tbb-4.1.20121003-ldflags.patch
+++ /dev/null
@@ -1,239 +0,0 @@
- build/Makefile.rml       | 10 +++++-----
- build/Makefile.tbb       |  2 +-
- build/Makefile.tbbmalloc | 22 +++++++++++-----------
- build/Makefile.tbbproxy  |  2 +-
- build/Makefile.test      | 26 +++++++++++++-------------
- build/common_rules.inc   |  2 --
- 6 files changed, 31 insertions(+), 33 deletions(-)
-
-diff --git a/build/Makefile.rml b/build/Makefile.rml
-index 809b013..df3f2d1 100644
---- a/build/Makefile.rml
-+++ b/build/Makefile.rml
-@@ -103,7 +103,7 @@ endif
- 
- $(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
- $(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
- 
- ifneq (,$(RML_NO_VERSION.DLL))
- $(RML_NO_VERSION.DLL):
-@@ -126,13 +126,13 @@ cross_suffix=$(if $(crosstest),$(if $(DEBUG_SUFFIX),$(subst _debug,,$(1)),$(call
- RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
- 
- test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- rml_omp_stub.$(OBJ): rml_omp_stub.cpp
- 	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
-@@ -141,7 +141,7 @@ test_rml_omp_c_linkage.$(TEST_EXT): test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$
- 	$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
- 
- test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
- 
- ### run_cmd is usually empty
- rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
-diff --git a/build/Makefile.tbb b/build/Makefile.tbb
-index fded71b..eb2642b 100644
---- a/build/Makefile.tbb
-+++ b/build/Makefile.tbb
-@@ -120,7 +120,7 @@ tbbvars.sh:
- 
- $(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
- $(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
- 
- ifneq (,$(TBB_NO_VERSION.DLL))
- $(TBB_NO_VERSION.DLL):
-diff --git a/build/Makefile.tbbmalloc b/build/Makefile.tbbmalloc
-index 8fab075..81c5e11 100644
---- a/build/Makefile.tbbmalloc
-+++ b/build/Makefile.tbbmalloc
-@@ -82,7 +82,7 @@ endif
- 
- $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
- $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
--	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
-+	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
- 
- ifneq (,$(MALLOCPROXY.DEF))
- tbbmallocproxy.def: $(MALLOCPROXY.DEF)
-@@ -95,7 +95,7 @@ endif
- ifneq (,$(MALLOCPROXY.DLL))
- $(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
- $(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
--	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
-+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
- endif
- 
- ifneq (,$(MALLOC_NO_VERSION.DLL))
-@@ -143,38 +143,38 @@ test_malloc_overload.$(TEST_EXT): LIBS += $(MALLOC_PROXY_LIB)
- endif
- 
- test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
- test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
- 
- test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.ver
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
- 
- # TODO: use generic rules
- test_malloc_used_by_lib.$(TEST_EXT): test_malloc_used_by_lib.cpp test_malloc_used_by_lib.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- test_malloc_used_by_lib.$(DLL): test_malloc_used_by_lib.cpp
- 	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/LD,$(M_CPLUS_FLAGS)) $(PIC_KEY) $(M_INCLUDES) $(DEFINE_KEY)_USRDLL $< $(MALLOC_LIB) $(LINK_FLAGS) $(DYLIB_KEY)
- 
- $(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
- 
- MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
- 
- $(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
- 
- # Rules for generating a test DLL
- %_dll.$(DLL): %_dll.$(OBJ)
--	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
-+	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
- .PRECIOUS: %_dll.$(OBJ)
- 
- test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
- 
- MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT)
- ifneq (,$(MALLOCPROXY.DLL))
-diff --git a/build/Makefile.tbbproxy b/build/Makefile.tbbproxy
-index eb60d2f..4821a45 100644
---- a/build/Makefile.tbbproxy
-+++ b/build/Makefile.tbbproxy
-@@ -102,7 +102,7 @@ endif
- 
- # Link rules.
- $(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
- 
- # Compilation rules.
- $(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
-diff --git a/build/Makefile.test b/build/Makefile.test
-index bcc5987..fa42b03 100644
---- a/build/Makefile.test
-+++ b/build/Makefile.test
-@@ -55,17 +55,17 @@ include $(tbb_root)/build/common_rules.inc
- 
- # Rule for generating executable test
- %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- # Rules for generating a test DLL
- %_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
- .PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
- 
- # Rules for the tests, which use TBB in a dynamically loadable library
- test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
- test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
- 
- 
- # tbb_misc.$(OBJ) has to be specified here (instead of harness_inject_scheduler.h) because it carries dependency on version_string.ver
-@@ -82,31 +82,31 @@ INCLUDES += $(INCLUDE_KEY).
- $(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
- 
- $(SCHEDULER_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(SCHEDULER_DEPENDENCIES)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
- 
- # Tests that use some features of C++11
- TEST_TBB_CPP11 = test_lambda.$(TEST_EXT) test_cache_aligned_allocator_STL.$(TEST_EXT)
- 
- $(TEST_TBB_CPP11:%.$(TEST_EXT)=%.$(OBJ)): %.$(OBJ): %.cpp
--	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
-+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
- $(TEST_TBB_CPP11): %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- test_tbb_header2.$(OBJ): test_tbb_header.cpp
--	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
-+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
- 
- # Detecting "multiple definition" linker error using the test that covers the whole library
- test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
- 
- # Checks that TBB atomics work correctly in position independent code
- test_atomic_pic.$(TEST_EXT): test_atomic.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- #Test of generic gcc port and icc intrinsics port
- %_compiler_builtins.$(TEST_EXT): CPLUS_FLAGS+=$(DEFINE_KEY)__TBB_TEST_BUILTINS=1
- %_compiler_builtins.$(TEST_EXT): %.cpp
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
- 
- # The main list of TBB tests
- TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT)   \
-@@ -192,7 +192,7 @@ TEST_TBB_PLAIN.EXE += $(TEST_TBB_CPP11)
- 
- ifdef OPENMP_FLAG
- test_openmp.$(TEST_EXT): test_openmp.cpp
--	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
-+	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
- test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
- 	$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
- else
-@@ -202,7 +202,7 @@ endif
- 
- ifdef CILK_AVAILABLE
- test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
--	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
-+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
- # Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
- # The issue reveals itself if a version of binutils is prior to 2.17
- ifeq (linux_icc,$(tbb_os)_$(compiler))
-
-diff --git a/build/common_rules.inc b/build/common_rules.inc
-index 6aa20f2..46cac4e 100644
---- a/build/common_rules.inc
-+++ b/build/common_rules.inc
-@@ -44,8 +44,6 @@ CPLUS_FLAGS += $(WARNING_KEY) $(CXXFLAGS)
- ifeq ($(tbb_cpf),1)
- CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
- endif
--LINK_FLAGS += $(LDFLAGS)
--LIB_LINK_FLAGS += $(LDFLAGS)
- CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
- 
- LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
diff --git a/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild b/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild
deleted file mode 100644
index cdb99fa8899a..000000000000
--- a/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.20130116-r1.ebuild,v 1.2 2013/05/02 15:54:43 dilfridge 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 \
-		"${FILESDIR}"/${PN}-4.1.20121003-ppc.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
-}
diff --git a/dev-cpp/tbb/tbb-4.1.20130613.ebuild b/dev-cpp/tbb/tbb-4.2.20131118.ebuild
index 99b6b8d02e3c..92888b29a164 100644
--- a/dev-cpp/tbb/tbb-4.1.20130613.ebuild
+++ b/dev-cpp/tbb/tbb-4.2.20131118.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.3 2013/08/27 20:20:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20131118.ebuild,v 1.1 2014/02/05 18:10:26 bicatali Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib versionator toolchain-funcs